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 2015/03/02 01:32:27 UTC
svn commit: r1663186 - in /lucene/dev/trunk/lucene/sandbox/src:
java/org/apache/lucene/search/TermAutomatonScorer.java
test/org/apache/lucene/search/TestTermAutomatonQuery.java
Author: mikemccand
Date: Mon Mar 2 00:32:27 2015
New Revision: 1663186
URL: http://svn.apache.org/r1663186
Log:
fix buggy 'advance called before nextDoc' case
Modified:
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java?rev=1663186&r1=1663185&r2=1663186&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java Mon Mar 2 00:32:27 2015
@@ -149,6 +149,12 @@ class TermAutomatonScorer extends Scorer
@Override
public int advance(int target) throws IOException {
+ if (docID == -1) {
+ popCurrentDoc();
+ if (docID >= target) {
+ return doNext();
+ }
+ }
for(int i=0;i<numSubsOnDoc;i++) {
EnumAndScorer sub = subsOnDoc[i];
if (sub.posEnum.advance(target) != NO_MORE_DOCS) {
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java?rev=1663186&r1=1663185&r2=1663186&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java Mon Mar 2 00:32:27 2015
@@ -578,6 +578,9 @@ public class TestTermAutomatonQuery exte
Query q1 = q;
Query q2 = bq;
if (random().nextInt(5) == 1) {
+ if (VERBOSE) {
+ System.out.println(" use random filter");
+ }
RandomFilter filter = new RandomFilter(random().nextLong(), random().nextFloat());
q1 = new FilteredQuery(q1, filter);
q2 = new FilteredQuery(q2, filter);