lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From busc...@apache.org
Subject svn commit: r619685 - /lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java
Date Thu, 07 Feb 2008 23:22:39 GMT
Author: buschmi
Date: Thu Feb  7 15:22:34 2008
New Revision: 619685

URL: http://svn.apache.org/viewvc?rev=619685&view=rev
Log:
Rename local variable docIdSetIterator to filterDocIdIterator in IndexSearcher.java.

Modified:
    lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java?rev=619685&r1=619684&r2=619685&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java Thu Feb  7 15:22:34
2008
@@ -138,25 +138,24 @@
       return;
     }
 
-    DocIdSetIterator docIdSetIterator = filter.getDocIdSet(reader).iterator(); // CHECKME:
use ConjunctionScorer here?
+    DocIdSetIterator filterDocIdIterator = filter.getDocIdSet(reader).iterator(); // CHECKME:
use ConjunctionScorer here?
     
-    boolean more = docIdSetIterator.next() && scorer.skipTo(docIdSetIterator.doc());
+    boolean more = filterDocIdIterator.next() && scorer.skipTo(filterDocIdIterator.doc());
 
     while (more) {
-      int filterDocId = docIdSetIterator.doc();
+      int filterDocId = filterDocIdIterator.doc();
       if (filterDocId > scorer.doc() && !scorer.skipTo(filterDocId)) {
         more = false;
       } else {
         int scorerDocId = scorer.doc();
         if (scorerDocId == filterDocId) { // permitted by filter
           results.collect(scorerDocId, scorer.score());
-          more = docIdSetIterator.next();
+          more = filterDocIdIterator.next();
         } else {
-          more = docIdSetIterator.skipTo(scorerDocId);
+          more = filterDocIdIterator.skipTo(scorerDocId);
         }
       }
     }
-
   }
 
   public Query rewrite(Query original) throws IOException {



Mime
View raw message