You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/11/25 14:28:32 UTC
svn commit: r1206155 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
Author: uschindler
Date: Fri Nov 25 13:28:32 2011
New Revision: 1206155
URL: http://svn.apache.org/viewvc?rev=1206155&view=rev
Log:
LUCENE-3595: do acceptDocs checking after matchDoc()
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java?rev=1206155&r1=1206154&r2=1206155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java Fri Nov 25 13:28:32 2011
@@ -66,7 +66,7 @@ public abstract class FieldCacheDocIdSet
}
} : new Bits() {
public boolean get(int docid) {
- return acceptDocs.get(docid) && matchDoc(docid);
+ return matchDoc(docid) && acceptDocs.get(docid);
}
public int length() {
@@ -134,14 +134,14 @@ public abstract class FieldCacheDocIdSet
if (doc >= maxDoc) {
return doc = NO_MORE_DOCS;
}
- } while (!acceptDocs.get(doc) || !matchDoc(doc));
+ } while (!(matchDoc(doc) && acceptDocs.get(doc)));
return doc;
}
@Override
public int advance(int target) {
for(doc=target; doc<maxDoc; doc++) {
- if (acceptDocs.get(doc) && matchDoc(doc)) {
+ if (matchDoc(doc) && acceptDocs.get(doc)) {
return doc;
}
}