Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2720 optimize cache clearing

This commit is contained in:
Justin Bertram 2020-04-16 14:12:22 -05:00 committed by Clebert Suconic
parent 636ff8a9c8
commit c841b84b3e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java
View File

@ -172,7 +172,12 @@ public class HierarchicalObjectRepository<T> implements HierarchicalRepository<T
lock.writeLock().lock();
try {
String modifiedMatch = matchModifier.modify(match);
clearCache();
// an exact match (i.e. one without wildcards) won't impact any other matches so no need to clear the cache
if (usesWildcards(modifiedMatch)) {
clearCache();
} else if (modifiedMatch != null && cache.containsKey(modifiedMatch)) {
cache.remove(modifiedMatch);
}
if (immutableMatch) {
immutables.add(modifiedMatch);
@ -190,6 +195,10 @@ public class HierarchicalObjectRepository<T> implements HierarchicalRepository<T
}
}
private boolean usesWildcards(String modifiedMatch) {
return modifiedMatch == null ? false : (modifiedMatch.contains(wildcardConfiguration.getAnyWordsString()) || modifiedMatch.contains(wildcardConfiguration.getSingleWordString()));
}
@Override
public int getCacheSize() {
return cache.size();
@ -277,10 +286,12 @@ public class HierarchicalObjectRepository<T> implements HierarchicalRepository<T
logger.debug("Cannot remove match " + modMatch + " since it came from a main config");
} else {
/**
* clear the cache before removing the match. This will force any thread at
* {@link #getMatch(String)} to get the lock to recompute.
* Clear the cache before removing the match, but only if the match used wildcards. This
* will force any thread at {@link #getMatch(String)} to get the lock to recompute.
*/
clearCache();
if (usesWildcards(modMatch)) {
clearCache();
}
matches.remove(modMatch);
onChange();
}