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:13:51 UTC
svn commit: r1138074 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/CHANGES.txt lucene/backwards/ lucene/backwards/src/test-framework/
lucene/backwards/src/test/
lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java solr/
Author: mikemccand
Date: Tue Jun 21 16:13:51 2011
New Revision: 1138074
URL: http://svn.apache.org/viewvc?rev=1138074&view=rev
Log:
LUCENE-3222: don't under count RAM required for deleted terms
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1138074&r1=1138073&r2=1138074&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Tue Jun 21 16:13:51 2011
@@ -68,6 +68,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/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java?rev=1138074&r1=1138073&r2=1138074&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FrozenBufferedDeletes.java Tue Jun 21 16:13:51 2011
@@ -64,7 +64,12 @@ class FrozenBufferedDeletes {
queryLimits[upto] = ent.getValue();
upto++;
}
- bytesUsed = terms.length * BYTES_PER_DEL_TERM + queries.length * BYTES_PER_DEL_QUERY;
+ int termDataChars = 0;
+ for(Map.Entry<Term,Integer> ent : deletes.terms.entrySet()) {
+ final Term term = ent.getKey();
+ termDataChars += term.text().length();
+ }
+ bytesUsed = terms.length * BYTES_PER_DEL_TERM + queries.length * BYTES_PER_DEL_QUERY + termDataChars*RamUsageEstimator.NUM_BYTES_CHAR;
numTermDeletes = deletes.numTermDeletes.get();
this.gen = gen;
}