Skip to content

Commit eb47c7b

Browse files
carlosdelestcarlosdelest
committed
Fix tests
1 parent 71d3a48 commit eb47c7b

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,8 +1381,8 @@ public void testKnnOptionsPushDown() {
13811381

13821382
String query = """
13831383
from test
1384-
| where KNN(dense_vector, [0.1, 0.2, 0.3], 5,
1385-
{ "similarity": 0.001, "num_candidates": 10, "rescore_oversample": 7, "boost": 3.5 })
1384+
| where KNN(dense_vector, [0.1, 0.2, 0.3],
1385+
{ "similarity": 0.001, "min_candidates": 5000, "rescore_oversample": 7, "boost": 3.5 })
13861386
""";
13871387
var analyzer = makeAnalyzer("mapping-all-types.json");
13881388
var plan = plannerOptimizer.plan(query, IS_SV_STATS, analyzer);
@@ -1393,12 +1393,12 @@ public void testKnnOptionsPushDown() {
13931393
var expectedQuery = new KnnVectorQueryBuilder(
13941394
"dense_vector",
13951395
new float[] { 0.1f, 0.2f, 0.3f },
1396-
5,
1397-
10,
1396+
5000,
1397+
5000,
13981398
new RescoreVectorBuilder(7),
13991399
0.001f
14001400
).boost(3.5f);
1401-
assertThat(expectedQuery.toString(), is(planStr.get()));
1401+
assertEquals(expectedQuery.toString(), planStr.get());
14021402
}
14031403

14041404
/**
@@ -1847,7 +1847,7 @@ public void testKnnPrefilters() {
18471847

18481848
String query = """
18491849
from test
1850-
| where knn(dense_vector, [0, 1, 2], 10) and integer > 10
1850+
| where knn(dense_vector, [0, 1, 2]) and integer > 10
18511851
""";
18521852
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
18531853

@@ -1860,12 +1860,12 @@ public void testKnnPrefilters() {
18601860
query,
18611861
unscore(rangeQuery("integer").gt(10)),
18621862
"integer",
1863-
new Source(2, 45, "integer > 10")
1863+
new Source(2, 41, "integer > 10")
18641864
);
18651865
KnnVectorQueryBuilder expectedKnnQueryBuilder = new KnnVectorQueryBuilder(
18661866
"dense_vector",
18671867
new float[] { 0, 1, 2 },
1868-
10,
1868+
1000,
18691869
null,
18701870
null,
18711871
null
@@ -1879,7 +1879,7 @@ public void testKnnPrefiltersWithMultipleFilters() {
18791879

18801880
String query = """
18811881
from test
1882-
| where knn(dense_vector, [0, 1, 2], 10)
1882+
| where knn(dense_vector, [0, 1, 2])
18831883
| where integer > 10
18841884
| where keyword == "test"
18851885
""";
@@ -1901,7 +1901,7 @@ public void testKnnPrefiltersWithMultipleFilters() {
19011901
KnnVectorQueryBuilder expectedKnnQueryBuilder = new KnnVectorQueryBuilder(
19021902
"dense_vector",
19031903
new float[] { 0, 1, 2 },
1904-
10,
1904+
1000,
19051905
null,
19061906
null,
19071907
null
@@ -1915,7 +1915,7 @@ public void testPushDownConjunctionsToKnnPrefilter() {
19151915

19161916
String query = """
19171917
from test
1918-
| where knn(dense_vector, [0, 1, 2], 10) and integer > 10
1918+
| where knn(dense_vector, [0, 1, 2]) and integer > 10
19191919
""";
19201920
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
19211921

@@ -1930,13 +1930,13 @@ public void testPushDownConjunctionsToKnnPrefilter() {
19301930
query,
19311931
unscore(rangeQuery("integer").gt(10)),
19321932
"integer",
1933-
new Source(2, 45, "integer > 10")
1933+
new Source(2, 41, "integer > 10")
19341934
);
19351935

19361936
KnnVectorQueryBuilder expectedKnnQueryBuilder = new KnnVectorQueryBuilder(
19371937
"dense_vector",
19381938
new float[] { 0, 1, 2 },
1939-
10,
1939+
1000,
19401940
null,
19411941
null,
19421942
null
@@ -1952,7 +1952,7 @@ public void testPushDownNegatedConjunctionsToKnnPrefilter() {
19521952

19531953
String query = """
19541954
from test
1955-
| where knn(dense_vector, [0, 1, 2], 10) and NOT integer > 10
1955+
| where knn(dense_vector, [0, 1, 2]) and NOT integer > 10
19561956
""";
19571957
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
19581958

@@ -1967,13 +1967,13 @@ public void testPushDownNegatedConjunctionsToKnnPrefilter() {
19671967
query,
19681968
unscore(boolQuery().mustNot(unscore(rangeQuery("integer").gt(10)))),
19691969
"integer",
1970-
new Source(2, 45, "NOT integer > 10")
1970+
new Source(2, 41, "NOT integer > 10")
19711971
);
19721972

19731973
KnnVectorQueryBuilder expectedKnnQueryBuilder = new KnnVectorQueryBuilder(
19741974
"dense_vector",
19751975
new float[] { 0, 1, 2 },
1976-
10,
1976+
1000,
19771977
null,
19781978
null,
19791979
null
@@ -1989,7 +1989,7 @@ public void testNotPushDownDisjunctionsToKnnPrefilter() {
19891989

19901990
String query = """
19911991
from test
1992-
| where knn(dense_vector, [0, 1, 2], 10) or integer > 10
1992+
| where knn(dense_vector, [0, 1, 2]) or integer > 10
19931993
""";
19941994
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
19951995

@@ -2000,12 +2000,12 @@ public void testNotPushDownDisjunctionsToKnnPrefilter() {
20002000
var queryExec = as(field.child(), EsQueryExec.class);
20012001

20022002
// The disjunction should not be pushed down to the KNN query
2003-
KnnVectorQueryBuilder knnQueryBuilder = new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 10, null, null, null);
2003+
KnnVectorQueryBuilder knnQueryBuilder = new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null);
20042004
QueryBuilder rangeQueryBuilder = wrapWithSingleQuery(
20052005
query,
20062006
unscore(rangeQuery("integer").gt(10)),
20072007
"integer",
2008-
new Source(2, 44, "integer > 10")
2008+
new Source(2, 40, "integer > 10")
20092009
);
20102010

20112011
var expectedQuery = boolQuery().should(knnQueryBuilder).should(rangeQueryBuilder);
@@ -2018,7 +2018,7 @@ public void testNotPushDownKnnWithNonPushablePrefilters() {
20182018

20192019
String query = """
20202020
from test
2021-
| where ((knn(dense_vector, [0, 1, 2], 10) AND integer > 10) and ((keyword == "test") or length(text) > 10))
2021+
| where ((knn(dense_vector, [0, 1, 2]) AND integer > 10) and ((keyword == "test") or length(text) > 10))
20222022
""";
20232023
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
20242024

@@ -2041,7 +2041,7 @@ public void testNotPushDownKnnWithNonPushablePrefilters() {
20412041
query,
20422042
unscore(rangeQuery("integer").gt(10)),
20432043
"integer",
2044-
new Source(2, 47, "integer > 10")
2044+
new Source(2, 43, "integer > 10")
20452045
);
20462046

20472047
assertEquals(integerGtQuery.toString(), queryExec.query().toString());
@@ -2052,8 +2052,8 @@ public void testPushDownComplexNegationsToKnnPrefilter() {
20522052

20532053
String query = """
20542054
from test
2055-
| where ((knn(dense_vector, [0, 1, 2], 10) or NOT integer > 10)
2056-
and NOT ((keyword == "test") or knn(dense_vector, [4, 5, 6], 10)))
2055+
| where ((knn(dense_vector, [0, 1, 2]) or NOT integer > 10)
2056+
and NOT ((keyword == "test") or knn(dense_vector, [4, 5, 6])))
20572057
""";
20582058
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
20592059

@@ -2073,18 +2073,18 @@ and NOT ((keyword == "test") or knn(dense_vector, [4, 5, 6], 10)))
20732073
query,
20742074
unscore(boolQuery().mustNot(unscore(termQuery("keyword", "test")))),
20752075
"keyword",
2076-
new Source(3, 6, "NOT ((keyword == \"test\") or knn(dense_vector, [4, 5, 6], 10))")
2076+
new Source(3, 6, "NOT ((keyword == \"test\") or knn(dense_vector, [4, 5, 6]))")
20772077
);
20782078

20792079
QueryBuilder notIntegerGt10 = wrapWithSingleQuery(
20802080
query,
20812081
unscore(boolQuery().mustNot(unscore(rangeQuery("integer").gt(10)))),
20822082
"integer",
2083-
new Source(2, 46, "NOT integer > 10")
2083+
new Source(2, 42, "NOT integer > 10")
20842084
);
20852085

2086-
KnnVectorQueryBuilder firstKnn = new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 10, null, null, null);
2087-
KnnVectorQueryBuilder secondKnn = new KnnVectorQueryBuilder("dense_vector", new float[] { 4, 5, 6 }, 10, null, null, null);
2086+
KnnVectorQueryBuilder firstKnn = new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null);
2087+
KnnVectorQueryBuilder secondKnn = new KnnVectorQueryBuilder("dense_vector", new float[] { 4, 5, 6 }, 1000, null, null, null);
20882088

20892089
firstKnn.addFilterQuery(notKeywordFilter);
20902090
secondKnn.addFilterQuery(notIntegerGt10);
@@ -2102,7 +2102,7 @@ public void testMultipleKnnQueriesInPrefilters() {
21022102

21032103
String query = """
21042104
from test
2105-
| where ((knn(dense_vector, [0, 1, 2], 10) or integer > 10) and ((keyword == "test") or knn(dense_vector, [4, 5, 6], 10)))
2105+
| where ((knn(dense_vector, [0, 1, 2]) or integer > 10) and ((keyword == "test") or knn(dense_vector, [4, 5, 6])))
21062106
""";
21072107
var plan = plannerOptimizer.plan(query, IS_SV_STATS, makeAnalyzer("mapping-all-types.json"));
21082108

@@ -2112,24 +2112,24 @@ public void testMultipleKnnQueriesInPrefilters() {
21122112
var field = as(project.child(), FieldExtractExec.class);
21132113
var queryExec = as(field.child(), EsQueryExec.class);
21142114

2115-
KnnVectorQueryBuilder firstKnnQuery = new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 10, null, null, null);
2115+
KnnVectorQueryBuilder firstKnnQuery = new KnnVectorQueryBuilder("dense_vector", new float[] { 0, 1, 2 }, 1000, null, null, null);
21162116
// Integer range query (right side of first OR)
21172117
QueryBuilder integerRangeQuery = wrapWithSingleQuery(
21182118
query,
21192119
unscore(rangeQuery("integer").gt(10)),
21202120
"integer",
2121-
new Source(2, 46, "integer > 10")
2121+
new Source(2, 42, "integer > 10")
21222122
);
21232123

21242124
// Second KNN query (right side of second OR)
2125-
KnnVectorQueryBuilder secondKnnQuery = new KnnVectorQueryBuilder("dense_vector", new float[] { 4, 5, 6 }, 10, null, null, null);
2125+
KnnVectorQueryBuilder secondKnnQuery = new KnnVectorQueryBuilder("dense_vector", new float[] { 4, 5, 6 }, 1000, null, null, null);
21262126

21272127
// Keyword term query (left side of second OR)
21282128
QueryBuilder keywordQuery = wrapWithSingleQuery(
21292129
query,
21302130
unscore(termQuery("keyword", "test")),
21312131
"keyword",
2132-
new Source(2, 66, "keyword == \"test\"")
2132+
new Source(2, 62, "keyword == \"test\"")
21332133
);
21342134

21352135
// First OR (knn1 OR integer > 10)

0 commit comments

Comments
 (0)