Skip to content

Commit 1fe1a89

Browse files
committed
Fix tests
1 parent f6cb5d9 commit 1fe1a89

File tree

1 file changed

+24
-52
lines changed

1 file changed

+24
-52
lines changed

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

Lines changed: 24 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ required_capability: knn_function
3434

3535
// tag::knn-function-options[]
3636
from colors metadata _score
37-
| where knn(rgb_vector, [0,255,255], {"k": 4})
37+
| where knn(rgb_vector, [0,255,255])
3838
| sort _score desc, color asc
3939
// end::knn-function-options[]
4040
| keep color, rgb_vector
@@ -52,7 +52,7 @@ knnSearchWithSimilarityOption
5252
required_capability: knn_function
5353

5454
from colors metadata _score
55-
| where knn(rgb_vector, [255,192,203], {"k": 140, "similarity": 40})
55+
| where knn(rgb_vector, [255,192,203], {"similarity": 40})
5656
| sort _score desc, color asc
5757
| keep color, rgb_vector
5858
;
@@ -69,30 +69,30 @@ knnHybridSearch
6969
required_capability: knn_function
7070

7171
from colors metadata _score
72-
| where match(color, "blue") or knn(rgb_vector, [65,105,225], {"k": 140})
73-
| where primary == true
72+
| where match(color, "blue") or knn(rgb_vector, [65,105,225])
7473
| sort _score desc, color asc
7574
| keep color, rgb_vector
7675
| limit 10
7776
;
7877

7978
color:text | rgb_vector:dense_vector
80-
blue | [0.0, 0.0, 255.0]
81-
gray | [128.0, 128.0, 128.0]
82-
cyan | [0.0, 255.0, 255.0]
83-
magenta | [255.0, 0.0, 255.0]
84-
green | [0.0, 128.0, 0.0]
85-
white | [255.0, 255.0, 255.0]
86-
black | [0.0, 0.0, 0.0]
87-
red | [255.0, 0.0, 0.0]
88-
yellow | [255.0, 255.0, 0.0]
79+
blue | [0.0, 0.0, 255.0]
80+
gray | [128.0, 128.0, 128.0]
81+
teal | [0.0, 128.0, 128.0]
82+
turquoise | [64.0, 224.0, 208.0]
83+
indigo | [75.0, 0.0, 130.0]
84+
orchid | [218.0, 112.0, 214.0]
85+
purple | [128.0, 0.0, 128.0]
86+
navy | [0.0, 0.0, 128.0]
87+
silver | [192.0, 192.0, 192.0]
88+
aqua marine | [127.0, 255.0, 212.0]
8989
;
9090

9191
knnWithMultipleFunctions
9292
required_capability: knn_function
9393

9494
from colors metadata _score
95-
| where knn(rgb_vector, [128,128,0], {"k": 140}) and match(color, "olive")
95+
| where knn(rgb_vector, [128,128,0]) and match(color, "olive")
9696
| sort _score desc, color asc
9797
| keep color, rgb_vector
9898
;
@@ -106,7 +106,7 @@ required_capability: knn_function
106106

107107
from colors metadata _score
108108
| keep rgb_vector, color, _score
109-
| where knn(rgb_vector, [128,255,0], {"k": 140})
109+
| where knn(rgb_vector, [128,255,0])
110110
| sort _score desc, color asc
111111
| keep rgb_vector
112112
| limit 5
@@ -125,7 +125,7 @@ required_capability: knn_function
125125

126126
from colors metadata _score
127127
| drop primary
128-
| where knn(rgb_vector, [128,250,0], {"k": 140})
128+
| where knn(rgb_vector, [128,250,0])
129129
| sort _score desc, color asc
130130
| keep color, rgb_vector
131131
| limit 5
@@ -144,7 +144,7 @@ required_capability: knn_function
144144

145145
from colors metadata _score
146146
| eval composed_name = locate(color, " ") > 0
147-
| where knn(rgb_vector, [128,128,0], {"k": 140})
147+
| where knn(rgb_vector, [128,128,0])
148148
| sort _score desc, color asc
149149
| keep color, composed_name
150150
| limit 5
@@ -166,7 +166,7 @@ from colors metadata _score
166166
| where knn(rgb_vector, [255,255,238], {"k": 140}) and hex_code like "#FFF*"
167167
| sort _score desc, color asc
168168
| keep color, hex_code, rgb_vector
169-
| limit 10
169+
| limit 140
170170
;
171171

172172
color:text | hex_code:keyword | rgb_vector:dense_vector
@@ -184,11 +184,10 @@ required_capability: knn_function
184184

185185
# TODO We need kNN prefiltering here so we get more candidates that pass the filter
186186
from colors metadata _score
187-
| where (knn(rgb_vector, [0,255,255], {"k": 140}) or knn(rgb_vector, [128, 0, 255], {"k": 140})) and primary == true
188-
| keep color, rgb_vector, _score
187+
| where (knn(rgb_vector, [0,255,255]) or knn(rgb_vector, [128, 0, 255])) and primary == true
189188
| sort _score desc, color asc
190-
| drop _score
191-
| limit 10
189+
| drop _score, primary, hex_code
190+
| limit 140
192191
;
193192

194193
color:text | rgb_vector:dense_vector
@@ -208,7 +207,7 @@ required_capability: knn_function
208207

209208
from colors metadata _score
210209
| eval composed_name = locate(color, " ") > 0
211-
| where knn(rgb_vector, [128,128,0], {"k": 140}) and composed_name == false
210+
| where knn(rgb_vector, [128,128,0]) and composed_name == false
212211
| sort _score desc, color asc
213212
| keep color, composed_name
214213
| limit 10
@@ -222,7 +221,6 @@ peru | false
222221
brown | false
223222
firebrick | false
224223
chartreuse | false
225-
gray | false
226224
green | false
227225
maroon | false
228226
;
@@ -231,7 +229,7 @@ testKnnWithNonPushableDisjunctions
231229
required_capability: knn_function
232230

233231
from colors metadata _score
234-
| where knn(rgb_vector, [128,128,0], {"k": 140, "similarity": 30}) or length(color) > 10
232+
| where knn(rgb_vector, [128,128,0], {"similarity": 30}) or length(color) > 10
235233
| sort _score desc, color asc
236234
| keep color
237235
;
@@ -247,7 +245,7 @@ testKnnWithNonPushableDisjunctionsOnComplexExpressions
247245
required_capability: knn_function
248246

249247
from colors metadata _score
250-
| where (knn(rgb_vector, [128,128,0], {"k": 140, "similarity": 70}) and length(color) < 10) or (knn(rgb_vector, [128,0,128], {"k": 140, "similarity": 60}) and primary == false)
248+
| where (knn(rgb_vector, [128,128,0], {"similarity": 70}) and length(color) < 10) or (knn(rgb_vector, [128,0,128], {"similarity": 60}) and primary == false)
251249
| sort _score desc, color asc
252250
| keep color, primary
253251
;
@@ -257,29 +255,3 @@ olive | false
257255
purple | false
258256
indigo | false
259257
;
260-
261-
testKnnInStatsNonPushable
262-
required_capability: knn_function
263-
264-
from colors
265-
| where length(color) < 10
266-
| stats c = count(*) where knn(rgb_vector, [128,128,255], {"k": 140})
267-
;
268-
269-
c: long
270-
50
271-
;
272-
273-
testKnnInStatsWithGrouping
274-
required_capability: knn_function
275-
required_capability: full_text_functions_in_stats_where
276-
277-
from colors
278-
| where length(color) < 10
279-
| stats c = count(*) where knn(rgb_vector, [128,128,255], {"k": 140}) by primary
280-
;
281-
282-
c: long | primary: boolean
283-
41 | false
284-
9 | true
285-
;

0 commit comments

Comments
 (0)