You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2015/02/20 06:39:27 UTC
svn commit: r1661062 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/memory/
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/ lucene/core/
lucene/core/src/java/org/apache/lucene/...
Author: rjernst
Date: Fri Feb 20 05:39:26 2015
New Revision: 1661062
URL: http://svn.apache.org/r1661062
Log:
LUCENE-6256: Change PostingsEnum.nextPosition() to consistently return -1 when positions are not available (merged 1661061)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Fri Feb 20 05:39:26 2015
@@ -95,6 +95,10 @@ API Changes
* LUCENE-6245: Force Filter subclasses to implement toString API from Query.
(Ryan Ernst)
+* LUCENE-6256: Change PostingsEnum.nextPosition() to consistently return -1 when
+ positions are not available.
+ (Ryan Ernst)
+
Other
* LUCENE-6248: Remove unused odd constants from StandardSyntaxParser.jj
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Fri Feb 20 05:39:26 2015
@@ -1581,7 +1581,6 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() throws IOException {
- assert false : "Shouldn't be calling nextPosition() if you haven't asked for positions";
return -1;
}
@@ -1670,7 +1669,6 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() throws IOException {
- assert false : "Shouldn't be calling nextPosition() if you haven't asked for positions";
return -1;
}
@@ -1775,7 +1773,6 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() throws IOException {
- assert false : "should be using LowFreqDocsAndPositionsEnum";
return -1;
}
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Fri Feb 20 05:39:26 2015
@@ -278,7 +278,6 @@ class SimpleTextFieldsReader extends Fie
@Override
public int nextPosition() throws IOException {
- assert false : "Shouldn't be calling nextPosition() if you haven't asked for positions";
return -1;
}
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Fri Feb 20 05:39:26 2015
@@ -425,7 +425,6 @@ public class SimpleTextTermVectorsReader
@Override
public int nextPosition() throws IOException {
- assert false;
return -1;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java Fri Feb 20 05:39:26 2015
@@ -339,7 +339,6 @@ public final class Lucene50PostingsReade
@Override
public int nextPosition() throws IOException {
- assert false; // shouldn't be calling nextPosition() on this
return -1;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java Fri Feb 20 05:39:26 2015
@@ -345,7 +345,6 @@ class FreqProxFields extends Fields {
@Override
public int nextPosition() throws IOException {
- assert false : "Shouldn't be calling nextPositions on DocsEnum";
return -1;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java Fri Feb 20 05:39:26 2015
@@ -92,9 +92,9 @@ public abstract class PostingsEnum exten
}
/**
- * Returns the next position. If there are no more
- * positions, or the iterator does not support positions,
- * this will return DocsEnum.NO_MORE_POSITIONS */
+ * Returns the next position, or -1 if positions were not indexed.
+ * Calling this more than {@link #freq()} times is undefined.
+ */
public abstract int nextPosition() throws IOException;
/** Returns start offset for the current position, or -1
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1661062&r1=1661061&r2=1661062&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Fri Feb 20 05:39:26 2015
@@ -231,7 +231,7 @@ public abstract class BasePostingsFormat
public int nextPosition() {
if (!doPositions) {
posUpto = freq;
- return 0;
+ return -1;
}
assert posUpto < freq;