You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2017/11/01 02:30:41 UTC

lucene-solr:master: LUCENE-8030: fix buggy assert

Repository: lucene-solr
Updated Branches:
  refs/heads/master 5633268a4 -> 875d45ff1


LUCENE-8030: fix buggy assert


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/875d45ff
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/875d45ff
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/875d45ff

Branch: refs/heads/master
Commit: 875d45ff14068ea413e2c1aef015dde4f43caa27
Parents: 5633268
Author: Robert Muir <rm...@apache.org>
Authored: Tue Oct 31 22:30:16 2017 -0400
Committer: Robert Muir <rm...@apache.org>
Committed: Tue Oct 31 22:30:33 2017 -0400

----------------------------------------------------------------------
 .../lucene/search/similarities/AssertingSimilarity.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/875d45ff/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java
index 37747c8..fec00d7 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java
@@ -23,6 +23,7 @@ import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.CollectionStatistics;
 import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.TermStatistics;
+import org.apache.lucene.search.spans.Spans;
 import org.apache.lucene.util.BytesRef;
 
 /** wraps a similarity with checks for testing */
@@ -114,10 +115,11 @@ public class AssertingSimilarity extends Similarity {
         assert doc >= 0;
         assert doc < context.reader().maxDoc();
         // payload in bounds
-        assert start >= 0;
-        assert end >= start;
         assert payload.isValid();
-        assert end <= payload.length;
+        // position range in bounds
+        assert start >= 0;
+        assert start != Spans.NO_MORE_POSITIONS;
+        assert end > start;
         // result in bounds
         float payloadFactor = delegateScorer.computePayloadFactor(doc, start, end, payload);
         assert Float.isFinite(payloadFactor);