Skip to content

Commit 43fe1d1

Browse files
committed
Merge remote-tracking branch 'origin/esql_score_mode' into esql_score_mode
2 parents 2e18147 + 8a7e2e3 commit 43fe1d1

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

docs/changelog/125930.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125930
2+
summary: Infer the score mode to use from the Lucene collector
3+
area: "ES|QL, Search"
4+
type: enhancement
5+
issues: []

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperatorScoringTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ public Optional<SortAndFormats> buildSort(List<SortBuilder<?>> sorts) {
110110
@Override
111111
protected Matcher<String> expectedToStringOfSimple() {
112112
return matchesRegex(
113-
"LuceneTopNSourceOperator\\[shards = \\[test], "
114-
+ "maxPageSize = \\d+, limit = 100, needsScore = true, sorts = \\[\\{.+}]]"
113+
"LuceneTopNSourceOperator\\[shards = \\[test], " + "maxPageSize = \\d+, limit = 100, needsScore = true, sorts = \\[\\{.+}]]"
115114
);
116115
}
117116

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperatorTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ public Optional<SortAndFormats> buildSort(List<SortBuilder<?>> sorts) {
115115
@Override
116116
protected Matcher<String> expectedToStringOfSimple() {
117117
return matchesRegex(
118-
"LuceneTopNSourceOperator\\[shards = \\[test], maxPageSize = \\d+, limit = 100, needsScore = " + scoring + ", sorts = \\[\\{.+}]]"
118+
"LuceneTopNSourceOperator\\[shards = \\[test], maxPageSize = \\d+, limit = 100, needsScore = "
119+
+ scoring
120+
+ ", sorts = \\[\\{.+}]]"
119121
);
120122
}
121123

0 commit comments

Comments
 (0)