Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@lucene.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1062832 - in /lucene/dev/trunk/lucene: CHANGES.txt
 src/java/org/apache/lucene/index/SegmentDeletes.java
Date: Mon, 24 Jan 2011 15:35:55 -0000
To: commits@lucene.apache.org
From: shaie@apache.org
Message-Id: <20110124153555.7352923888CF@eris.apache.org>

Author: shaie
Date: Mon Jan 24 15:35:55 2011
New Revision: 1062832

URL: http://svn.apache.org/viewvc?rev=1062832&view=rev
Log:
LUCENE-2693: Add delete term and query need to more precisely record the bytes used (trunk)

Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentDeletes.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1062832&r1=1062831&r2=1062832&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Jan 24 15:35:55 2011
@@ -689,6 +689,9 @@ Bug fixes
   internally, it now calls Similarity.idfExplain(Collection, IndexSearcher).
   (Robert Muir)
 
+* LUCENE-2693: RAM used by IndexWriter was slightly incorrectly computed. 
+  (Jason Rutherglen via Shai Erera)
+
 New features
 
 * LUCENE-2128: Parallelized fetching document frequencies during weight

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentDeletes.java?rev=1062832&r1=1062831&r2=1062832&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentDeletes.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentDeletes.java Mon Jan 24 15:35:55 2011
@@ -140,8 +140,11 @@ class SegmentDeletes {
   }
 
   public void addQuery(Query query, int docIDUpto) {
-    queries.put(query, docIDUpto);
-    bytesUsed.addAndGet(BYTES_PER_DEL_QUERY);
+    Integer current = queries.put(query, docIDUpto);
+    // increment bytes used only if the query wasn't added so far.
+    if (current == null) {
+      bytesUsed.addAndGet(BYTES_PER_DEL_QUERY);
+    }
   }
 
   public void addDocID(int docID) {