You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/06/26 16:53:37 UTC
[03/26] lucene-solr:jira/solr-11665: LUCENE-8365: Fix
ArrayIndexOutOfBoundsException in UnifiedHighlighter
LUCENE-8365: Fix ArrayIndexOutOfBoundsException in UnifiedHighlighter
This fixes a "off by one" error in the UnifiedHighlighter's code that
is only triggered when two nested SpanNearQueries contain the same term.
Signed-off-by: Simon Willnauer <si...@apache.org>
Closes #408
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/008bc74b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/008bc74b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/008bc74b
Branch: refs/heads/jira/solr-11665
Commit: 008bc74bebef96414f19118a267dbf982aba58b9
Parents: ee5aa87
Author: Marc-Andre Morissette <mo...@lexum.com>
Authored: Tue Jun 19 22:42:27 2018 -0400
Committer: Simon Willnauer <si...@apache.org>
Committed: Wed Jun 20 16:49:49 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 9 ++++++
.../lucene/search/uhighlight/PhraseHelper.java | 4 +--
.../TestUnifiedHighlighterStrictPhrases.java | 30 +++++++++++++++++++-
3 files changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/008bc74b/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 0162423..e6125ce 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -123,6 +123,15 @@ Changes in Runtime Behavior:
* LUCENE-7976: TieredMergePolicy now respects maxSegmentSizeMB by default when executing
findForcedMerges and findForcedDeletesMerges (Erick Erickson)
+
+======================= Lucene 7.4.1 =======================
+
+Bug Fixes:
+
+ * LUCENE-8365: Fix ArrayIndexOutOfBoundsException in UnifiedHighlighter. This fixes
+ a "off by one" error in the UnifiedHighlighter's code that is only triggered when
+ two nested SpanNearQueries contain the same term. (Marc-Andre Morissette via Simon Willnauer)
+
======================= Lucene 7.4.0 =======================
Upgrading
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/008bc74b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
index ff620b0..ab439d0 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/PhraseHelper.java
@@ -384,8 +384,8 @@ public class PhraseHelper {
// shift right any pairs by one to make room
final int shiftLen = numPairs - (pairIdx + 1);
if (shiftLen > 0) {
- System.arraycopy(startOffsets, pairIdx + 2, startOffsets, pairIdx + 3, shiftLen);
- System.arraycopy(endOffsets, pairIdx + 2, endOffsets, pairIdx + 3, shiftLen);
+ System.arraycopy(startOffsets, pairIdx + 1, startOffsets, pairIdx + 2, shiftLen);
+ System.arraycopy(endOffsets, pairIdx + 1, endOffsets, pairIdx + 2, shiftLen);
}
// now we can place the offset pair
startOffsets[pairIdx + 1] = startOffset;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/008bc74b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
index 08820aa..b768382 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
@@ -464,6 +464,35 @@ public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase {
assertArrayEquals(new String[]{"There is no <b>accord</b> <b>and</b> <b>satisfaction</b> with this - <b>Consideration</b> of the <b>accord</b> is arbitrary."}, snippets);
}
+ // Tests that terms collected out of order due to being present in multiple Spans are handled correctly
+ // See LUCENE-8365
+ public void testReverseOrderSpanCollection() throws IOException {
+ // Processing order may depend on various optimizations or other weird factor.
+ indexWriter.addDocument(newDoc("alpha bravo - alpha charlie"));
+ indexWriter.addDocument(newDoc("alpha charlie - alpha bravo"));
+ initReaderSearcherHighlighter();
+
+ SpanNearQuery query = new SpanNearQuery(new SpanQuery[]{
+ new SpanNearQuery(new SpanQuery[]{
+ new SpanTermQuery(new Term("body", "alpha")),
+ new SpanTermQuery(new Term("body", "bravo"))
+ }, 0, true),
+ new SpanNearQuery(new SpanQuery[]{
+ new SpanTermQuery(new Term("body", "alpha")),
+ new SpanTermQuery(new Term("body", "charlie"))
+ }, 0, true)
+ }, 10, false);
+
+ TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
+ String[] snippets = highlighter.highlight("body", query, topDocs);
+
+ assertArrayEquals(new String[]{
+ "<b>alpha</b> <b>bravo</b> - <b>alpha</b> <b>charlie</b>",
+ "<b>alpha</b> <b>charlie</b> - <b>alpha</b> <b>bravo</b>",
+ },
+ snippets);
+ }
+
private static class MyQuery extends Query {
private final Query wrapped;
@@ -564,5 +593,4 @@ public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase {
if (VERBOSE) System.out.println("Expected: \"" + expected + "\n" + "Observed: \"" + observed);
assertEquals("Nested SpanNear query within SpanOr not properly highlighted.", expected, observed);
}
-
}