Skip to content

Commit 38cfe1d

Browse files
carlosdelestcarlosdelest
committed
Bump capability
1 parent e3dd487 commit 38cfe1d

File tree

9 files changed

+46
-46
lines changed

9 files changed

+46
-46
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_v3
6+
required_capability: knn_function_v4
77

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

3232
knnSearchWithSimilarityOption
33-
required_capability: knn_function_v3
33+
required_capability: knn_function_v4
3434

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

4848
knnHybridSearch
49-
required_capability: knn_function_v3
49+
required_capability: knn_function_v4
5050

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

7171
knnWithPrefilter
72-
required_capability: knn_function_v3
72+
required_capability: knn_function_v4
7373

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

8585
knnWithNegatedPrefilter
86-
required_capability: knn_function_v3
86+
required_capability: knn_function_v4
8787

8888
from colors metadata _score
8989
| where knn(rgb_vector, [128,128,0]) and not (match(color, "olive") or match(color, "chocolate"))
@@ -106,7 +106,7 @@ orange | [255.0, 165.0, 0.0]
106106
;
107107

108108
knnAfterKeep
109-
required_capability: knn_function_v3
109+
required_capability: knn_function_v4
110110

111111
from colors metadata _score
112112
| keep rgb_vector, color, _score
@@ -125,7 +125,7 @@ rgb_vector:dense_vector
125125
;
126126

127127
knnAfterDrop
128-
required_capability: knn_function_v3
128+
required_capability: knn_function_v4
129129

130130
from colors metadata _score
131131
| drop primary
@@ -144,7 +144,7 @@ lime | [0.0, 255.0, 0.0]
144144
;
145145

146146
knnAfterEval
147-
required_capability: knn_function_v3
147+
required_capability: knn_function_v4
148148

149149
from colors metadata _score
150150
| eval composed_name = locate(color, " ") > 0
@@ -163,7 +163,7 @@ golden rod | true
163163
;
164164

165165
knnWithConjunction
166-
required_capability: knn_function_v3
166+
required_capability: knn_function_v4
167167

168168
from colors metadata _score
169169
| where knn(rgb_vector, [255,255,238]) and hex_code like "#FFF*"
@@ -183,7 +183,7 @@ yellow | #FFFF00 | [255.0, 255.0, 0.0]
183183
;
184184

185185
knnWithDisjunctionAndFiltersConjunction
186-
required_capability: knn_function_v3
186+
required_capability: knn_function_v4
187187

188188
from colors metadata _score
189189
| where (knn(rgb_vector, [0,255,255]) or knn(rgb_vector, [128, 0, 255])) and primary == true
@@ -206,7 +206,7 @@ yellow | [255.0, 255.0, 0.0]
206206
;
207207

208208
knnWithNegationsAndFiltersConjunction
209-
required_capability: knn_function_v3
209+
required_capability: knn_function_v4
210210

211211
from colors metadata _score
212212
| where (knn(rgb_vector, [0,255,255]) and not(primary == true and match(color, "blue")))
@@ -229,7 +229,7 @@ azure | [240.0, 255.0, 255.0]
229229
;
230230

231231
knnWithNonPushableConjunction
232-
required_capability: knn_function_v3
232+
required_capability: knn_function_v4
233233

234234
from colors metadata _score
235235
| eval composed_name = locate(color, " ") > 0
@@ -253,7 +253,7 @@ maroon | false
253253
;
254254

255255
testKnnWithNonPushableDisjunctions
256-
required_capability: knn_function_v3
256+
required_capability: knn_function_v4
257257

258258
from colors metadata _score
259259
| where knn(rgb_vector, [128,128,0]) or length(color) > 10
@@ -276,7 +276,7 @@ green
276276
;
277277

278278
testKnnWithNonPushableDisjunctionsOnComplexExpressions
279-
required_capability: knn_function_v3
279+
required_capability: knn_function_v4
280280

281281
from colors metadata _score
282282
| where (knn(rgb_vector, [128,128,0], {"similarity": 70}) and length(color) > 10) or (knn(rgb_vector, [128,0,128], {"similarity": 60}) and primary == true)

‎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
@@ -140,7 +140,7 @@ public void testKnnWithLookupJoin() {
140140

141141
@Before
142142
public void setup() throws IOException {
143-
assumeTrue("Needs KNN support", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
143+
assumeTrue("Needs KNN support", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
144144

145145
var indexName = "test";
146146
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
@@ -1254,7 +1254,7 @@ public enum Cap {
12541254
/**
12551255
* Support knn function
12561256
*/
1257-
KNN_FUNCTION_V3(Build.current().isSnapshot()),
1257+
KNN_FUNCTION_V4(Build.current().isSnapshot()),
12581258

12591259
/**
12601260
* Support for the LIKE operator with a list of wildcards.

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/VectorWritables.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private VectorWritables() {
2727
public static List<NamedWriteableRegistry.Entry> getNamedWritables() {
2828
List<NamedWriteableRegistry.Entry> entries = new ArrayList<>();
2929

30-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
30+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
3131
entries.add(Knn.ENTRY);
3232
}
3333
if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {

‎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
@@ -305,7 +305,7 @@ public final void test() throws Throwable {
305305
);
306306
assumeFalse(
307307
"can't use KNN function in csv tests",
308-
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.KNN_FUNCTION_V3.capabilityName())
308+
testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.KNN_FUNCTION_V4.capabilityName())
309309
);
310310
assumeFalse(
311311
"lookup join disabled for csv tests",

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ public void testFieldBasedFullTextFunctions() throws Exception {
12441244
checkFieldBasedWithNonIndexedColumn("Term", "term(text, \"cat\")", "function");
12451245
checkFieldBasedFunctionNotAllowedAfterCommands("Term", "function", "term(title, \"Meditation\")");
12461246
}
1247-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
1247+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
12481248
checkFieldBasedFunctionNotAllowedAfterCommands("KNN", "function", "knn(vector, [1, 2, 3], 10)");
12491249
}
12501250
}
@@ -1377,7 +1377,7 @@ public void testFullTextFunctionsOnlyAllowedInWhere() throws Exception {
13771377
if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
13781378
checkFullTextFunctionsOnlyAllowedInWhere("MultiMatch", "multi_match(\"Meditation\", title, body)", "function");
13791379
}
1380-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
1380+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
13811381
checkFullTextFunctionsOnlyAllowedInWhere("KNN", "knn(vector, [0, 1, 2], 10)", "function");
13821382
}
13831383

@@ -1432,7 +1432,7 @@ public void testFullTextFunctionsDisjunctions() {
14321432
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
14331433
checkWithFullTextFunctionsDisjunctions("term(title, \"Meditation\")");
14341434
}
1435-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
1435+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
14361436
checkWithFullTextFunctionsDisjunctions("knn(vector, [1, 2, 3], 10)");
14371437
}
14381438
}
@@ -1497,7 +1497,7 @@ public void testFullTextFunctionsWithNonBooleanFunctions() {
14971497
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
14981498
checkFullTextFunctionsWithNonBooleanFunctions("Term", "term(title, \"Meditation\")", "function");
14991499
}
1500-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
1500+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
15011501
checkFullTextFunctionsWithNonBooleanFunctions("KNN", "knn(vector, [1, 2, 3], 10)", "function");
15021502
}
15031503
}
@@ -1568,7 +1568,7 @@ public void testFullTextFunctionsTargetsExistingField() throws Exception {
15681568
if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
15691569
testFullTextFunctionTargetsExistingField("term(fist_name, \"Meditation\")");
15701570
}
1571-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
1571+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
15721572
testFullTextFunctionTargetsExistingField("knn(vector, [0, 1, 2], 10)");
15731573
}
15741574
}
@@ -2147,7 +2147,7 @@ public void testFullTextFunctionOptions() {
21472147
if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
21482148
checkOptionDataTypes(MultiMatch.OPTIONS, "FROM test | WHERE MULTI_MATCH(\"Jean\", title, body, {\"%s\": %s})");
21492149
}
2150-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
2150+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
21512151
checkOptionDataTypes(Knn.ALLOWED_OPTIONS, "FROM test | WHERE KNN(vector, [0.1, 0.2, 0.3], 10, {\"%s\": %s})");
21522152
}
21532153
}
@@ -2235,7 +2235,7 @@ public void testFullTextFunctionsNullArgs() throws Exception {
22352235
checkFullTextFunctionNullArgs("term(null, \"query\")", "first");
22362236
checkFullTextFunctionNullArgs("term(title, null)", "second");
22372237
}
2238-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
2238+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
22392239
checkFullTextFunctionNullArgs("knn(null, [0, 1, 2], 10)", "first");
22402240
checkFullTextFunctionNullArgs("knn(vector, null, 10)", "second");
22412241
checkFullTextFunctionNullArgs("knn(vector, [0, 1, 2], null)", "third");
@@ -2267,7 +2267,7 @@ public void testFullTextFunctionsInStats() {
22672267
if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
22682268
checkFullTextFunctionsInStats("multi_match(\"Meditation\", title, body)");
22692269
}
2270-
if (EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled()) {
2270+
if (EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled()) {
22712271
checkFullTextFunctionsInStats("knn(vector, [0, 1, 2], 10)");
22722272
}
22732273
}

‎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
@@ -52,7 +52,7 @@ public static Iterable<Object[]> parameters() {
5252

5353
@Before
5454
public void checkCapability() {
55-
assumeTrue("KNN is not enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
55+
assumeTrue("KNN is not enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
5656
}
5757

5858
private static List<TestCaseSupplier> testCaseSuppliers() {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ public void testMultiMatchOptionsPushDown() {
13771377

13781378
public void testKnnOptionsPushDown() {
13791379
assumeTrue("dense_vector capability not available", EsqlCapabilities.Cap.DENSE_VECTOR_FIELD_TYPE.isEnabled());
1380-
assumeTrue("knn capability not available", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
1380+
assumeTrue("knn capability not available", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
13811381

13821382
String query = """
13831383
from test
@@ -1843,7 +1843,7 @@ public void testFullTextFunctionWithStatsBy(FullTextFunctionTestCase testCase) {
18431843
}
18441844

18451845
public void testKnnPrefilters() {
1846-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
1846+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
18471847

18481848
String query = """
18491849
from test
@@ -1875,7 +1875,7 @@ public void testKnnPrefilters() {
18751875
}
18761876

18771877
public void testKnnPrefiltersWithMultipleFilters() {
1878-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
1878+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
18791879

18801880
String query = """
18811881
from test
@@ -1911,7 +1911,7 @@ public void testKnnPrefiltersWithMultipleFilters() {
19111911
}
19121912

19131913
public void testPushDownConjunctionsToKnnPrefilter() {
1914-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
1914+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
19151915

19161916
String query = """
19171917
from test
@@ -1948,7 +1948,7 @@ public void testPushDownConjunctionsToKnnPrefilter() {
19481948
}
19491949

19501950
public void testPushDownNegatedConjunctionsToKnnPrefilter() {
1951-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
1951+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
19521952

19531953
String query = """
19541954
from test
@@ -1985,7 +1985,7 @@ public void testPushDownNegatedConjunctionsToKnnPrefilter() {
19851985
}
19861986

19871987
public void testNotPushDownDisjunctionsToKnnPrefilter() {
1988-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
1988+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
19891989

19901990
String query = """
19911991
from test
@@ -2014,7 +2014,7 @@ public void testNotPushDownDisjunctionsToKnnPrefilter() {
20142014
}
20152015

20162016
public void testNotPushDownKnnWithNonPushablePrefilters() {
2017-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
2017+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
20182018

20192019
String query = """
20202020
from test
@@ -2048,7 +2048,7 @@ public void testNotPushDownKnnWithNonPushablePrefilters() {
20482048
}
20492049

20502050
public void testPushDownComplexNegationsToKnnPrefilter() {
2051-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
2051+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
20522052

20532053
String query = """
20542054
from test
@@ -2098,7 +2098,7 @@ and NOT ((keyword == "test") or knn(dense_vector, [4, 5, 6], 10)))
20982098
}
20992099

21002100
public void testMultipleKnnQueriesInPrefilters() {
2101-
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V3.isEnabled());
2101+
assumeTrue("knn must be enabled", EsqlCapabilities.Cap.KNN_FUNCTION_V4.isEnabled());
21022102

21032103
String query = """
21042104
from test

0 commit comments

Comments
 (0)