Skip to content

Commit 1b2829b

Browse files
committed
Fix CSV tests
1 parent 5694ae7 commit 1b2829b

File tree

1 file changed

+40
-48
lines changed

1 file changed

+40
-48
lines changed

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

Lines changed: 40 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ required_capability: knn_function_v3
77

88
// tag::knn-function[]
99
from colors metadata _score
10-
| where knn(rgb_vector, [0, 120, 0], 10)
10+
| where knn(rgb_vector, [0, 120, 0])
1111
| sort _score desc, color asc
1212
// end::knn-function[]
1313
| keep color, rgb_vector
@@ -33,7 +33,7 @@ knnSearchWithSimilarityOption
3333
required_capability: knn_function_v3
3434

3535
from colors metadata _score
36-
| where knn(rgb_vector, [255,192,203], 140, {"similarity": 40})
36+
| where knn(rgb_vector, [255,192,203], {"similarity": 40})
3737
| sort _score desc, color asc
3838
| keep color, rgb_vector
3939
;
@@ -49,10 +49,11 @@ knnHybridSearch
4949
required_capability: knn_function_v3
5050

5151
from colors metadata _score
52-
| where match(color, "blue") or knn(rgb_vector, [65,105,225], 10)
52+
| where match(color, "blue") or knn(rgb_vector, [65,105,225])
5353
| where primary == true
5454
| sort _score desc, color asc
5555
| keep color, rgb_vector
56+
| limit 10
5657
;
5758

5859
color:text | rgb_vector:dense_vector
@@ -71,7 +72,7 @@ knnWithPrefilter
7172
required_capability: knn_function_v3
7273

7374
from colors metadata _score
74-
| where knn(rgb_vector, [128,128,0], 10) and (match(color, "olive") or match(color, "green"))
75+
| where knn(rgb_vector, [128,128,0]) and (match(color, "olive") or match(color, "green"))
7576
| sort _score desc, color asc
7677
| keep color, rgb_vector
7778
;
@@ -85,7 +86,7 @@ knnWithNegatedPrefilter
8586
required_capability: knn_function_v3
8687

8788
from colors metadata _score
88-
| where knn(rgb_vector, [128,128,0], 10) and not (match(color, "olive") or match(color, "chocolate"))
89+
| where knn(rgb_vector, [128,128,0]) and not (match(color, "olive") or match(color, "chocolate"))
8990
| sort _score desc, color asc
9091
| keep color, rgb_vector
9192
| LIMIT 10
@@ -109,7 +110,7 @@ required_capability: knn_function_v3
109110

110111
from colors metadata _score
111112
| keep rgb_vector, color, _score
112-
| where knn(rgb_vector, [128,255,0], 140)
113+
| where knn(rgb_vector, [128,255,0])
113114
| sort _score desc, color asc
114115
| keep rgb_vector
115116
| limit 5
@@ -128,7 +129,7 @@ required_capability: knn_function_v3
128129

129130
from colors metadata _score
130131
| drop primary
131-
| where knn(rgb_vector, [128,250,0], 140)
132+
| where knn(rgb_vector, [128,250,0])
132133
| sort _score desc, color asc
133134
| keep color, rgb_vector
134135
| limit 5
@@ -147,7 +148,7 @@ required_capability: knn_function_v3
147148

148149
from colors metadata _score
149150
| eval composed_name = locate(color, " ") > 0
150-
| where knn(rgb_vector, [128,128,0], 140)
151+
| where knn(rgb_vector, [128,128,0])
151152
| sort _score desc, color asc
152153
| keep color, composed_name
153154
| limit 5
@@ -165,9 +166,10 @@ knnWithConjunction
165166
required_capability: knn_function_v3
166167

167168
from colors metadata _score
168-
| where knn(rgb_vector, [255,255,238], 10) and hex_code like "#FFF*"
169+
| where knn(rgb_vector, [255,255,238]) and hex_code like "#FFF*"
169170
| sort _score desc, color asc
170171
| keep color, hex_code, rgb_vector
172+
| limit 10
171173
;
172174

173175
color:text | hex_code:keyword | rgb_vector:dense_vector
@@ -184,7 +186,7 @@ knnWithDisjunctionAndFiltersConjunction
184186
required_capability: knn_function_v3
185187

186188
from colors metadata _score
187-
| where (knn(rgb_vector, [0,255,255], 140) or knn(rgb_vector, [128, 0, 255], 10)) and primary == true
189+
| where (knn(rgb_vector, [0,255,255]) or knn(rgb_vector, [128, 0, 255])) and primary == true
188190
| keep color, rgb_vector, _score
189191
| sort _score desc, color asc
190192
| drop _score
@@ -207,7 +209,7 @@ knnWithNegationsAndFiltersConjunction
207209
required_capability: knn_function_v3
208210

209211
from colors metadata _score
210-
| where (knn(rgb_vector, [0,255,255], 140) and not(primary == true and match(color, "blue")))
212+
| where (knn(rgb_vector, [0,255,255]) and not(primary == true and match(color, "blue")))
211213
| sort _score desc, color asc
212214
| keep color, rgb_vector
213215
| limit 10
@@ -231,7 +233,7 @@ required_capability: knn_function_v3
231233

232234
from colors metadata _score
233235
| eval composed_name = locate(color, " ") > 0
234-
| where knn(rgb_vector, [128,128,0], 140) and composed_name == false
236+
| where knn(rgb_vector, [128,128,0], {"min_candidates": 100}) and composed_name == false
235237
| sort _score desc, color asc
236238
| keep color, composed_name
237239
| limit 10
@@ -254,55 +256,45 @@ testKnnWithNonPushableDisjunctions
254256
required_capability: knn_function_v3
255257

256258
from colors metadata _score
257-
| where knn(rgb_vector, [128,128,0], 140, {"similarity": 30}) or length(color) > 10
259+
| where knn(rgb_vector, [128,128,0]) or length(color) > 10
258260
| sort _score desc, color asc
259-
| keep color
261+
| keep color
262+
| limit 10
260263
;
261264

262265
color:text
263-
olive
264-
aqua marine
265-
lemon chiffon
266-
papaya whip
266+
olive
267+
sienna
268+
chocolate
269+
peru
270+
golden rod
271+
brown
272+
firebrick
273+
chartreuse
274+
gray
275+
green
267276
;
268277

269278
testKnnWithNonPushableDisjunctionsOnComplexExpressions
270279
required_capability: knn_function_v3
271280

272281
from colors metadata _score
273-
| 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)
282+
| 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)
274283
| sort _score desc, color asc
275284
| keep color, primary
276285
;
277286

278287
color:text | primary:boolean
279-
olive | false
280-
purple | false
281-
indigo | false
282-
;
283-
284-
testKnnInStatsNonPushable
285-
required_capability: knn_function_v3
286-
287-
from colors
288-
| where length(color) < 10
289-
| stats c = count(*) where knn(rgb_vector, [128,128,255], 140)
290-
;
291-
292-
c: long
293-
50
294-
;
295-
296-
testKnnInStatsWithGrouping
297-
required_capability: knn_function_v3
298-
required_capability: full_text_functions_in_stats_where
299-
300-
from colors
301-
| where length(color) < 10
302-
| stats c = count(*) where knn(rgb_vector, [128,128,255], 140) by primary
303-
;
304-
305-
c: long | primary: boolean
306-
41 | false
307-
9 | true
288+
gray | true
289+
green | true
290+
red | true
291+
black | true
292+
magenta | true
293+
yellow | true
294+
blue | true
295+
aqua marine | false
296+
papaya whip | false
297+
lemon chiffon | false
298+
white | true
299+
cyan | true
308300
;

0 commit comments

Comments
 (0)