From 147efcfdf1bb10736d49a3f528c8a2a048605856 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Fri, 21 Nov 2014 21:06:23 +0000 Subject: [PATCH] LUCENE-6067: Accountable.getChildResources returns empty list by default git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1641002 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/CHANGES.txt | 3 +++ .../codecs/blockterms/BlockTermsReader.java | 5 ---- .../apache/lucene/codecs/bloom/FuzzySet.java | 6 ----- .../memory/DirectDocValuesProducer.java | 5 ---- .../codecs/memory/DirectPostingsFormat.java | 15 ----------- .../lucene/codecs/memory/FSTTermOutputs.java | 6 ----- .../simpletext/SimpleTextDocValuesReader.java | 5 ---- .../SimpleTextStoredFieldsReader.java | 8 ------ .../SimpleTextTermVectorsReader.java | 6 ----- .../lucene50/Lucene50PostingsReader.java | 7 ----- .../lucene/index/BufferedUpdatesStream.java | 5 ---- .../apache/lucene/index/DocumentsWriter.java | 6 ----- .../index/DocumentsWriterDeleteQueue.java | 6 ----- .../index/DocumentsWriterFlushControl.java | 10 ++----- .../org/apache/lucene/index/IndexWriter.java | 5 ---- .../org/apache/lucene/index/MergeState.java | 27 ------------------- .../apache/lucene/index/MultiDocValues.java | 5 ---- .../apache/lucene/index/PrefixCodedTerms.java | 6 ----- .../lucene/index/SegmentCoreReaders.java | 5 ---- .../org/apache/lucene/search/DocIdSet.java | 6 ----- .../java/org/apache/lucene/store/RAMFile.java | 6 ----- .../org/apache/lucene/util/Accountable.java | 7 +++-- .../java/org/apache/lucene/util/BitSet.java | 6 ----- .../org/apache/lucene/util/PagedBytes.java | 11 -------- .../apache/lucene/util/fst/BytesStore.java | 6 ----- .../util/packed/AbstractPagedMutable.java | 7 ----- .../lucene/util/packed/BlockPackedReader.java | 6 ----- .../lucene/util/packed/EliasFanoEncoder.java | 6 ----- .../packed/MonotonicBlockPackedReader.java | 6 ----- .../apache/lucene/util/packed/PackedInts.java | 6 ----- .../lucene/util/packed/PackedLongValues.java | 11 -------- .../facet/taxonomy/CachedOrdinalsReader.java | 5 ---- .../lucene/uninverting/DocTermOrds.java | 6 ----- .../apache/lucene/uninverting/FieldCache.java | 6 ----- .../lucene/uninverting/FieldCacheImpl.java | 10 ------- .../idversion/IDVersionPostingsReader.java | 7 ----- .../apache/lucene/search/suggest/Lookup.java | 11 -------- .../jaspell/JaspellTernarySearchTrie.java | 11 -------- .../codecs/ramonly/RAMOnlyPostingsFormat.java | 15 ----------- 39 files changed, 10 insertions(+), 286 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index fc80201b456..352cc114d01 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -22,6 +22,9 @@ API Changes (Nikola Tanković, Uwe Schindler, Chris Male, Mike McCandless, Robert Muir) +* LUCENE-6067: Accountable.getChildResources has a default + implementation returning the empty list. (Robert Muir) + ======================= Lucene 5.0.0 ======================= New Features diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java index a04c1390e9b..06c90db37e9 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java @@ -238,11 +238,6 @@ public class BlockTermsReader extends FieldsProducer { public long ramBytesUsed() { return FIELD_READER_RAM_BYTES_USED; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public TermsEnum iterator(TermsEnum reuse) throws IOException { diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java index 03931acc696..636ee2fd7b0 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java @@ -17,7 +17,6 @@ package org.apache.lucene.codecs.bloom; * limitations under the License. */ import java.io.IOException; -import java.util.Collections; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.DataInput; @@ -312,11 +311,6 @@ public class FuzzySet implements Accountable { return RamUsageEstimator.sizeOf(filter.getBits()); } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public String toString() { return getClass().getSimpleName() + "(hash=" + hashFunction + ")"; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java index 1673efebd43..faee6f2c130 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java @@ -685,11 +685,6 @@ class DirectDocValuesProducer extends DocValuesProducer { return bytesUsed; } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public String toString() { return getClass().getSimpleName(); diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java index 908abe2a09a..0e5e45c9ae9 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java @@ -208,11 +208,6 @@ public final class DirectPostingsFormat extends PostingsFormat { ((postings!=null) ? RamUsageEstimator.sizeOf(postings) : 0) + ((payloads!=null) ? RamUsageEstimator.sizeOf(payloads) : 0); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } // TODO: maybe specialize into prx/no-prx/no-frq cases? @@ -261,11 +256,6 @@ public final class DirectPostingsFormat extends PostingsFormat { return sizeInBytes; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } private final byte[] termBytes; @@ -543,11 +533,6 @@ public final class DirectPostingsFormat extends PostingsFormat { return sizeInBytes; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public String toString() { diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java index 1862ca87670..67cb860c8cd 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java @@ -19,7 +19,6 @@ package org.apache.lucene.codecs.memory; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexOptions; @@ -79,11 +78,6 @@ class FSTTermOutputs extends Outputs { } return ramBytesUsed; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } // NOTE: actually, FST nodes are seldom // identical when outputs on their arcs diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java index 9b1e887d370..7cf290418ea 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java @@ -510,11 +510,6 @@ class SimpleTextDocValuesReader extends DocValuesProducer { + fields.size() * (RamUsageEstimator.NUM_BYTES_OBJECT_REF * 2L + OneField.BASE_RAM_BYTES_USED); } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public String toString() { return getClass().getSimpleName() + "(fields=" + fields.size() + ")"; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java index 8c183c260e8..4ec4f74ba2e 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java @@ -19,7 +19,6 @@ package org.apache.lucene.codecs.simpletext; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.Collections; import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.index.FieldInfo; @@ -33,7 +32,6 @@ import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; @@ -42,7 +40,6 @@ import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.RamUsageEstimator; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.UnicodeUtil; import static org.apache.lucene.codecs.simpletext.SimpleTextStoredFieldsWriter.*; @@ -214,11 +211,6 @@ public class SimpleTextStoredFieldsReader extends StoredFieldsReader { + RamUsageEstimator.sizeOf(scratch.bytes()) + RamUsageEstimator.sizeOf(scratchUTF16.chars()); } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public String toString() { return getClass().getSimpleName(); diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java index d085bbac5a6..86f4ebba168 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java @@ -38,7 +38,6 @@ import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; @@ -551,11 +550,6 @@ public class SimpleTextTermVectorsReader extends TermVectorsReader { public long ramBytesUsed() { return BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(offsets); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public String toString() { diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java index 31d3314269d..5b4fc054fbd 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java @@ -19,7 +19,6 @@ package org.apache.lucene.codecs.lucene50; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.codecs.CodecUtil; @@ -33,7 +32,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; @@ -1302,11 +1300,6 @@ public final class Lucene50PostingsReader extends PostingsReaderBase { public long ramBytesUsed() { return BASE_RAM_BYTES_USED; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public void checkIntegrity() throws IOException { diff --git a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java index 143ecf9bcf6..f1cc6126a9b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java +++ b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java @@ -116,11 +116,6 @@ class BufferedUpdatesStream implements Accountable { public long ramBytesUsed() { return bytesUsed.get(); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } public static class ApplyDeletesResult { diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java index 630a3b6f35d..c79d693342c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java @@ -20,7 +20,6 @@ package org.apache.lucene.index; import java.io.Closeable; import java.io.IOException; import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.Queue; import java.util.Set; @@ -670,11 +669,6 @@ final class DocumentsWriter implements Closeable, Accountable { public long ramBytesUsed() { return flushControl.ramBytesUsed(); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } static final class ApplyDeletesEvent implements Event { static final Event INSTANCE = new ApplyDeletesEvent(); diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java index 040b03b93a4..d1c05a2385b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java @@ -18,7 +18,6 @@ package org.apache.lucene.index; */ import java.util.Arrays; -import java.util.Collections; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.concurrent.locks.ReentrantLock; @@ -456,11 +455,6 @@ final class DocumentsWriterDeleteQueue implements Accountable { return globalBufferedUpdates.bytesUsed.get(); } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public String toString() { return "DWDQ: [ generation: " + generation + " ]"; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java index 35d223236f1..c5b000f7309 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java @@ -18,7 +18,6 @@ package org.apache.lucene.index; */ import java.util.ArrayList; -import java.util.Collections; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.LinkedList; @@ -435,15 +434,10 @@ final class DocumentsWriterFlushControl implements Accountable { @Override public long ramBytesUsed() { + // TODO: improve this to return more detailed info? return getDeleteBytesUsed() + netBytes(); } - - @Override - public Iterable getChildResources() { - // TODO: improve this? - return Collections.emptyList(); - } - + synchronized int numFlushingDWPT() { return flushingWriters.size(); } diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java index ae8b092473f..be9a8f8fd3a 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java @@ -460,11 +460,6 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable { ensureOpen(); return docWriter.ramBytesUsed(); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } /** Holds shared SegmentReader instances. IndexWriter uses * SegmentReaders for 1) applying deletes, 2) doing diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeState.java b/lucene/core/src/java/org/apache/lucene/index/MergeState.java index 1afa12116fd..dac392a7fe2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergeState.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergeState.java @@ -18,7 +18,6 @@ package org.apache.lucene.index; */ import java.io.IOException; -import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -28,7 +27,6 @@ import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.codecs.TermVectorsReader; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; import org.apache.lucene.util.InfoStream; import org.apache.lucene.util.packed.PackedInts; @@ -179,11 +177,6 @@ public class MergeState { public long ramBytesUsed() { return 0; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } }; } @@ -233,11 +226,6 @@ public class MergeState { public long ramBytesUsed() { return 0; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } }; } @@ -266,11 +254,6 @@ public class MergeState { public long ramBytesUsed() { return 0; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } }; } @@ -299,11 +282,6 @@ public class MergeState { public long ramBytesUsed() { return 0; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } }; } @@ -338,11 +316,6 @@ public class MergeState { public long ramBytesUsed() { return 0; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } }; } diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java index 23b3bb354b1..f9211241fdd 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java @@ -431,11 +431,6 @@ public class MultiDocValues { public long ramBytesUsed() { return BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(newToOld) + RamUsageEstimator.sizeOf(oldToNew); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } /** diff --git a/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java b/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java index 68b7101f4c3..d3654c2b9c4 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java +++ b/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java @@ -18,7 +18,6 @@ package org.apache.lucene.index; */ import java.io.IOException; -import java.util.Collections; import java.util.Iterator; import org.apache.lucene.store.IndexInput; @@ -44,11 +43,6 @@ class PrefixCodedTerms implements Iterable, Accountable { public long ramBytesUsed() { return buffer.ramBytesUsed(); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } /** @return iterator over the bytes */ @Override diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java b/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java index ffeed5a861e..f8041e70ca9 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java @@ -227,9 +227,4 @@ final class SegmentCoreReaders implements Accountable { ((fieldsReaderOrig!=null)? fieldsReaderOrig.ramBytesUsed() : 0) + ((termVectorsReaderOrig!=null) ? termVectorsReaderOrig.ramBytesUsed() : 0); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } diff --git a/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java b/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java index 14c3799764e..311995cf5a5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java @@ -18,7 +18,6 @@ package org.apache.lucene.search; */ import java.io.IOException; -import java.util.Collections; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; @@ -93,9 +92,4 @@ public abstract class DocIdSet implements Accountable { public boolean isCacheable() { return false; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } diff --git a/lucene/core/src/java/org/apache/lucene/store/RAMFile.java b/lucene/core/src/java/org/apache/lucene/store/RAMFile.java index 4feed57067c..0692482c018 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RAMFile.java +++ b/lucene/core/src/java/org/apache/lucene/store/RAMFile.java @@ -18,7 +18,6 @@ package org.apache.lucene.store; */ import java.util.ArrayList; -import java.util.Collections; import org.apache.lucene.util.Accountable; @@ -82,11 +81,6 @@ public class RAMFile implements Accountable { public synchronized long ramBytesUsed() { return sizeInBytes; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public String toString() { diff --git a/lucene/core/src/java/org/apache/lucene/util/Accountable.java b/lucene/core/src/java/org/apache/lucene/util/Accountable.java index 05792a2f7f4..d8848dbf377 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Accountable.java +++ b/lucene/core/src/java/org/apache/lucene/util/Accountable.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; * limitations under the License. */ +import java.util.Collections; + /** * An object whose RAM usage can be computed. * @@ -34,7 +36,8 @@ public interface Accountable { * The result should be a point-in-time snapshot (to avoid race conditions). * @see Accountables */ - // TODO: on java8 make this a default method returning emptyList - Iterable getChildResources(); + default Iterable getChildResources() { + return Collections.emptyList(); + } } diff --git a/lucene/core/src/java/org/apache/lucene/util/BitSet.java b/lucene/core/src/java/org/apache/lucene/util/BitSet.java index d58cca8f868..2ddb615ea87 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BitSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/BitSet.java @@ -18,7 +18,6 @@ package org.apache.lucene.util; */ import java.io.IOException; -import java.util.Collections; import org.apache.lucene.search.DocIdSetIterator; @@ -145,9 +144,4 @@ public abstract class BitSet implements MutableBits, Accountable { }); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } diff --git a/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java b/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java index 7d6f166aa3d..f26bdb5d3d9 100644 --- a/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java +++ b/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java @@ -19,7 +19,6 @@ package org.apache.lucene.util; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; @@ -135,11 +134,6 @@ public final class PagedBytes implements Accountable { } return size; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public String toString() { @@ -257,11 +251,6 @@ public final class PagedBytes implements Accountable { } return size; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } /** Copy bytes in, writing the length as a 1 or 2 byte * vInt prefix. */ diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java b/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java index 8bd5295690e..0c089af784b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java @@ -19,7 +19,6 @@ package org.apache.lucene.util.fst; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.apache.lucene.store.DataInput; @@ -481,11 +480,6 @@ class BytesStore extends DataOutput implements Accountable { } return size; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public String toString() { diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java b/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java index faffe1a9ea5..9633183d9ad 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java @@ -20,8 +20,6 @@ package org.apache.lucene.util.packed; import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; import static org.apache.lucene.util.packed.PackedInts.numBlocks; -import java.util.Collections; - import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.LongValues; @@ -116,11 +114,6 @@ abstract class AbstractPagedMutable> extends L } return bytesUsed; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } protected abstract T newUnfilledCopy(long newSize); diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java index 9bc99b65cec..bec5358eb26 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java @@ -27,7 +27,6 @@ import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; import static org.apache.lucene.util.packed.PackedInts.numBlocks; import java.io.IOException; -import java.util.Collections; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.Accountable; @@ -100,11 +99,6 @@ public final class BlockPackedReader extends LongValues implements Accountable { } return size; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public String toString() { diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java b/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java index e189ebf63a5..20fa78d871e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java @@ -18,7 +18,6 @@ package org.apache.lucene.util.packed; import java.util.Arrays; -import java.util.Collections; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.FixedBitSet; // for javadocs @@ -363,10 +362,5 @@ public class EliasFanoEncoder implements Accountable { + RamUsageEstimator.sizeOf(upperLongs) + RamUsageEstimator.sizeOf(upperZeroBitPositionIndex); } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java index 81633f69ac0..31ec94f3745 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java @@ -24,7 +24,6 @@ import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; import static org.apache.lucene.util.packed.PackedInts.numBlocks; import java.io.IOException; -import java.util.Collections; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.Accountable; @@ -127,11 +126,6 @@ public class MonotonicBlockPackedReader extends LongValues implements Accountabl return sizeInBytes; } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public String toString() { long avgBPV = subReaders.length == 0 ? 0 : sumBPV / subReaders.length; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java index f820184e3fc..1a29818ee9d 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java @@ -19,7 +19,6 @@ package org.apache.lucene.util.packed; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.index.NumericDocValues; @@ -478,11 +477,6 @@ public class PackedInts { * @return the number of values. */ public abstract int size(); - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } /** diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java index 308db7608e6..2a46fa58056 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java @@ -20,7 +20,6 @@ package org.apache.lucene.util.packed; import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; import java.util.Arrays; -import java.util.Collections; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; @@ -115,11 +114,6 @@ public class PackedLongValues extends LongValues implements Accountable { public long ramBytesUsed() { return ramBytesUsed; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } /** Return an iterator over the values of this array. */ public Iterator iterator() { @@ -214,11 +208,6 @@ public class PackedLongValues extends LongValues implements Accountable { return ramBytesUsed; } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - /** Return the number of elements that have been added to this builder. */ public final long size() { return size; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java index fc334c5f141..960970d1e19 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java @@ -148,11 +148,6 @@ public class CachedOrdinalsReader extends OrdinalsReader implements Accountable } return mem; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } @Override diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java b/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java index 6fa51eeb9a3..dda91a04daf 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java @@ -20,7 +20,6 @@ package org.apache.lucene.uninverting; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.apache.lucene.codecs.PostingsFormat; // javadocs @@ -183,11 +182,6 @@ public class DocTermOrds implements Accountable { return sz; } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - /** Inverts all terms */ public DocTermOrds(LeafReader reader, Bits liveDocs, String field) throws IOException { this(reader, liveDocs, field, null, Integer.MAX_VALUE); diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java index c29b95bfd23..bf4fb654327 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java @@ -19,7 +19,6 @@ package org.apache.lucene.uninverting; import java.io.IOException; import java.io.PrintStream; -import java.util.Collections; import org.apache.lucene.analysis.NumericTokenStream; import org.apache.lucene.document.DoubleField; @@ -64,11 +63,6 @@ interface FieldCache { // don't call on the in-progress value, might make things angry. return RamUsageEstimator.NUM_BYTES_OBJECT_REF; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } /** diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java index f0b9e923c19..db883973b8e 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java @@ -383,11 +383,6 @@ class FieldCacheImpl implements FieldCache { return base + (bits.length() >>> 3); } } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } static final class DocsWithFieldCache extends Cache { @@ -488,11 +483,6 @@ class FieldCacheImpl implements FieldCache { public long ramBytesUsed() { return values.ramBytesUsed() + RamUsageEstimator.NUM_BYTES_OBJECT_REF + RamUsageEstimator.NUM_BYTES_LONG; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } static final class LongCache extends Cache { diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java index e3d2ae0414e..b716acc8e8c 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java @@ -18,7 +18,6 @@ package org.apache.lucene.codecs.idversion; */ import java.io.IOException; -import java.util.Collections; import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.codecs.CodecUtil; @@ -29,7 +28,6 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; final class IDVersionPostingsReader extends PostingsReaderBase { @@ -98,11 +96,6 @@ final class IDVersionPostingsReader extends PostingsReaderBase { public long ramBytesUsed() { return 0; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } @Override public void checkIntegrity() throws IOException { diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java index 04381496505..cbac2d2cffb 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java @@ -30,7 +30,6 @@ import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.InputStreamDataInput; import org.apache.lucene.store.OutputStreamDataOutput; import org.apache.lucene.util.Accountable; -import org.apache.lucene.util.Accountables; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.PriorityQueue; @@ -268,14 +267,4 @@ public abstract class Lookup implements Accountable { * @throws IOException when fatal IO error occurs. */ public abstract boolean load(DataInput input) throws IOException; - - /** - * Returns nested resources of this class. - * The result should be a point-in-time snapshot (to avoid race conditions). - * @see Accountables - */ - @Override - public Iterable getChildResources() { - return null; - } } diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java index 0791afd3684..ec4bf260727 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java @@ -32,7 +32,6 @@ package org.apache.lucene.search.suggest.jaspell; import java.io.BufferedReader; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; @@ -111,11 +110,6 @@ public class JaspellTernarySearchTrie implements Accountable { } return mem; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } /** @@ -903,9 +897,4 @@ public class JaspellTernarySearchTrie implements Accountable { } return mem; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java index 2b040571099..e5a2a382448 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java @@ -128,11 +128,6 @@ public final class RAMOnlyPostingsFormat extends PostingsFormat { return sizeInBytes; } - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } - @Override public long size() { return termToDocs.size(); @@ -195,11 +190,6 @@ public final class RAMOnlyPostingsFormat extends PostingsFormat { } return sizeInBytes; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } static class RAMDoc implements Accountable { @@ -224,11 +214,6 @@ public final class RAMOnlyPostingsFormat extends PostingsFormat { } return sizeInBytes; } - - @Override - public Iterable getChildResources() { - return Collections.emptyList(); - } } // Classes for writing to the postings state