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 2012/01/26 01:04:07 UTC
svn commit: r1235991 - in
/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene:
codecs/simpletext/SimpleTextLiveDocsFormat.java index/IndexWriter.java
util/MutableBits.java
Author: rmuir
Date: Thu Jan 26 00:04:06 2012
New Revision: 1235991
URL: http://svn.apache.org/viewvc?rev=1235991&view=rev
Log:
LUCENE-3661: remove unnecessary method
Modified:
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/util/MutableBits.java
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java?rev=1235991&r1=1235990&r2=1235991&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java Thu Jan 26 00:04:06 2012
@@ -174,13 +174,6 @@ public class SimpleTextLiveDocsFormat ex
}
@Override
- public boolean getAndClear(int bit) {
- boolean v = bits.get(bit);
- bits.clear(bit);
- return v;
- }
-
- @Override
public SimpleTextBits clone() {
BitSet clonedBits = (BitSet) bits.clone();
return new SimpleTextBits(clonedBits, size);
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1235991&r1=1235990&r2=1235991&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java Thu Jan 26 00:04:06 2012
@@ -527,8 +527,9 @@ public class IndexWriter implements Clos
public synchronized boolean delete(int docID) {
assert liveDocs != null;
assert docID >= 0 && docID < liveDocs.length();
- final boolean didDelete = liveDocs.getAndClear(docID);
+ final boolean didDelete = liveDocs.get(docID);
if (didDelete) {
+ liveDocs.clear(docID);
pendingDeleteCount++;
//System.out.println(" new del seg=" + info + " docID=" + docID + " pendingDelCount=" + pendingDeleteCount + " totDelCount=" + (info.docCount-liveDocs.count()));
}
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/util/MutableBits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/util/MutableBits.java?rev=1235991&r1=1235990&r2=1235991&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/util/MutableBits.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/util/MutableBits.java Thu Jan 26 00:04:06 2012
@@ -22,7 +22,5 @@ public interface MutableBits extends Bit
// nocommit: remove this from this interface somehow? (used by DWPT infostream at least)
public int count();
- // nocommit: are these truly necessary?
- public boolean getAndClear(int bit);
public MutableBits clone();
}