You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/09/09 22:33:35 UTC
svn commit: r1521284 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/
lucene/codecs/src/java/org/apache/lucene/codecs/bloom/
lucene/codecs/src/java/org/apache/lucene/codecs/memor...
Author: rmuir
Date: Mon Sep 9 20:33:33 2013
New Revision: 1521284
URL: http://svn.apache.org/r1521284
Log:
LUCENE-5197: Added SegmentReader.ramBytesUsed
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42BinaryDocValues.java
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesProducer.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Mon Sep 9 20:33:33 2013
@@ -65,6 +65,9 @@ New features
* LUCENE-5186: Added CachingWrapperFilter.getFilter in order to be able to get
the wrapped filter. (Trejkaz via Adrien Grand)
+* LUCENE-5197: Added SegmentReader.ramBytesUsed to return approximate heap RAM
+ used by index datastructures. (Areek Zillur via Robert Muir)
+
Bug Fixes
* LUCENE-5116: IndexWriter.addIndexes(IndexReader...) should drop empty (or all
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Mon Sep 9 20:33:33 2013
@@ -850,4 +850,11 @@ public class BlockTermsReader extends Fi
}
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = (postingsReader!=null) ? postingsReader.ramBytesUsed() : 0;
+ sizeInBytes += (indexReader!=null) ? indexReader.ramBytesUsed() : 0;
+ return sizeInBytes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java Mon Sep 9 20:33:33 2013
@@ -394,6 +394,12 @@ public class FixedGapTermsIndexReader ex
}
}
}
+
+ /** Returns approximate RAM bytes Used */
+ public long ramBytesUsed() {
+ return ((termOffsets!=null)? termOffsets.ramBytesUsed() : 0) +
+ ((termsDictOffsets!=null)? termsDictOffsets.ramBytesUsed() : 0);
+ }
}
}
@@ -421,4 +427,14 @@ public class FixedGapTermsIndexReader ex
}
input.seek(dirOffset);
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = ((termBytes!=null) ? termBytes.ramBytesUsed() : 0) +
+ ((termBytesReader!=null)? termBytesReader.ramBytesUsed() : 0);
+ for(FieldIndexData entry : fields.values()) {
+ sizeInBytes += entry.coreIndex.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java Mon Sep 9 20:33:33 2013
@@ -72,4 +72,7 @@ public abstract class TermsIndexReaderBa
/** Only implemented if {@link TermsIndexReaderBase#supportsOrd()} returns true. */
public abstract long ord();
}
+
+ /** Returns approximate RAM bytes used */
+ public abstract long ramBytesUsed();
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java Mon Sep 9 20:33:33 2013
@@ -215,6 +215,11 @@ public class VariableGapTermsIndexReader
}
}
}
+
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ return fst == null ? 0 : fst.sizeInBytes();
+ }
}
@Override
@@ -241,4 +246,13 @@ public class VariableGapTermsIndexReader
}
input.seek(dirOffset);
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(FieldIndexData entry : fields.values()) {
+ sizeInBytes += entry.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Mon Sep 9 20:33:33 2013
@@ -48,6 +48,7 @@ import org.apache.lucene.store.IndexOutp
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.automaton.CompiledAutomaton;
/**
@@ -394,6 +395,16 @@ public final class BloomFilteringPosting
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = ((delegateFieldsProducer!=null) ? delegateFieldsProducer.ramBytesUsed() : 0);
+ for(Map.Entry<String,FuzzySet> entry: bloomsByFieldName.entrySet()) {
+ sizeInBytes += entry.getKey().length() * RamUsageEstimator.NUM_BYTES_CHAR;
+ sizeInBytes += entry.getValue().ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java Mon Sep 9 20:33:33 2013
@@ -22,6 +22,7 @@ import org.apache.lucene.store.DataInput
import org.apache.lucene.store.DataOutput;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
+import org.apache.lucene.util.RamUsageEstimator;
/**
* <p>
@@ -302,4 +303,8 @@ public class FuzzySet {
int numBitsSet = filter.cardinality();
return (float) numBitsSet / (float) bloomSize;
}
-}
\ No newline at end of file
+
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(filter.getBits());
+ }
+}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Mon Sep 9 20:33:33 2013
@@ -44,6 +44,7 @@ import org.apache.lucene.store.RAMOutput
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.automaton.CompiledAutomaton;
import org.apache.lucene.util.automaton.RunAutomaton;
import org.apache.lucene.util.automaton.Transition;
@@ -156,12 +157,25 @@ public final class DirectPostingsFormat
@Override
public void close() {
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(Map.Entry<String,DirectField> entry: fields.entrySet()) {
+ sizeInBytes += entry.getKey().length() * RamUsageEstimator.NUM_BYTES_CHAR;
+ sizeInBytes += entry.getValue().ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
private final static class DirectField extends Terms {
private static abstract class TermAndSkip {
public int[] skips;
+
+ /** Returns the approximate number of RAM bytes used */
+ public abstract long ramBytesUsed();
}
private static final class LowFreqTerm extends TermAndSkip {
@@ -176,6 +190,12 @@ public final class DirectPostingsFormat
this.docFreq = docFreq;
this.totalTermFreq = totalTermFreq;
}
+
+ @Override
+ public long ramBytesUsed() {
+ return ((postings!=null) ? RamUsageEstimator.sizeOf(postings) : 0) +
+ ((payloads!=null) ? RamUsageEstimator.sizeOf(payloads) : 0);
+ }
}
// TODO: maybe specialize into prx/no-prx/no-frq cases?
@@ -193,6 +213,31 @@ public final class DirectPostingsFormat
this.payloads = payloads;
this.totalTermFreq = totalTermFreq;
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ sizeInBytes += (docIDs!=null)? RamUsageEstimator.sizeOf(docIDs) : 0;
+ sizeInBytes += (freqs!=null)? RamUsageEstimator.sizeOf(freqs) : 0;
+
+ if(positions != null) {
+ for(int[] position : positions) {
+ sizeInBytes += (position!=null) ? RamUsageEstimator.sizeOf(position) : 0;
+ }
+ }
+
+ if (payloads != null) {
+ for(byte[][] payload : payloads) {
+ if(payload != null) {
+ for(byte[] pload : payload) {
+ sizeInBytes += (pload!=null) ? RamUsageEstimator.sizeOf(pload) : 0;
+ }
+ }
+ }
+ }
+
+ return sizeInBytes;
+ }
}
private final byte[] termBytes;
@@ -453,6 +498,24 @@ public final class DirectPostingsFormat
assert skipOffset == skipCount;
}
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ sizeInBytes += ((termBytes!=null) ? RamUsageEstimator.sizeOf(termBytes) : 0);
+ sizeInBytes += ((termOffsets!=null) ? RamUsageEstimator.sizeOf(termOffsets) : 0);
+ sizeInBytes += ((skips!=null) ? RamUsageEstimator.sizeOf(skips) : 0);
+ sizeInBytes += ((skipOffsets!=null) ? RamUsageEstimator.sizeOf(skipOffsets) : 0);
+ sizeInBytes += ((sameCounts!=null) ? RamUsageEstimator.sizeOf(sameCounts) : 0);
+
+ if(terms!=null) {
+ for(TermAndSkip termAndSkip : terms) {
+ sizeInBytes += (termAndSkip!=null) ? termAndSkip.ramBytesUsed() : 0;
+ }
+ }
+
+ return sizeInBytes;
+ }
+
// Compares in unicode (UTF8) order:
int compare(int ord, BytesRef other) {
final byte[] otherBytes = other.bytes;
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java Mon Sep 9 20:33:33 2013
@@ -44,6 +44,7 @@ import org.apache.lucene.util.FixedBitSe
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.IntsRef;
import org.apache.lucene.util.PagedBytes;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.fst.BytesRefFSTEnum;
import org.apache.lucene.util.fst.BytesRefFSTEnum.InputOutput;
import org.apache.lucene.util.fst.FST;
@@ -202,6 +203,12 @@ class MemoryDocValuesProducer extends Do
return instance;
}
+ @Override
+ public long ramBytesUsed() {
+ // TODO: optimize me
+ return RamUsageEstimator.sizeOf(this);
+ }
+
private NumericDocValues loadNumeric(FieldInfo field) throws IOException {
NumericEntry entry = numerics.get(field.number);
data.seek(entry.offset + entry.missingBytes);
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Mon Sep 9 20:33:33 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
+import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -49,6 +50,7 @@ import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRef;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.fst.Builder;
import org.apache.lucene.util.fst.ByteSequenceOutputs;
import org.apache.lucene.util.fst.BytesRefFSTEnum;
@@ -843,6 +845,10 @@ public final class MemoryPostingsFormat
public boolean hasPayloads() {
return field.hasPayloads();
}
+
+ public long ramBytesUsed() {
+ return ((fst!=null) ? fst.sizeInBytes() : 0);
+ }
}
@Override
@@ -889,6 +895,16 @@ public final class MemoryPostingsFormat
termsReader.fst = null;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(Map.Entry<String,TermsReader> entry: fields.entrySet()) {
+ sizeInBytes += (entry.getKey().length() * RamUsageEstimator.NUM_BYTES_CHAR);
+ sizeInBytes += entry.getValue().ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
};
}
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java Mon Sep 9 20:33:33 2013
@@ -630,4 +630,9 @@ public class PulsingPostingsReader exten
// we don't want to copy any stuff over to another docsenum ever!
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return ((wrappedPostingsReader!=null) ? wrappedPostingsReader.ramBytesUsed(): 0);
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java Mon Sep 9 20:33:33 2013
@@ -728,4 +728,9 @@ public class SepPostingsReader extends P
return docFreq;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java Mon Sep 9 20:33:33 2013
@@ -62,6 +62,7 @@ class SimpleTextDocValuesReader extends
boolean fixedLength;
long minValue;
long numValues;
+
};
final int maxDoc;
@@ -464,4 +465,9 @@ class SimpleTextDocValuesReader extends
private String stripPrefix(BytesRef prefix) throws IOException {
return new String(scratch.bytes, scratch.offset + prefix.length, scratch.length - prefix.length, "UTF-8");
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Mon Sep 9 20:33:33 2013
@@ -574,6 +574,11 @@ class SimpleTextFieldsReader extends Fie
*/
//System.out.println("FST " + fst.sizeInBytes());
}
+
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ return (fst!=null) ? fst.sizeInBytes() : 0;
+ }
@Override
public TermsEnum iterator(TermsEnum reuse) throws IOException {
@@ -630,7 +635,7 @@ class SimpleTextFieldsReader extends Fie
return Collections.unmodifiableSet(fields.keySet()).iterator();
}
- private final Map<String,Terms> termsCache = new HashMap<String,Terms>();
+ private final Map<String,SimpleTextTerms> termsCache = new HashMap<String,SimpleTextTerms>();
@Override
synchronized public Terms terms(String field) throws IOException {
@@ -641,7 +646,7 @@ class SimpleTextFieldsReader extends Fie
return null;
} else {
terms = new SimpleTextTerms(field, fp);
- termsCache.put(field, terms);
+ termsCache.put(field, (SimpleTextTerms) terms);
}
}
return terms;
@@ -656,4 +661,13 @@ class SimpleTextFieldsReader extends Fie
public void close() throws IOException {
in.close();
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(SimpleTextTerms simpleTextTerms : termsCache.values()) {
+ sizeInBytes += (simpleTextTerms!=null) ? simpleTextTerms.ramBytesUsed() : 0;
+ }
+ return sizeInBytes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Mon Sep 9 20:33:33 2013
@@ -192,4 +192,9 @@ public class SimpleTextStoredFieldsReade
return a.length == b.length - bOffset &&
ArrayUtil.equals(a.bytes, a.offset, b.bytes, b.offset + bOffset, b.length - bOffset);
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Mon Sep 9 20:33:33 2013
@@ -538,4 +538,9 @@ public class SimpleTextTermVectorsReader
return 1;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Mon Sep 9 20:33:33 2013
@@ -553,6 +553,11 @@ public class BlockTreeTermsReader extend
return new IntersectEnum(compiled, startTerm);
}
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ return ((index!=null)? index.sizeInBytes() : 0);
+ }
+
// NOTE: cannot seek!
private final class IntersectEnum extends TermsEnum {
private final IndexInput in;
@@ -2935,4 +2940,13 @@ public class BlockTreeTermsReader extend
}
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInByes = ((postingsReader!=null) ? postingsReader.ramBytesUsed() : 0);
+ for(FieldReader reader : fields.values()) {
+ sizeInByes += reader.ramBytesUsed();
+ }
+ return sizeInByes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java Mon Sep 9 20:33:33 2013
@@ -64,6 +64,9 @@ public abstract class DocValuesProducer
* used by a single thread. */
public abstract Bits getDocsWithField(FieldInfo field) throws IOException;
+ /** Returns approximate RAM bytes used */
+ public abstract long ramBytesUsed();
+
/**
* A simple implementation of {@link DocValuesProducer#getDocsWithField} that
* returns {@code true} if a document has an ordinal >= 0
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java Mon Sep 9 20:33:33 2013
@@ -36,4 +36,7 @@ public abstract class FieldsProducer ext
@Override
public abstract void close() throws IOException;
+
+ /** Returns approximate RAM bytes used */
+ public abstract long ramBytesUsed();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java Mon Sep 9 20:33:33 2013
@@ -66,6 +66,9 @@ public abstract class PostingsReaderBase
public abstract DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, DocsAndPositionsEnum reuse,
int flags) throws IOException;
+ /** Returns approximate RAM bytes used */
+ public abstract long ramBytesUsed();
+
@Override
public abstract void close() throws IOException;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java Mon Sep 9 20:33:33 2013
@@ -40,4 +40,7 @@ public abstract class StoredFieldsReader
@Override
public abstract StoredFieldsReader clone();
+
+ /** Returns approximate RAM bytes used */
+ public abstract long ramBytesUsed();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java Mon Sep 9 20:33:33 2013
@@ -42,6 +42,9 @@ public abstract class TermVectorsReader
* available from the {@link DocsAndPositionsEnum}. */
public abstract Fields get(int doc) throws IOException;
+ /** Returns approximate RAM bytes used */
+ public abstract long ramBytesUsed();
+
/** Create a clone that one caller at a time may use to
* read term vectors. */
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java Mon Sep 9 20:33:33 2013
@@ -24,6 +24,7 @@ import org.apache.lucene.index.CorruptIn
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.packed.PackedInts;
/**
@@ -160,5 +161,23 @@ public final class CompressingStoredFiel
public CompressingStoredFieldsIndexReader clone() {
return this;
}
+
+ long ramBytesUsed() {
+ long res = 0;
+
+ for(PackedInts.Reader r : docBasesDeltas) {
+ res += r.ramBytesUsed();
+ }
+ for(PackedInts.Reader r : startPointersDeltas) {
+ res += r.ramBytesUsed();
+ }
+
+ res += RamUsageEstimator.sizeOf(docBases);
+ res += RamUsageEstimator.sizeOf(startPointers);
+ res += RamUsageEstimator.sizeOf(avgChunkDocs);
+ res += RamUsageEstimator.sizeOf(avgChunkSizes);
+
+ return res;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java Mon Sep 9 20:33:33 2013
@@ -497,4 +497,9 @@ public final class CompressingStoredFiel
}
+ @Override
+ public long ramBytesUsed() {
+ return indexReader.ramBytesUsed();
+ }
+
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java Mon Sep 9 20:33:33 2013
@@ -57,6 +57,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LongsRef;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.packed.BlockPackedReaderIterator;
import org.apache.lucene.util.packed.PackedInts;
@@ -1041,4 +1042,9 @@ public final class CompressingTermVector
return sum;
}
+ @Override
+ public long ramBytesUsed() {
+ return indexReader.ramBytesUsed();
+ }
+
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java Mon Sep 9 20:33:33 2013
@@ -42,6 +42,7 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.UnicodeUtil;
/** Exposes flex API on a pre-flex index, as a codec.
@@ -1068,4 +1069,9 @@ class Lucene3xFields extends FieldsProdu
return pos.df;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(this);
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java Mon Sep 9 20:33:33 2013
@@ -38,6 +38,7 @@ import org.apache.lucene.store.IOContext
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.StringHelper;
/**
@@ -218,4 +219,9 @@ class Lucene3xNormsProducer extends DocV
public Bits getDocsWithField(FieldInfo field) throws IOException {
throw new AssertionError();
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(this);
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java Mon Sep 9 20:33:33 2013
@@ -34,6 +34,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
import java.io.Closeable;
@@ -297,4 +298,9 @@ final class Lucene3xStoredFieldsReader e
fieldsStream.seek(fieldsStream.getFilePointer() + length);
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(this);
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java Mon Sep 9 20:33:33 2013
@@ -45,6 +45,7 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
/** @deprecated Only for reading existing 3.x indexes */
@Deprecated
@@ -731,5 +732,10 @@ class Lucene3xTermVectorsReader extends
protected boolean sortTermsByUnicode() {
return true;
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(this);
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java Mon Sep 9 20:33:33 2013
@@ -39,6 +39,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.PagedBytes;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.packed.PackedInts;
/**
@@ -630,4 +631,9 @@ final class Lucene40DocValuesReader exte
public void close() throws IOException {
dir.close();
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(this);
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java Mon Sep 9 20:33:33 2013
@@ -1195,4 +1195,10 @@ public class Lucene40PostingsReader exte
return limit;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
+
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java Mon Sep 9 20:33:33 2013
@@ -244,4 +244,9 @@ public final class Lucene40StoredFieldsR
return fieldsStream;
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java Mon Sep 9 20:33:33 2013
@@ -763,5 +763,10 @@ public class Lucene40TermVectorsReader e
return new Lucene40TermVectorsReader(fieldInfos, cloneTvx, cloneTvd, cloneTvf, size, numTotalDocs);
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java Mon Sep 9 20:33:33 2013
@@ -1604,4 +1604,10 @@ public final class Lucene41PostingsReade
return docFreq;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 0;
+ }
+
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java Mon Sep 9 20:33:33 2013
@@ -43,6 +43,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.IntsRef;
import org.apache.lucene.util.PagedBytes;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.fst.BytesRefFSTEnum;
import org.apache.lucene.util.fst.BytesRefFSTEnum.InputOutput;
import org.apache.lucene.util.fst.FST;
@@ -188,6 +189,11 @@ class Lucene42DocValuesProducer extends
return instance;
}
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(this);
+ }
+
private NumericDocValues loadNumeric(FieldInfo field) throws IOException {
NumericEntry entry = numerics.get(field.number);
data.seek(entry.offset);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java Mon Sep 9 20:33:33 2013
@@ -20,7 +20,6 @@ package org.apache.lucene.codecs.lucene4
import static org.apache.lucene.codecs.lucene45.Lucene45DocValuesConsumer.DELTA_COMPRESSED;
import static org.apache.lucene.codecs.lucene45.Lucene45DocValuesConsumer.GCD_COMPRESSED;
import static org.apache.lucene.codecs.lucene45.Lucene45DocValuesConsumer.TABLE_COMPRESSED;
-
import static org.apache.lucene.codecs.lucene45.Lucene45DocValuesConsumer.BINARY_FIXED_UNCOMPRESSED;
import static org.apache.lucene.codecs.lucene45.Lucene45DocValuesConsumer.BINARY_VARIABLE_UNCOMPRESSED;
import static org.apache.lucene.codecs.lucene45.Lucene45DocValuesConsumer.BINARY_PREFIX_COMPRESSED;
@@ -244,6 +243,18 @@ public class Lucene45DocValuesProducer e
return getNumeric(entry);
}
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(MonotonicBlockPackedReader monotonicBlockPackedReader: addressInstances.values()) {
+ sizeInBytes += Integer.SIZE + monotonicBlockPackedReader.ramBytesUsed();
+ }
+ for(MonotonicBlockPackedReader monotonicBlockPackedReader: ordIndexInstances.values()) {
+ sizeInBytes += Integer.SIZE + monotonicBlockPackedReader.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
+
LongNumericDocValues getNumeric(NumericEntry entry) throws IOException {
final IndexInput data = this.data.clone();
data.seek(entry.offset);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java Mon Sep 9 20:33:33 2013
@@ -39,6 +39,7 @@ import org.apache.lucene.index.SortedSet
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
/**
* Enables per field docvalues support.
@@ -282,6 +283,16 @@ public abstract class PerFieldDocValuesF
public DocValuesProducer clone() {
return new FieldsReader(this);
}
+
+ @Override
+ public long ramBytesUsed() {
+ long size = 0;
+ for (Map.Entry<String,DocValuesProducer> entry : formats.entrySet()) {
+ size += (entry.getKey().length() * RamUsageEstimator.NUM_BYTES_CHAR) +
+ entry.getValue().ramBytesUsed();
+ }
+ return size;
+ }
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java Mon Sep 9 20:33:33 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.index.SegmentRe
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.Terms;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
/**
* Enables per field postings support.
@@ -225,6 +226,16 @@ public abstract class PerFieldPostingsFo
public void close() throws IOException {
IOUtils.close(formats.values());
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(Map.Entry<String,FieldsProducer> entry: formats.entrySet()) {
+ sizeInBytes += entry.getKey().length() * RamUsageEstimator.NUM_BYTES_CHAR;
+ sizeInBytes += entry.getValue().ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java Mon Sep 9 20:33:33 2013
@@ -361,6 +361,14 @@ final class SegmentCoreReaders {
coreClosedListeners.remove(listener);
}
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ return ((dvProducer!=null) ? dvProducer.ramBytesUsed() : 0) +
+ ((normsProducer!=null) ? normsProducer.ramBytesUsed() : 0) +
+ ((fields!=null) ? fields.ramBytesUsed() : 0) +
+ ((fieldsReaderOrig!=null)? fieldsReaderOrig.ramBytesUsed() : 0) +
+ ((termVectorsReaderOrig!=null) ? termVectorsReaderOrig.ramBytesUsed() : 0);
+ }
@Override
public String toString() {
return "SegmentCoreReader(owner=" + owner + ")";
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Mon Sep 9 20:33:33 2013
@@ -289,4 +289,10 @@ public final class SegmentReader extends
ensureOpen();
core.removeCoreClosedListener(listener);
}
+
+ /** Returns approximate RAM Bytes used */
+ public long ramBytesUsed() {
+ ensureOpen();
+ return (core!=null) ? core.ramBytesUsed() : 0;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java Mon Sep 9 20:33:33 2013
@@ -126,6 +126,11 @@ public final class PagedBytes {
assert b.length > 0;
}
}
+
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ return ((blocks!=null) ? (blockSize * blocks.length) : 0);
+ }
}
/** 1<<blockBits must be bigger than biggest single
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java Mon Sep 9 20:33:33 2013
@@ -85,4 +85,12 @@ public final class BlockPackedReader {
return (minValues == null ? 0 : minValues[block]) + subReaders[block].get(idx);
}
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ long size = 0;
+ for (PackedInts.Reader reader : subReaders) {
+ size += reader.ramBytesUsed();
+ }
+ return size;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java Mon Sep 9 20:33:33 2013
@@ -26,6 +26,7 @@ import static org.apache.lucene.util.pac
import java.io.IOException;
import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.util.RamUsageEstimator;
/**
* Provides random access to a stream written with
@@ -83,5 +84,16 @@ public final class MonotonicBlockPackedR
public long size() {
return valueCount;
}
+
+ /** Returns the approximate RAM bytes used */
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ sizeInBytes += RamUsageEstimator.sizeOf(minValues);
+ sizeInBytes += RamUsageEstimator.sizeOf(averages);
+ for(PackedInts.Reader reader: subReaders) {
+ sizeInBytes += reader.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42BinaryDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42BinaryDocValues.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42BinaryDocValues.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42BinaryDocValues.java Mon Sep 9 20:33:33 2013
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.store.DataInput;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.packed.PackedInts;
class Facet42BinaryDocValues extends BinaryDocValues {
@@ -44,4 +45,9 @@ class Facet42BinaryDocValues extends Bin
ret.length = (int) (addresses.get(docID+1)-start);
}
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(bytes) + addresses.ramBytesUsed();
+ }
+
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesProducer.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42DocValuesProducer.java Mon Sep 9 20:33:33 2013
@@ -91,4 +91,13 @@ class Facet42DocValuesProducer extends D
@Override
public void close() throws IOException {
}
+
+ @Override
+ public long ramBytesUsed() {
+ long size = 0;
+ for (Facet42BinaryDocValues entry: fields.values()) {
+ size += entry.ramBytesUsed() + Integer.SIZE;
+ }
+ return size;
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java Mon Sep 9 20:33:33 2013
@@ -37,6 +37,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.OpenBitSet;
+import org.apache.lucene.util.RamUsageEstimator;
/**
* Just like {@link Lucene45DocValuesFormat} but with additional asserts.
@@ -301,5 +302,10 @@ public class AssertingDocValuesFormat ex
public void close() throws IOException {
in.close();
}
+
+ @Override
+ public long ramBytesUsed() {
+ return in.ramBytesUsed();
+ }
}
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Mon Sep 9 20:33:33 2013
@@ -91,6 +91,11 @@ public final class AssertingPostingsForm
public long getUniqueTermCount() throws IOException {
return in.getUniqueTermCount();
}
+
+ @Override
+ public long ramBytesUsed() {
+ return in.ramBytesUsed();
+ }
}
static class AssertingFieldsConsumer extends FieldsConsumer {
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java Mon Sep 9 20:33:33 2013
@@ -71,6 +71,11 @@ public class AssertingStoredFieldsFormat
public StoredFieldsReader clone() {
return new AssertingStoredFieldsReader(in.clone(), maxDoc);
}
+
+ @Override
+ public long ramBytesUsed() {
+ return in.ramBytesUsed();
+ }
}
enum Status {
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java Mon Sep 9 20:33:33 2013
@@ -71,6 +71,11 @@ public class AssertingTermVectorsFormat
public TermVectorsReader clone() {
return new AssertingTermVectorsReader(in.clone());
}
+
+ @Override
+ public long ramBytesUsed() {
+ return in.ramBytesUsed();
+ }
}
enum Status {
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1521284&r1=1521283&r2=1521284&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Mon Sep 9 20:33:33 2013
@@ -50,6 +50,7 @@ import org.apache.lucene.store.IndexOutp
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.RamUsageEstimator;
/** Stores all postings data in RAM, but writes a small
* token (header + single int) to identify which "slot" the
@@ -120,6 +121,15 @@ public final class RAMOnlyPostingsFormat
@Override
public void close() {
}
+
+ @Override
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(RAMField field : fieldToTerms.values()) {
+ sizeInBytes += field.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
static class RAMField extends Terms {
@@ -135,6 +145,15 @@ public final class RAMOnlyPostingsFormat
this.info = info;
}
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(RAMTerm term : termToDocs.values()) {
+ sizeInBytes += term.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
+
@Override
public long size() {
return termToDocs.size();
@@ -188,6 +207,15 @@ public final class RAMOnlyPostingsFormat
public RAMTerm(String term) {
this.term = term;
}
+
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ for(RAMDoc rDoc : docs) {
+ sizeInBytes += rDoc.ramBytesUsed();
+ }
+ return sizeInBytes;
+ }
}
static class RAMDoc {
@@ -199,6 +227,19 @@ public final class RAMOnlyPostingsFormat
this.docID = docID;
positions = new int[freq];
}
+
+ /** Returns approximate RAM bytes used */
+ public long ramBytesUsed() {
+ long sizeInBytes = 0;
+ sizeInBytes += (positions!=null) ? RamUsageEstimator.sizeOf(positions) : 0;
+
+ if (payloads != null) {
+ for(byte[] payload: payloads) {
+ sizeInBytes += (payload!=null) ? RamUsageEstimator.sizeOf(payload) : 0;
+ }
+ }
+ return sizeInBytes;
+ }
}
// Classes for writing to the postings state