You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/11/27 12:22:48 UTC

svn commit: r1642091 - in /lucene/dev/branches/lucene2878/lucene: codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java

Author: romseygeek
Date: Thu Nov 27 11:22:48 2014
New Revision: 1642091

URL: http://svn.apache.org/r1642091
Log:
MemoryPostingsFormat.nextPosition() should return NO_MORE_POSITIONS when exhausted

Modified:
    lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
    lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java

Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1642091&r1=1642090&r2=1642091&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Thu Nov 27 11:22:48 2014
@@ -689,7 +689,8 @@ public final class MemoryPostingsFormat 
     @Override
     public int nextPosition() {
       //System.out.println("    nextPos storePayloads=" + storePayloads + " this=" + this);
-      assert posPending > 0;
+      if (posPending <= 0)
+        return NO_MORE_POSITIONS;
       posPending--;
       if (!storePayloads) {
         pos += in.readVInt();

Modified: lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java?rev=1642091&r1=1642090&r2=1642091&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/posfilter/TestBrouwerianQuery.java Thu Nov 27 11:22:48 2014
@@ -16,15 +16,12 @@ package org.apache.lucene.search.posfilt
  * limitations under the License.
  */
 
+import java.io.IOException;
+
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.RandomIndexWriter;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.posfilter.NonOverlappingQuery;
-import org.apache.lucene.search.posfilter.OrderedNearQuery;
-import org.apache.lucene.search.posfilter.UnorderedNearQuery;
-
-import java.io.IOException;
 
 public class TestBrouwerianQuery extends IntervalTestBase {