Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-07 00:39:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

LUCENE-6067: Accountable.getChildResources returns empty list by default

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1641002 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2014-11-21 21:06:23 +00:00
parent 6fbb36316a
commit 147efcfdf1
39 changed files with 10 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -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

5
lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
View File

@ -238,11 +238,6 @@ public class BlockTermsReader extends FieldsProducer {
public long ramBytesUsed() {
return FIELD_READER_RAM_BYTES_USED;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public TermsEnum iterator(TermsEnum reuse) throws IOException {

6
lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
return getClass().getSimpleName() + "(hash=" + hashFunction + ")";

5
lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
View File

@ -685,11 +685,6 @@ class DirectDocValuesProducer extends DocValuesProducer {
return bytesUsed;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
return getClass().getSimpleName();

15
lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
View File

@ -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<? extends Accountable> 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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
private final byte[] termBytes;
@ -543,11 +533,6 @@ public final class DirectPostingsFormat extends PostingsFormat {
return sizeInBytes;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {

6
lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java
View File

@ -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<FSTTermOutputs.TermData> {
}
return ramBytesUsed;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
// NOTE: actually, FST nodes are seldom
// identical when outputs on their arcs

5
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
View File

@ -510,11 +510,6 @@ class SimpleTextDocValuesReader extends DocValuesProducer {
+ fields.size() * (RamUsageEstimator.NUM_BYTES_OBJECT_REF * 2L + OneField.BASE_RAM_BYTES_USED);
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
return getClass().getSimpleName() + "(fields=" + fields.size() + ")";

8
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
return getClass().getSimpleName();

6
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {

7
lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public void checkIntegrity() throws IOException {

5
lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
View File

@ -116,11 +116,6 @@ class BufferedUpdatesStream implements Accountable {
public long ramBytesUsed() {
return bytesUsed.get();
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
public static class ApplyDeletesResult {

6
lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
static final class ApplyDeletesEvent implements Event {
static final Event INSTANCE = new ApplyDeletesEvent();

6
lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
return "DWDQ: [ generation: " + generation + " ]";

10
lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
View File

@ -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<? extends Accountable> getChildResources() {
// TODO: improve this?
return Collections.emptyList();
}
synchronized int numFlushingDWPT() {
return flushingWriters.size();
}

5
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -460,11 +460,6 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable {
ensureOpen();
return docWriter.ramBytesUsed();
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
/** Holds shared SegmentReader instances. IndexWriter uses
* SegmentReaders for 1) applying deletes, 2) doing

27
lucene/core/src/java/org/apache/lucene/index/MergeState.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
};
}
@ -233,11 +226,6 @@ public class MergeState {
public long ramBytesUsed() {
return 0;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
};
}
@ -266,11 +254,6 @@ public class MergeState {
public long ramBytesUsed() {
return 0;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
};
}
@ -299,11 +282,6 @@ public class MergeState {
public long ramBytesUsed() {
return 0;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
};
}
@ -338,11 +316,6 @@ public class MergeState {
public long ramBytesUsed() {
return 0;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
};
}

5
lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
View File

@ -431,11 +431,6 @@ public class MultiDocValues {
public long ramBytesUsed() {
return BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(newToOld) + RamUsageEstimator.sizeOf(oldToNew);
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
/**

6
lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java
View File

@ -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<Term>, Accountable {
public long ramBytesUsed() {
return buffer.ramBytesUsed();
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
/** @return iterator over the bytes */
@Override

5
lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
View File

@ -227,9 +227,4 @@ final class SegmentCoreReaders implements Accountable {
((fieldsReaderOrig!=null)? fieldsReaderOrig.ramBytesUsed() : 0) +
((termVectorsReaderOrig!=null) ? termVectorsReaderOrig.ramBytesUsed() : 0);
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}

6
lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}

6
lucene/core/src/java/org/apache/lucene/store/RAMFile.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {

7
lucene/core/src/java/org/apache/lucene/util/Accountable.java
View File

@ -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<? extends Accountable> getChildResources();
default Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}

6
lucene/core/src/java/org/apache/lucene/util/BitSet.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}

11
lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
@ -257,11 +251,6 @@ public final class PagedBytes implements Accountable {
}
return size;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
/** Copy bytes in, writing the length as a 1 or 2 byte
* vInt prefix. */

6
lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {

7
lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java
View File

@ -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<T extends AbstractPagedMutable<T>> extends L
}
return bytesUsed;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
protected abstract T newUnfilledCopy(long newSize);

6
lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {

6
lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}

6
lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public String toString() {
long avgBPV = subReaders.length == 0 ? 0 : sumBPV / subReaders.length;

6
lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
/**

11
lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java
View File

@ -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<? extends Accountable> 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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
/** Return the number of elements that have been added to this builder. */
public final long size() {
return size;

5
lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
View File

@ -148,11 +148,6 @@ public class CachedOrdinalsReader extends OrdinalsReader implements Accountable
}
return mem;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
@Override

6
lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
View File

@ -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<? extends Accountable> 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);

6
lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
/**

10
lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
View File

@ -383,11 +383,6 @@ class FieldCacheImpl implements FieldCache {
return base + (bits.length() >>> 3);
}
}
@Override
public Iterable<? extends Accountable> 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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
static final class LongCache extends Cache {

7
lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
@Override
public void checkIntegrity() throws IOException {

11
lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java
View File

@ -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<? extends Accountable> getChildResources() {
return null;
}
}

11
lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
View File

@ -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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
/**
@ -903,9 +897,4 @@ public class JaspellTernarySearchTrie implements Accountable {
}
return mem;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}

15
lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
View File

@ -128,11 +128,6 @@ public final class RAMOnlyPostingsFormat extends PostingsFormat {
return sizeInBytes;
}
@Override
public Iterable<? extends Accountable> 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<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
static class RAMDoc implements Accountable {
@ -224,11 +214,6 @@ public final class RAMOnlyPostingsFormat extends PostingsFormat {
}
return sizeInBytes;
}
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
}
}
// Classes for writing to the postings state