Skip to content

Commit 2ae7352

Browse files
committed
Fixing tests.
1 parent d0e1b99 commit 2ae7352

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9114,14 +9114,21 @@ public void testKnnWithStats() {
91149114
);
91159115
}
91169116

9117-
public void testKnnWithRerankAmdTopN() {
9118-
assertThat(typesError("""
9117+
public void testKnnWithRerankWithoutLimit() {
9118+
var query = """
91199119
from types metadata _score
91209120
| where knn(dense_vector, [0, 1, 2])
91219121
| rerank "some text" on text with { "inference_id" : "reranking-inference-id" }
9122-
| sort _score desc
9123-
| limit 10
9124-
"""), containsString("Knn function must be used with a LIMIT clause"));
9122+
""";
9123+
9124+
var optimized = planTypes(query);
9125+
9126+
var rerank = as(optimized, Rerank.class);
9127+
var limit = as(rerank.child(), Limit.class);
9128+
assertThat(limit.limit().fold(FoldContext.small()), equalTo(1_000));
9129+
var filter = as(limit.child(), Filter.class);
9130+
var knn = as(filter.condition(), Knn.class);
9131+
assertThat(knn.implicitK(), equalTo(1_000));
91259132
}
91269133

91279134
public void testKnnWithRerankAmdLimit() {

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ public void testPushDownFilterPastCompletion() {
325325
EMPTY,
326326
new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)),
327327
completion.inferenceId(),
328+
completion.rowLimit(),
328329
completion.prompt(),
329330
completion.targetField()
330331
),
@@ -357,6 +358,7 @@ public void testPushDownFilterPastRerank() {
357358
EMPTY,
358359
new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)),
359360
rerank.inferenceId(),
361+
rerank.rowLimit(),
360362
rerank.queryText(),
361363
rerank.rerankFields(),
362364
rerank.scoreAttribute()
@@ -372,6 +374,7 @@ private static Completion completion(LogicalPlan child) {
372374
EMPTY,
373375
child,
374376
randomLiteral(DataType.KEYWORD),
377+
randomLiteral(DataType.INTEGER),
375378
randomLiteral(randomBoolean() ? DataType.TEXT : DataType.KEYWORD),
376379
referenceAttribute(randomIdentifier(), DataType.KEYWORD)
377380
);
@@ -382,6 +385,7 @@ private static Rerank rerank(LogicalPlan child) {
382385
EMPTY,
383386
child,
384387
randomLiteral(DataType.KEYWORD),
388+
randomLiteral(DataType.INTEGER),
385389
randomLiteral(randomBoolean() ? DataType.TEXT : DataType.KEYWORD),
386390
randomList(1, 10, () -> new Alias(EMPTY, randomIdentifier(), randomLiteral(DataType.KEYWORD))),
387391
referenceAttribute(randomBoolean() ? MetadataAttribute.SCORE : randomIdentifier(), DataType.DOUBLE)

0 commit comments

Comments
 (0)