You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 10:02:19 UTC
[lucene] 01/15: LUCENE-8365: Fix ArrayIndexOutOfBoundsException in
UnifiedHighlighter
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_7_4
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 46d2187dc2326c50c49478a5b57bcdc29c4b01db
Author: Marc-Andre Morissette <mo...@lexum.com>
AuthorDate: Tue Jun 19 22:42:27 2018 -0400
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
---
lucene/CHANGES.txt | 9 +++++++
.../lucene/search/uhighlight/PhraseHelper.java | 4 +--
.../TestUnifiedHighlighterStrictPhrases.java | 30 +++++++++++++++++++++-
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 28bb128..8cf709f 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -3,6 +3,15 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+
+======================= 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
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 dbaac76..cc92fbc 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
@@ -383,8 +383,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;
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 9ddce08..1888942 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
@@ -463,6 +463,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;
@@ -563,5 +592,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);
}
-
}