You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/06/21 18:07:44 UTC
svn commit: r1138069 - in /lucene/dev/trunk/lucene: CHANGES.txt
src/java/org/apache/lucene/index/FrozenBufferedDeletes.java
Author: mikemccand
Date: Tue Jun 21 16:07:44 2011
New Revision: 1138069
URL: http://svn.apache.org/viewvc?rev=1138069&view=rev
Log:
LUCENE-3222: don't under count RAM required for deleted terms
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1138069&r1=1138068&r2=1138069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Tue Jun 21 16:07:44 2011
@@ -544,6 +544,10 @@ Bug fixes
background optimize when documents are still being deleted
concurrently with the optimize (Mike McCandless)
+* LUCENE-3222: The RAM accounting for buffered delete terms was
+ failing to measure the space required to hold the term's field and
+ text character data. (Mike McCandless)
+
API Changes
* LUCENE-3208: Renamed protected IndexSearcher.createWeight() to expert
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java?rev=1138069&r1=1138068&r2=1138069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java Tue Jun 21 16:07:44 2011
@@ -32,12 +32,12 @@ import org.apache.lucene.index.BufferedD
class FrozenBufferedDeletes {
/* Rough logic: Term is object w/
- String field and String text (OBJ_HEADER + 2*POINTER).
- Term's text is String (OBJ_HEADER + 4*INT + POINTER +
- OBJ_HEADER + text.length*CHAR).
- Term's field is String (OBJ_HEADER + 4*INT + POINTER +
- OBJ_HEADER + field.length*CHAR). */
- final static int BYTES_PER_DEL_TERM = 4*RamUsageEstimator.NUM_BYTES_OBJECT_REF + 4*RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + 8*RamUsageEstimator.NUM_BYTES_INT;
+ String field and BytesRef text (OBJ_HEADER + 2*POINTER).
+ String field is (OBJ_HEADER + 4*INT +
+ POINTER + OBJ_HEADER + CHAR*field.length).
+ Term's text is BytesRef (OBJ_HEADER + 2*INT + POINTER +
+ OBJ_HEADER + bytes.length). */
+ final static int BYTES_PER_DEL_TERM = 4*RamUsageEstimator.NUM_BYTES_OBJECT_REF + 5*RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + 6*RamUsageEstimator.NUM_BYTES_INT;
/* Query we often undercount (say 24 bytes), plus int. */
final static int BYTES_PER_DEL_QUERY = RamUsageEstimator.NUM_BYTES_OBJECT_REF + RamUsageEstimator.NUM_BYTES_INT + 24;
@@ -71,7 +71,13 @@ class FrozenBufferedDeletes {
queryLimits[upto] = ent.getValue();
upto++;
}
- bytesUsed = terms.length * BYTES_PER_DEL_TERM + queries.length * BYTES_PER_DEL_QUERY;
+ int termDataBytes = 0;
+ for(Map.Entry<Term,Integer> ent : deletes.terms.entrySet()) {
+ final Term term = ent.getKey();
+ termDataBytes += term.bytes().length;
+ termDataBytes += term.field().length() * RamUsageEstimator.NUM_BYTES_CHAR;
+ }
+ bytesUsed = terms.length * BYTES_PER_DEL_TERM + queries.length * BYTES_PER_DEL_QUERY + termDataBytes;
numTermDeletes = deletes.numTermDeletes.get();
}