Rewrite the query in LuceneQueryEvaluator

carlosdelest · carlosdelest · commit 6b94c482d8ad · 2025-05-23T15:22:12.000+02:00
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneQueryEvaluator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneQueryEvaluator.java
@@ -184,7 +184,8 @@ private class ShardState {
         private final List<SegmentState> perSegmentState;
 
         ShardState(ShardConfig config) throws IOException {
-            weight = config.searcher.createWeight(config.query, scoreMode(), 1.0f);
+            Query rewritten = config.searcher.rewrite(config.query);
+            weight = config.searcher.createWeight(rewritten, scoreMode(), 1.0f);
             searcher = config.searcher;
             perSegmentState = new ArrayList<>(Collections.nCopies(searcher.getLeafContexts().size(), null));
         }

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,8 @@ private class ShardState {`
`184`	`184`	`private final List<SegmentState> perSegmentState;`
`185`	`185`
`186`	`186`	`ShardState(ShardConfig config) throws IOException {`
`187`		`- weight = config.searcher.createWeight(config.query, scoreMode(), 1.0f);`
	`187`	`+ Query rewritten = config.searcher.rewrite(config.query);`
	`188`	`+ weight = config.searcher.createWeight(rewritten, scoreMode(), 1.0f);`
`188`	`189`	`searcher = config.searcher;`
`189`	`190`	`perSegmentState = new ArrayList<>(Collections.nCopies(searcher.getLeafContexts().size(), null));`
`190`	`191`	`}`