From fd7aea5bedba349261bae08b423504e76433bb17 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Thu, 11 Jan 2018 12:45:20 +0100 Subject: [PATCH] LUCENE-8121: Fix span terms frequency to return the freq of the entire spans (not the frequency of the term within the span). --- .../org/apache/lucene/search/uhighlight/PhraseHelper.java | 2 +- .../uhighlight/TestUnifiedHighlighterStrictPhrases.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 f5205e412e6..2edb19244c6 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 @@ -400,7 +400,7 @@ public class PhraseHelper { @Override public int freq() throws IOException { - return startOffsets.length; + return numPairs; } @Override 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 9892b838f8f..08820aa543c 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 @@ -163,7 +163,7 @@ public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase { return Arrays.toString(passages); } }); - assertArrayEquals(new String[]{"[Passage[0-22]{yin[0-3],yang[4-8],yin[10-13]}score=2.0685003]"}, + assertArrayEquals(new String[]{"[Passage[0-22]{yin[0-3],yang[4-8],yin[10-13]}score=2.4964213]"}, highlighter.highlight("body", query, topDocs)); } @@ -207,7 +207,7 @@ public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase { return Arrays.toString(passages); } }); - assertArrayEquals(new String[]{"[Passage[0-41]{alpha[0-5],bravo[6-11],charlie[12-19]}score=2.723861]"}, + assertArrayEquals(new String[]{"[Passage[0-41]{alpha[0-5],bravo[6-11],charlie[12-19]}score=3.931102]"}, highlighter.highlight("body", query, topDocs)); }