Apache Lucene open-source search software
Remove unused "implements Accountable". (#13330)
Adrien Grandf3a52113a4a7
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.javaindex ab51f935fb0..1b74ff94c18 100644--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene95/Lucene95HnswVectorsReader.java@@ -44,11 +44,9 @@ import org.apache.lucene.store.ChecksumIndexInput;import org.apache.lucene.store.DataInput;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.RandomAccessInput;-import org.apache.lucene.util.Accountable;import org.apache.lucene.util.ArrayUtil;import org.apache.lucene.util.Bits;import org.apache.lucene.util.IOUtils;-import org.apache.lucene.util.RamUsageEstimator;import org.apache.lucene.util.hnsw.HnswGraph;import org.apache.lucene.util.hnsw.HnswGraphSearcher;import org.apache.lucene.util.hnsw.OrdinalTranslatedKnnCollector;@@ -392,10 +390,7 @@ public final class Lucene95HnswVectorsReader extends KnnVectorsReader implements// Contains the configuration for reading sparse vectors and translating vector ordinals to// docId- OrdToDocDISIReaderConfiguration ordToDocVectorValues)- implements Accountable {- private static final long SHALLOW_SIZE =- RamUsageEstimator.shallowSizeOfInstance(FieldEntry.class);+ OrdToDocDISIReaderConfiguration ordToDocVectorValues) {static FieldEntry create(IndexInput input,@@ -462,14 +457,6 @@ public final class Lucene95HnswVectorsReader extends KnnVectorsReader implementsoffsetsLength,ordToDocVectorValues);}-- @Override- public long ramBytesUsed() {- return SHALLOW_SIZE- + Arrays.stream(nodesByLevel).mapToLong(nodes -> RamUsageEstimator.sizeOf(nodes)).sum()- + RamUsageEstimator.sizeOf(ordToDocVectorValues)- + RamUsageEstimator.sizeOf(offsetsMeta);- }}/** Read the nearest-neighbors graph from the index input */diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.javaindex 3b77544b8f3..64419703f85 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java@@ -324,20 +324,6 @@ public class FixedGapTermsIndexReader extends TermsIndexReaderBase {input.seek(dirOffset);}- @Override- public long ramBytesUsed() {- long sizeInBytes = ((termBytesReader != null) ? termBytesReader.ramBytesUsed() : 0);- for (FieldIndexData entry : fields.values()) {- sizeInBytes += entry.ramBytesUsed();- }- return sizeInBytes;- }-- @Override- public Collection<Accountable> getChildResources() {- return Accountables.namedAccountables("field", fields);- }-@Overridepublic String toString() {return getClass().getSimpleName()diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.javaindex 981d9ed9148..f56ba77d26f 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.blockterms;import java.io.Closeable;import java.io.IOException;import org.apache.lucene.index.FieldInfo;-import org.apache.lucene.util.Accountable;import org.apache.lucene.util.BytesRef;// TODO@@ -34,7 +33,7 @@ import org.apache.lucene.util.BytesRef;** @lucene.experimental*/-public abstract class TermsIndexReaderBase implements Closeable, Accountable {+public abstract class TermsIndexReaderBase implements Closeable {public abstract FieldIndexEnum getFieldEnum(FieldInfo fieldInfo);diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.javaindex 2aefd09cf9b..ce7bacf7cf5 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.blockterms;import static org.apache.lucene.util.fst.FST.readMetadata;import java.io.IOException;-import java.util.Collection;import java.util.HashMap;import org.apache.lucene.codecs.CodecUtil;import org.apache.lucene.index.CorruptIndexException;@@ -27,8 +26,6 @@ import org.apache.lucene.index.FieldInfo;import org.apache.lucene.index.IndexFileNames;import org.apache.lucene.index.SegmentReadState;import org.apache.lucene.store.ChecksumIndexInput;-import org.apache.lucene.util.Accountable;-import org.apache.lucene.util.Accountables;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.fst.BytesRefFSTEnum;import org.apache.lucene.util.fst.FST;@@ -168,22 +165,6 @@ public class VariableGapTermsIndexReader extends TermsIndexReaderBase {@Overridepublic void close() throws IOException {}- @Override- public long ramBytesUsed() {- long sizeInBytes = 0;- for (FST<Long> entry : fields.values()) {- if (entry != null) {- sizeInBytes += entry.ramBytesUsed();- }- }- return sizeInBytes;- }-- @Override- public Collection<Accountable> getChildResources() {- return Accountables.namedAccountables("field", fields);- }-@Overridepublic String toString() {return getClass().getSimpleName() + "(fields=" + fields.size() + ")";diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.javaindex 63ce777d7fd..90087cf964e 100644--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java@@ -29,7 +29,6 @@ import static org.apache.lucene.codecs.simpletext.SimpleTextSkipWriter.SKIP_LISTimport java.io.IOException;import java.nio.charset.StandardCharsets;-import java.util.Collection;import java.util.Collections;import java.util.HashMap;import java.util.Iterator;@@ -51,17 +50,13 @@ import org.apache.lucene.search.DocIdSetIterator;import org.apache.lucene.store.BufferedChecksumIndexInput;import org.apache.lucene.store.ChecksumIndexInput;import org.apache.lucene.store.IndexInput;-import org.apache.lucene.util.Accountable;-import org.apache.lucene.util.Accountables;import org.apache.lucene.util.ArrayUtil;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.BytesRefBuilder;-import org.apache.lucene.util.CharsRef;import org.apache.lucene.util.CharsRefBuilder;import org.apache.lucene.util.FixedBitSet;import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.IntsRefBuilder;-import org.apache.lucene.util.RamUsageEstimator;import org.apache.lucene.util.StringHelper;import org.apache.lucene.util.fst.BytesRefFSTEnum;import org.apache.lucene.util.fst.FST;@@ -650,12 +645,7 @@ class SimpleTextFieldsReader extends FieldsProducer {}}- private static final long TERMS_BASE_RAM_BYTES_USED =- RamUsageEstimator.shallowSizeOfInstance(SimpleTextTerms.class)- + RamUsageEstimator.shallowSizeOfInstance(BytesRef.class)- + RamUsageEstimator.shallowSizeOfInstance(CharsRef.class);-- private class SimpleTextTerms extends Terms implements Accountable {+ private class SimpleTextTerms extends Terms {private final long termsStart;private final FieldInfo fieldInfo;private final int maxDoc;@@ -748,23 +738,6 @@ class SimpleTextFieldsReader extends FieldsProducer {// System.out.println("FST " + fst.sizeInBytes());}- @Override- public long ramBytesUsed() {- return TERMS_BASE_RAM_BYTES_USED- + (fst != null ? fst.ramBytesUsed() : 0)- + RamUsageEstimator.sizeOf(scratch.bytes())- + RamUsageEstimator.sizeOf(scratchUTF16.chars());- }-- @Override- public Collection<Accountable> getChildResources() {- if (fst == null) {- return Collections.emptyList();- } else {- return Collections.singletonList(Accountables.namedAccountable("term cache", fst));- }- }-@Overridepublic String toString() {return getClass().getSimpleName()diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene95/OrdToDocDISIReaderConfiguration.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene95/OrdToDocDISIReaderConfiguration.javaindex 3a73c177912..a13485eed5d 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene95/OrdToDocDISIReaderConfiguration.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene95/OrdToDocDISIReaderConfiguration.java@@ -24,8 +24,6 @@ import org.apache.lucene.search.DocIdSetIterator;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;import org.apache.lucene.store.RandomAccessInput;-import org.apache.lucene.util.Accountable;-import org.apache.lucene.util.RamUsageEstimator;import org.apache.lucene.util.packed.DirectMonotonicReader;import org.apache.lucene.util.packed.DirectMonotonicWriter;@@ -33,10 +31,7 @@ import org.apache.lucene.util.packed.DirectMonotonicWriter;* Configuration for {@link DirectMonotonicReader} and {@link IndexedDISI} for reading sparse* vectors. The format in the static writing methods adheres to the Lucene95HnswVectorsFormat*/-public class OrdToDocDISIReaderConfiguration implements Accountable {-- private static final long SHALLOW_SIZE =- RamUsageEstimator.shallowSizeOfInstance(OrdToDocDISIReaderConfiguration.class);+public class OrdToDocDISIReaderConfiguration {/*** Writes out the docsWithField and ordToDoc mapping to the outputMeta and vectorData@@ -188,11 +183,6 @@ public class OrdToDocDISIReaderConfiguration implements Accountable {this.meta = meta;}- @Override- public long ramBytesUsed() {- return SHALLOW_SIZE + RamUsageEstimator.sizeOf(meta);- }-/*** @param dataIn the dataIn* @return the IndexedDISI for sparse valuesdiff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.javaindex 3a52afd5a9f..0613c9c82b8 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99FlatVectorsReader.java@@ -42,7 +42,6 @@ import org.apache.lucene.store.ChecksumIndexInput;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.ReadAdvice;-import org.apache.lucene.util.Accountable;import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.RamUsageEstimator;import org.apache.lucene.util.hnsw.RandomVectorScorer;@@ -271,9 +270,7 @@ public final class Lucene99FlatVectorsReader extends FlatVectorsReader {int dimension,int size,OrdToDocDISIReaderConfiguration ordToDoc,- FieldInfo info)- implements Accountable {- static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(FieldEntry.class);+ FieldInfo info) {FieldEntry {if (similarityFunction != info.getVectorSimilarityFunction()) {@@ -336,10 +333,5 @@ public final class Lucene99FlatVectorsReader extends FlatVectorsReader {ordToDoc,info);}-- @Override- public long ramBytesUsed() {- return SHALLOW_SIZE + RamUsageEstimator.sizeOf(ordToDoc);- }}}diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.javaindex 6323870367f..38908efbe68 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99HnswVectorsReader.java@@ -44,7 +44,6 @@ import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.RandomAccessInput;import org.apache.lucene.store.ReadAdvice;-import org.apache.lucene.util.Accountable;import org.apache.lucene.util.Bits;import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.RamUsageEstimator;@@ -361,10 +360,7 @@ public final class Lucene99HnswVectorsReader extends KnnVectorsReaderDirectMonotonicReader.Meta offsetsMeta,long offsetsOffset,int offsetsBlockShift,- long offsetsLength)- implements Accountable {- private static final long SHALLOW_SIZE =- RamUsageEstimator.shallowSizeOfInstance(FieldEntry.class);+ long offsetsLength) {static FieldEntry create(IndexInput input,@@ -423,13 +419,6 @@ public final class Lucene99HnswVectorsReader extends KnnVectorsReaderoffsetsBlockShift,offsetsLength);}-- @Override- public long ramBytesUsed() {- return SHALLOW_SIZE- + Arrays.stream(nodesByLevel).mapToLong(nodes -> RamUsageEstimator.sizeOf(nodes)).sum()- + RamUsageEstimator.sizeOf(offsetsMeta);- }}/** Read the nearest-neighbors graph from the index input */diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.javaindex f0ba77854c6..6623ad0ab2b 100644--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene99/Lucene99ScalarQuantizedVectorsReader.java@@ -41,7 +41,6 @@ import org.apache.lucene.store.ChecksumIndexInput;import org.apache.lucene.store.IOContext;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.ReadAdvice;-import org.apache.lucene.util.Accountable;import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.RamUsageEstimator;import org.apache.lucene.util.hnsw.RandomVectorScorer;@@ -329,10 +328,7 @@ public final class Lucene99ScalarQuantizedVectorsReader extends FlatVectorsReadeint size,byte bits,boolean compress,- OrdToDocDISIReaderConfiguration ordToDoc)- implements Accountable {- private static final long SHALLOW_SIZE =- RamUsageEstimator.shallowSizeOfInstance(FieldEntry.class);+ OrdToDocDISIReaderConfiguration ordToDoc) {static FieldEntry create(IndexInput input,@@ -385,11 +381,6 @@ public final class Lucene99ScalarQuantizedVectorsReader extends FlatVectorsReadecompress,ordToDoc);}-- @Override- public long ramBytesUsed() {- return SHALLOW_SIZE + RamUsageEstimator.sizeOf(ordToDoc);- }}private static final class QuantizedVectorValues extends FloatVectorValues {diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.javaindex 66a7db9ab03..acf53d57053 100644--- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java+++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java@@ -20,32 +20,24 @@ import java.io.IOException;import java.util.Arrays;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.RandomAccessInput;-import org.apache.lucene.util.Accountable;import org.apache.lucene.util.LongValues;-import org.apache.lucene.util.RamUsageEstimator;/*** Retrieves an instance previously written by {@link DirectMonotonicWriter}.** @see DirectMonotonicWriter*/-public final class DirectMonotonicReader extends LongValues implements Accountable {-- private static final long BASE_RAM_BYTES_USED =- RamUsageEstimator.shallowSizeOfInstance(DirectMonotonicReader.class);+public final class DirectMonotonicReader extends LongValues {/*** In-memory metadata that needs to be kept around for {@link DirectMonotonicReader} to read data* from disk.*/- public static class Meta implements Accountable {+ public static class Meta {// Use a shift of 63 so that there would be a single block regardless of the number of values.private static final Meta SINGLE_ZERO_BLOCK = new Meta(1L, 63);- private static final long BASE_RAM_BYTES_USED =- RamUsageEstimator.shallowSizeOfInstance(Meta.class);-private final int blockShift;private final int numBlocks;private final long[] mins;@@ -65,15 +57,6 @@ public final class DirectMonotonicReader extends LongValues implements Accountabthis.bpvs = new byte[this.numBlocks];this.offsets = new long[this.numBlocks];}-- @Override- public long ramBytesUsed() {- return BASE_RAM_BYTES_USED- + RamUsageEstimator.sizeOf(mins)- + RamUsageEstimator.sizeOf(avgs)- + RamUsageEstimator.sizeOf(bpvs)- + RamUsageEstimator.sizeOf(offsets);- }}/**@@ -132,7 +115,6 @@ public final class DirectMonotonicReader extends LongValues implements Accountabprivate final long[] mins;private final float[] avgs;private final byte[] bpvs;- private final int nonZeroBpvs;private DirectMonotonicReader(int blockShift, LongValues[] readers, long[] mins, float[] avgs, byte[] bpvs) {@@ -147,13 +129,6 @@ public final class DirectMonotonicReader extends LongValues implements Accountab|| readers.length != bpvs.length) {throw new IllegalArgumentException();}- int nonZeroBpvs = 0;- for (byte b : bpvs) {- if (b != 0) {- nonZeroBpvs++;- }- }- this.nonZeroBpvs = nonZeroBpvs;}@Override@@ -213,14 +188,4 @@ public final class DirectMonotonicReader extends LongValues implements Accountabreturn -1 - lo;}-- @Override- public long ramBytesUsed() {- // Don't include meta, which should be accounted separately- return BASE_RAM_BYTES_USED- + RamUsageEstimator.shallowSizeOf(readers)- +- // Assume empty objects for the readers- nonZeroBpvs * RamUsageEstimator.alignObjectSize(RamUsageEstimator.NUM_BYTES_ARRAY_HEADER);- }}