Prevent usage of object based RamUsageEstimator in Completion090Posti…

…ngsFormat
elastic · Jan 31, 2014 · 6e18a89 · 6e18a89
1 parent 3e31702
commit 6e18a89
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/...n/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java b/...n/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
@@ -204,6 +204,7 @@ public int getMaxAnalyzedPathsForOneInput() {
 
     @Override
     public LookupFactory load(IndexInput input) throws IOException {
+        long sizeInBytes = 0;
         int version = CodecUtil.checkHeader(input, CODEC_NAME, CODEC_VERSION_START, CODEC_VERSION_LATEST);
         final Map<String, AnalyzingSuggestHolder> lookupMap = new HashMap<String, AnalyzingSuggestHolder>();
         input.seek(input.length() - 8);
@@ -249,8 +250,10 @@ public LookupFactory load(IndexInput input) throws IOException {
 
             AnalyzingSuggestHolder holder = new AnalyzingSuggestHolder(preserveSep, preservePositionIncrements, maxSurfaceFormsPerAnalyzedForm, maxGraphExpansions,
                     hasPayloads, maxAnalyzedPathsForOneInput, fst, sepLabel, payloadSep, endByte, holeCharacter);
+            sizeInBytes += fst.sizeInBytes();
             lookupMap.put(entry.getValue(), holder);
         }
+        final long ramBytesUsed = sizeInBytes;
         return new LookupFactory() {
             @Override
             public Lookup getLookup(FieldMapper<?> mapper, CompletionSuggestionContext suggestionContext) {
@@ -309,6 +312,11 @@ public CompletionStats stats(String... fields) {
             AnalyzingSuggestHolder getAnalyzingSuggestHolder(FieldMapper<?> mapper) {
                 return lookupMap.get(mapper.names().indexName());
             }
+
+            @Override
+            public long ramBytesUsed() {
+                return ramBytesUsed;
+            }
         };
     }
 

diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java b/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java
@@ -272,7 +272,7 @@ public int size() {
 
         @Override
         public long ramBytesUsed() {
-            return RamUsageEstimator.sizeOf(lookupFactory) + delegateProducer.ramBytesUsed();
+            return (lookupFactory == null ? 0 : lookupFactory.ramBytesUsed()) + delegateProducer.ramBytesUsed();
         }
     }
 
@@ -367,5 +367,6 @@ public static abstract class LookupFactory {
         public abstract Lookup getLookup(FieldMapper<?> mapper, CompletionSuggestionContext suggestionContext);
         public abstract CompletionStats stats(String ... fields);
         abstract AnalyzingCompletionLookupProvider.AnalyzingSuggestHolder getAnalyzingSuggestHolder(FieldMapper<?> mapper);
+        public abstract long ramBytesUsed();
     }
 }
diff --git a/...java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java b/...java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
@@ -224,7 +224,7 @@ public LookupFactory load(IndexInput input) throws IOException {
             long offset = input.readVLong();
             meta.put(offset, name);
         }
-
+        long sizeInBytes = 0;
         for (Map.Entry<Long, String> entry : meta.entrySet()) {
             input.seek(entry.getKey());
             FST<Pair<Long, BytesRef>> fst = new FST<Pair<Long, BytesRef>>(input, new PairOutputs<Long, BytesRef>(
@@ -236,9 +236,11 @@ public LookupFactory load(IndexInput input) throws IOException {
             boolean preserveSep = (options & SERIALIZE_PRESERVE_SEPERATORS) != 0;
             boolean hasPayloads = (options & SERIALIZE_HAS_PAYLOADS) != 0;
             boolean preservePositionIncrements = (options & SERIALIZE_PRESERVE_POSITION_INCREMENTS) != 0;
+            sizeInBytes += fst.sizeInBytes();
             lookupMap.put(entry.getValue(), new AnalyzingSuggestHolder(preserveSep, preservePositionIncrements, maxSurfaceFormsPerAnalyzedForm, maxGraphExpansions,
                     hasPayloads, maxAnalyzedPathsForOneInput, fst));
         }
+        final long ramBytesUsed = sizeInBytes;
         return new LookupFactory() {
             @Override
             public Lookup getLookup(FieldMapper<?> mapper, CompletionSuggestionContext suggestionContext) {
@@ -295,6 +297,11 @@ public CompletionStats stats(String... fields) {
             AnalyzingSuggestHolder getAnalyzingSuggestHolder(FieldMapper<?> mapper) {
                 return lookupMap.get(mapper.names().indexName());
             }
+
+            @Override
+            public long ramBytesUsed() {
+                return ramBytesUsed;
+            }
         };
     }