You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2016/07/19 02:09:45 UTC
lucene-solr:branch_6x: LUCENE-7385: Improve/fix assert messages in
SpanScorer. (cherry picked from commit efef37b)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 9bde118c2 -> 6e99ed301
LUCENE-7385: Improve/fix assert messages in SpanScorer.
(cherry picked from commit efef37b)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6e99ed30
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6e99ed30
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6e99ed30
Branch: refs/heads/branch_6x
Commit: 6e99ed3013d4bc53168d22560a0d9ac5f9db1cfb
Parents: 9bde118
Author: David Smiley <ds...@apache.org>
Authored: Mon Jul 18 22:09:37 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Mon Jul 18 22:09:37 2016 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 2 ++
.../java/org/apache/lucene/search/spans/SpanScorer.java | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6e99ed30/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 62a9216..e43ea43 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -95,6 +95,8 @@ Improvements
* LUCENE-7376: Add support for ToParentBlockJoinQuery to fast vector highlighter's
FieldQuery. (Martijn van Groningen)
+* LUCENE-7385: Improve/fix assert messages in SpanScorer. (David Smiley)
+
Optimizations
* LUCENE-7330, LUCENE-7339: Speed up conjunction queries. (Adrien Grand)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6e99ed30/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
index 4841ddc..508a2b3 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
@@ -87,13 +87,13 @@ public class SpanScorer extends Scorer {
spans.doStartCurrentDoc();
- assert spans.startPosition() == -1 : "incorrect initial start position, " + this.toString();
- assert spans.endPosition() == -1 : "incorrect initial end position, " + this.toString();
+ assert spans.startPosition() == -1 : "incorrect initial start position, " + spans;
+ assert spans.endPosition() == -1 : "incorrect initial end position, " + spans;
int prevStartPos = -1;
int prevEndPos = -1;
int startPos = spans.nextStartPosition();
- assert startPos != Spans.NO_MORE_POSITIONS : "initial startPos NO_MORE_POSITIONS, " + this.toString();
+ assert startPos != Spans.NO_MORE_POSITIONS : "initial startPos NO_MORE_POSITIONS, " + spans;
do {
assert startPos >= prevStartPos;
int endPos = spans.endPosition();
@@ -113,8 +113,8 @@ public class SpanScorer extends Scorer {
startPos = spans.nextStartPosition();
} while (startPos != Spans.NO_MORE_POSITIONS);
- assert spans.startPosition() == Spans.NO_MORE_POSITIONS : "incorrect final start position, " + this.toString();
- assert spans.endPosition() == Spans.NO_MORE_POSITIONS : "incorrect final end position, " + this.toString();
+ assert spans.startPosition() == Spans.NO_MORE_POSITIONS : "incorrect final start position, " + spans;
+ assert spans.endPosition() == Spans.NO_MORE_POSITIONS : "incorrect final end position, " + spans;
}
/**