LUCENE-10464, LUCENE-10477: WeightedSpanTermExtractor.extractWeighted…

…SpanTerms to rewrite sufficiently (#737)
apache · Mar 22, 2022 · ca252d6 · ca252d6
1 parent 28d3adc
commit ca252d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
@@ -75,7 +75,8 @@ Optimizations
 
 Bug Fixes
 ---------------------
-(No changes)
+* LUCENE-10477: Highlighter: WeightedSpanTermExtractor.extractWeightedSpanTerms to Query#rewrite
+  multiple times if necessary. (Christine Poerschke, Adrien Grand)
 
 Other
 ---------------------

diff --git a/...ne/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/...ne/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
@@ -309,11 +309,11 @@ protected void extractWeightedSpanTerms(
     final IndexSearcher searcher = new IndexSearcher(getLeafContext());
     searcher.setQueryCache(null);
     if (mustRewriteQuery) {
+      final SpanQuery rewrittenQuery = (SpanQuery) searcher.rewrite(spanQuery);
       for (final String field : fieldNames) {
-        final SpanQuery rewrittenQuery = (SpanQuery) spanQuery.rewrite(getLeafContext().reader());
         queries.put(field, rewrittenQuery);
-        rewrittenQuery.visit(QueryVisitor.termCollector(nonWeightedTerms));
       }
+      rewrittenQuery.visit(QueryVisitor.termCollector(nonWeightedTerms));
     } else {
       spanQuery.visit(QueryVisitor.termCollector(nonWeightedTerms));
     }