Skip to content

Commit 2d454ca

Browse files
carlosdelestcarlosdelest
committed
Fix capability for multi cluster tests
1 parent 6a3d6f7 commit 2d454ca

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/knn-function.csv-spec‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# top-n query at the shard level
44

55
knnSearch
6-
required_capability: knn_function
6+
required_capability: knn_function_v2
77

88
// tag::knn-function[]
99
from colors metadata _score
@@ -31,7 +31,7 @@ chartreuse | [127.0, 255.0, 0.0]
3131

3232
# https://github.com/elastic/elasticsearch/issues/129550
3333
knnSearchWithSimilarityOption-Ignore
34-
required_capability: knn_function
34+
required_capability: knn_function_v2
3535

3636
from colors metadata _score
3737
| where knn(rgb_vector, [255,192,203], 140, {"similarity": 40})
@@ -47,7 +47,7 @@ wheat | [245.0, 222.0, 179.0]
4747
;
4848

4949
knnHybridSearch
50-
required_capability: knn_function
50+
required_capability: knn_function_v2
5151

5252
from colors metadata _score
5353
| where match(color, "blue") or knn(rgb_vector, [65,105,225], 140)
@@ -70,7 +70,7 @@ yellow | [255.0, 255.0, 0.0]
7070
;
7171

7272
knnWithMultipleFunctions
73-
required_capability: knn_function
73+
required_capability: knn_function_v2
7474

7575
from colors metadata _score
7676
| where knn(rgb_vector, [128,128,0], 140) and match(color, "olive")
@@ -83,7 +83,7 @@ olive | [128.0, 128.0, 0.0]
8383
;
8484

8585
knnAfterKeep
86-
required_capability: knn_function
86+
required_capability: knn_function_v2
8787

8888
from colors metadata _score
8989
| keep rgb_vector, color, _score
@@ -102,7 +102,7 @@ rgb_vector:dense_vector
102102
;
103103

104104
knnAfterDrop
105-
required_capability: knn_function
105+
required_capability: knn_function_v2
106106

107107
from colors metadata _score
108108
| drop primary
@@ -121,7 +121,7 @@ lime | [0.0, 255.0, 0.0]
121121
;
122122

123123
knnAfterEval
124-
required_capability: knn_function
124+
required_capability: knn_function_v2
125125

126126
from colors metadata _score
127127
| eval composed_name = locate(color, " ") > 0
@@ -140,7 +140,7 @@ golden rod | true
140140
;
141141

142142
knnWithConjunction
143-
required_capability: knn_function
143+
required_capability: knn_function_v2
144144

145145
# TODO We need kNN prefiltering here so we get more candidates that pass the filter
146146
from colors metadata _score
@@ -161,7 +161,7 @@ yellow | #FFFF00 | [255.0, 255.0, 0.0]
161161
;
162162

163163
knnWithDisjunctionAndFiltersConjunction
164-
required_capability: knn_function
164+
required_capability: knn_function_v2
165165

166166
# TODO We need kNN prefiltering here so we get more candidates that pass the filter
167167
from colors metadata _score
@@ -185,7 +185,7 @@ yellow | [255.0, 255.0, 0.0]
185185
;
186186

187187
knnWithNonPushableConjunction
188-
required_capability: knn_function
188+
required_capability: knn_function_v2
189189

190190
from colors metadata _score
191191
| eval composed_name = locate(color, " ") > 0
@@ -210,7 +210,7 @@ maroon | false
210210

211211
# https://github.com/elastic/elasticsearch/issues/129550
212212
testKnnWithNonPushableDisjunctions-Ignore
213-
required_capability: knn_function
213+
required_capability: knn_function_v2
214214

215215
from colors metadata _score
216216
| where knn(rgb_vector, [128,128,0], 140, {"similarity": 30}) or length(color) > 10
@@ -227,7 +227,7 @@ papaya whip
227227

228228
# https://github.com/elastic/elasticsearch/issues/129550
229229
testKnnWithNonPushableDisjunctionsOnComplexExpressions-Ignore
230-
required_capability: knn_function
230+
required_capability: knn_function_v2
231231

232232
from colors metadata _score
233233
| where (knn(rgb_vector, [128,128,0], 140, {"similarity": 70}) and length(color) < 10) or (knn(rgb_vector, [128,0,128], 140, {"similarity": 60}) and primary == false)
@@ -242,7 +242,7 @@ indigo | false
242242
;
243243

244244
testKnnInStatsNonPushable
245-
required_capability: knn_function
245+
required_capability: knn_function_v2
246246

247247
from colors
248248
| where length(color) < 10
@@ -254,7 +254,7 @@ c: long
254254
;
255255

256256
testKnnInStatsWithGrouping
257-
required_capability: knn_function
257+
required_capability: knn_function_v2
258258
required_capability: full_text_functions_in_stats_where
259259

260260
from colors

‎x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/KnnFunctionIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void testKnnNonPushedDown() {
111111

112112
@Before
113113
public void setup() throws IOException {
114-
assumeTrue("Needs KNN support", EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled());
114+
assumeTrue("Needs KNN support", EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled());
115115

116116
var indexName = "test";
117117
var client = client().admin().indices();

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ public enum Cap {
11951195
/**
11961196
* Support knn function
11971197
*/
1198-
KNN_FUNCTION(Build.current().isSnapshot()),
1198+
KNN_FUNCTION_V2(Build.current().isSnapshot()),
11991199

12001200
LIKE_WITH_LIST_OF_PATTERNS,
12011201

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/ExpressionWritables.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private static List<NamedWriteableRegistry.Entry> fullText() {
259259
}
260260

261261
private static List<NamedWriteableRegistry.Entry> vector() {
262-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
262+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
263263
return List.of(Knn.ENTRY);
264264
}
265265
return List.of();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public final void test() throws Throwable {
298298
);
299299
assumeFalse(
300300
"can't use KNN function in csv tests",
301-
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.KNN_FUNCTION.capabilityName())
301+
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.KNN_FUNCTION_V2.capabilityName())
302302
);
303303
assumeFalse(
304304
"lookup join disabled for csv tests",

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ public void testFieldBasedFullTextFunctions() throws Exception {
12351235
checkFieldBasedWithNonIndexedColumn("Term", "term(text, \"cat\")", "function");
12361236
checkFieldBasedFunctionNotAllowedAfterCommands("Term", "function", "term(title, \"Meditation\")");
12371237
}
1238-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
1238+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
12391239
checkFieldBasedFunctionNotAllowedAfterCommands("KNN", "function", "knn(vector, [1, 2, 3], 10)");
12401240
}
12411241
}
@@ -1368,7 +1368,7 @@ public void testFullTextFunctionsOnlyAllowedInWhere() throws Exception {
13681368
if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
13691369
checkFullTextFunctionsOnlyAllowedInWhere("MultiMatch", "multi_match(\"Meditation\", title, body)", "function");
13701370
}
1371-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
1371+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
13721372
checkFullTextFunctionsOnlyAllowedInWhere("KNN", "knn(vector, [0, 1, 2], 10)", "function");
13731373
}
13741374
}
@@ -1407,7 +1407,7 @@ public void testFullTextFunctionsDisjunctions() {
14071407
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
14081408
checkWithFullTextFunctionsDisjunctions("term(title, \"Meditation\")");
14091409
}
1410-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
1410+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
14111411
checkWithFullTextFunctionsDisjunctions("knn(vector, [1, 2, 3], 10)");
14121412
}
14131413
}
@@ -1472,7 +1472,7 @@ public void testFullTextFunctionsWithNonBooleanFunctions() {
14721472
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
14731473
checkFullTextFunctionsWithNonBooleanFunctions("Term", "term(title, \"Meditation\")", "function");
14741474
}
1475-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
1475+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
14761476
checkFullTextFunctionsWithNonBooleanFunctions("KNN", "knn(vector, [1, 2, 3], 10)", "function");
14771477
}
14781478
}
@@ -1543,7 +1543,7 @@ public void testFullTextFunctionsTargetsExistingField() throws Exception {
15431543
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
15441544
testFullTextFunctionTargetsExistingField("term(fist_name, \"Meditation\")");
15451545
}
1546-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
1546+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
15471547
testFullTextFunctionTargetsExistingField("knn(vector, [0, 1, 2], 10)");
15481548
}
15491549
}
@@ -2071,7 +2071,7 @@ public void testFullTextFunctionOptions() {
20712071
if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
20722072
checkOptionDataTypes(MultiMatch.OPTIONS, "FROM test | WHERE MULTI_MATCH(\"Jean\", title, body, {\"%s\": %s})");
20732073
}
2074-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
2074+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
20752075
checkOptionDataTypes(Knn.ALLOWED_OPTIONS, "FROM test | WHERE KNN(vector, [0.1, 0.2, 0.3], 10, {\"%s\": %s})");
20762076
}
20772077
}
@@ -2159,7 +2159,7 @@ public void testFullTextFunctionsNullArgs() throws Exception {
21592159
checkFullTextFunctionNullArgs("term(null, \"query\")", "first");
21602160
checkFullTextFunctionNullArgs("term(title, null)", "second");
21612161
}
2162-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
2162+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
21632163
checkFullTextFunctionNullArgs("knn(null, [0, 1, 2], 10)", "first");
21642164
checkFullTextFunctionNullArgs("knn(vector, null, 10)", "second");
21652165
checkFullTextFunctionNullArgs("knn(vector, [0, 1, 2], null)", "third");
@@ -2185,7 +2185,7 @@ public void testFullTextFunctionsConstantArg() throws Exception {
21852185
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
21862186
checkFullTextFunctionsConstantArg("term(title, tags)", "second");
21872187
}
2188-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
2188+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
21892189
checkFullTextFunctionsConstantArg("knn(vector, vector, 10)", "second");
21902190
checkFullTextFunctionsConstantArg("knn(vector, [0, 1, 2], category)", "third");
21912191
}
@@ -2216,7 +2216,7 @@ public void testFullTextFunctionsInStats() {
22162216
if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
22172217
checkFullTextFunctionsInStats("multi_match(\"Meditation\", title, body)");
22182218
}
2219-
if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
2219+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled()) {
22202220
checkFullTextFunctionsInStats("knn(vector, [0, 1, 2], 10)");
22212221
}
22222222
}

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/fulltext/KnnTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static Iterable<Object[]> parameters() {
5151

5252
@Before
5353
public void checkCapability() {
54-
assumeTrue("KNN is not enabled", EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled());
54+
assumeTrue("KNN is not enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled());
5555
}
5656

5757
private static List<TestCaseSupplier> testCaseSuppliers() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,7 @@ public void testMultiMatchOptionsPushDown() {
13631363

13641364
public void testKnnOptionsPushDown() {
13651365
assumeTrue("dense_vector capability not available", EsqlCapabilities.Cap.DENSE_VECTOR_FIELD_TYPE.isEnabled());
1366-
assumeTrue("knn capability not available", EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled());
1366+
assumeTrue("knn capability not available", EsqlCapabilities.Cap.KNN_FUNCTION_V2.isEnabled());
13671367

13681368
String query = """
13691369
from test

0 commit comments

Comments
 (0)