Apache Lucene open-source search software
Clean up ordinal map in default SSDV reader state (#12454)
Stefan Vodita8665014fa820
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.javaindex b7335e28085..e3024797136 100644--- a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java+++ b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java@@ -53,7 +53,13 @@ public class DefaultSortedSetDocValuesReaderState extends SortedSetDocValuesRead/** {@link IndexReader} passed to the constructor. */public final IndexReader reader;- private final Map<String, OrdinalMap> cachedOrdMaps = new HashMap<>();+ /**+ * There is only ever one cached ordinal map, but storing it in a hash map together with the field+ * name is convenient. It enables us to have code blocks synchronized on the ordinal map even when+ * the ordinal map is null and it makes it easy to call to {@link+ * Accountables#namedAccountables(String, Map)} in {@link #getChildResources()}.+ */+ private final Map<String, OrdinalMap> cachedOrdMap = new HashMap<>();private final FacetsConfig config;@@ -233,13 +239,13 @@ public class DefaultSortedSetDocValuesReaderState extends SortedSetDocValuesRead/** Return the memory usage of this object in bytes. Negative values are illegal. */@Overridepublic long ramBytesUsed() {- synchronized (cachedOrdMaps) {- long bytes = 0;- for (OrdinalMap map : cachedOrdMaps.values()) {- bytes += map.ramBytesUsed();+ synchronized (cachedOrdMap) {+ OrdinalMap map = cachedOrdMap.get(field);+ if (map == null) {+ return 0;+ } else {+ return map.ramBytesUsed();}-- return bytes;}}@@ -251,8 +257,8 @@ public class DefaultSortedSetDocValuesReaderState extends SortedSetDocValuesRead*/@Overridepublic Collection<Accountable> getChildResources() {- synchronized (cachedOrdMaps) {- return Accountables.namedAccountables("DefaultSortedSetDocValuesReaderState", cachedOrdMaps);+ synchronized (cachedOrdMap) {+ return Accountables.namedAccountables("DefaultSortedSetDocValuesReaderState", cachedOrdMap);}}@@ -264,15 +270,9 @@ public class DefaultSortedSetDocValuesReaderState extends SortedSetDocValuesRead/** Return top-level doc values. */@Overridepublic SortedSetDocValues getDocValues() throws IOException {- // TODO: this is dup'd from slow composite reader wrapper ... can we factor it out to share?OrdinalMap map = null;- // TODO: why are we lazy about this? It's better if ctor pays the cost, not first query? Oh,- // but we- // call this method from ctor, ok. Also, we only ever store one entry in the map (for- // key=field) so- // why are we using a map?- synchronized (cachedOrdMaps) {- map = cachedOrdMaps.get(field);+ synchronized (cachedOrdMap) {+ map = cachedOrdMap.get(field);if (map == null) {// uncached, or not a multi dvSortedSetDocValues dv = MultiDocValues.getSortedSetValues(reader, field);@@ -280,7 +280,7 @@ public class DefaultSortedSetDocValuesReaderState extends SortedSetDocValuesReadmap = ((MultiDocValues.MultiSortedSetDocValues) dv).mapping;IndexReader.CacheHelper cacheHelper = reader.getReaderCacheHelper();if (cacheHelper != null && map.owner == cacheHelper.getKey()) {- cachedOrdMaps.put(field, map);+ cachedOrdMap.put(field, map);}}return dv;