Skip to content

Commit c5b1292

Browse files
carlosdelestcarlosdelest
committed
Remove colors that have duplicate names to help with matching and scoring
1 parent 36c26a5 commit c5b1292

File tree

2 files changed

+56
-140
lines changed

2 files changed

+56
-140
lines changed

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/colors.csv‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,139 +1,60 @@
11
color:text,hex_code:keyword,rgb_vector:dense_vector,primary:boolean
22
maroon, #800000, [128,0,0], false
3-
dark red, #8B0000, [139,0,0], false
43
brown, #A52A2A, [165,42,42], false
54
firebrick, #B22222, [178,34,34], false
65
crimson, #DC143C, [220,20,60], false
76
red, #FF0000, [255,0,0], true
87
tomato, #FF6347, [255,99,71], false
98
coral, #FF7F50, [255,127,80], false
10-
indian red, #CD5C5C, [205,92,92], false
11-
light coral, #F08080, [240,128,128], false
12-
dark salmon, #E9967A, [233,150,122], false
139
salmon, #FA8072, [250,128,114], false
14-
light salmon, #FFA07A, [255,160,122], false
15-
orange red, #FF4500, [255,69,0], false
16-
dark orange, #FF8C00, [255,140,0], false
1710
orange, #FFA500, [255,165,0], false
1811
gold, #FFD700, [255,215,0], false
19-
dark golden rod, #B8860B, [184,134,11], false
2012
golden rod, #DAA520, [218,165,32], false
21-
pale golden rod, #EEE8AA, [238,232,170], false
22-
dark khaki, #BDB76B, [189,183,107], false
2313
khaki, #F0E68C, [240,230,140], false
2414
olive, #808000, [128,128,0], false
2515
yellow, #FFFF00, [255,255,0], true
26-
yellow green, #9ACD32, [154,205,50], false
27-
dark olive green, #556B2F, [85,107,47], false
28-
olive drab, #6B8E23, [107,142,35], false
29-
lawn green, #7CFC00, [124,252,0], false
3016
chartreuse, #7FFF00, [127,255,0], false
31-
green yellow, #ADFF2F, [173,255,47], false
32-
dark green, #006400, [0,100,0], false
3317
green, #008000, [0,128,0], true
34-
forest green, #228B22, [34,139,34], false
3518
lime, #00FF00, [0,255,0], false
36-
lime green, #32CD32, [50,205,50], false
37-
light green, #90EE90, [144,238,144], false
38-
pale green, #98FB98, [152,251,152], false
39-
dark sea green, #8FBC8F, [143,188,143], false
40-
medium spring green, #00FA9A, [0,250,154], false
41-
spring green, #00FF7F, [0,255,127], false
42-
sea green, #2E8B57, [46,139,87], false
43-
medium aqua marine, #66CDAA, [102,205,170], false
44-
medium sea green, #3CB371, [60,179,113], false
45-
light sea green, #20B2AA, [32,178,170], false
46-
dark slate gray, #2F4F4F, [47,79,79], false
4719
teal, #008080, [0,128,128], false
48-
dark cyan, #008B8B, [0,139,139], false
4920
cyan, #00FFFF, [0,255,255], true
50-
light cyan, #E0FFFF, [224,255,255], false
51-
dark turquoise, #00CED1, [0,206,209], false
5221
turquoise, #40E0D0, [64,224,208], false
53-
medium turquoise, #48D1CC, [72,209,204], false
54-
pale turquoise, #AFEEEE, [175,238,238], false
5522
aqua marine, #7FFFD4, [127,255,212], false
56-
powder blue, #B0E0E6, [176,224,230], false
57-
cadet blue, #5F9EA0, [95,158,160], false
58-
steel blue, #4682B4, [70,130,180], false
59-
corn flower blue, #6495ED, [100,149,237], false
60-
deep sky blue, #00BFFF, [0,191,255], false
61-
dodger blue, #1E90FF, [30,144,255], false
62-
light blue, #ADD8E6, [173,216,230], false
63-
sky blue, #87CEEB, [135,206,235], false
64-
light sky blue, #87CEFA, [135,206,250], false
65-
midnight blue, #191970, [25,25,112], false
6623
navy, #000080, [0,0,128], false
67-
dark blue, #00008B, [0,0,139], false
68-
medium blue, #0000CD, [0,0,205], false
6924
blue, #0000FF, [0,0,255], true
70-
royal blue, #4169E1, [65,105,225], false
71-
blue violet, #8A2BE2, [138,43,226], false
7225
indigo, #4B0082, [75,0,130], false
73-
dark slate blue, #483D8B, [72,61,139], false
74-
slate blue, #6A5ACD, [106,90,205], false
75-
medium slate blue, #7B68EE, [123,104,238], false
76-
medium purple, #9370DB, [147,112,219], false
77-
dark magenta, #8B008B, [139,0,139], false
78-
dark violet, #9400D3, [148,0,211], false
79-
dark orchid, #9932CC, [153,50,204], false
80-
medium orchid, #BA55D3, [186,85,211], false
8126
purple, #800080, [128,0,128], false
8227
thistle, #D8BFD8, [216,191,216], false
8328
plum, #DDA0DD, [221,160,221], false
8429
violet, #EE82EE, [238,130,238], false
8530
magenta, #FF00FF, [255,0,255], true
8631
orchid, #DA70D6, [218,112,214], false
87-
medium violet red, #C71585, [199,21,133], false
88-
pale violet red, #DB7093, [219,112,147], false
89-
deep pink, #FF1493, [255,20,147], false
90-
hot pink, #FF69B4, [255,105,180], false
91-
light pink, #FFB6C1, [255,182,193], false
9232
pink, #FFC0CB, [255,192,203], false
93-
antique white, #FAEBD7, [250,235,215], false
9433
beige, #F5F5DC, [245,245,220], false
9534
bisque, #FFE4C4, [255,228,196], false
96-
blanched almond, #FFEBCD, [255,235,205], false
9735
wheat, #F5DEB3, [245,222,179], false
9836
corn silk, #FFF8DC, [255,248,220], false
9937
lemon chiffon, #FFFACD, [255,250,205], false
100-
light golden rod yellow, #FAFAD2, [250,250,210], false
101-
light yellow, #FFFFE0, [255,255,224], false
102-
saddle brown, #8B4513, [139,69,19], false
10338
sienna, #A0522D, [160,82,45], false
10439
chocolate, #D2691E, [210,105,30], false
10540
peru, #CD853F, [205,133,63], false
106-
sandy brown, #F4A460, [244,164,96], false
10741
burly wood, #DEB887, [222,184,135], false
10842
tan, #D2B48C, [210,180,140], false
109-
rosy brown, #BC8F8F, [188,143,143], false
11043
moccasin, #FFE4B5, [255,228,181], false
111-
navajo white, #FFDEAD, [255,222,173], false
11244
peach puff, #FFDAB9, [255,218,185], false
11345
misty rose, #FFE4E1, [255,228,225], false
114-
lavender blush, #FFF0F5, [255,240,245], false
11546
linen, #FAF0E6, [250,240,230], false
11647
old lace, #FDF5E6, [253,245,230], false
11748
papaya whip, #FFEFD5, [255,239,213], false
11849
sea shell, #FFF5EE, [255,245,238], false
11950
mint cream, #F5FFFA, [245,255,250], false
120-
slate gray, #708090, [112,128,144], false
121-
light slate gray, #778899, [119,136,153], false
122-
light steel blue, #B0C4DE, [176,196,222], false
12351
lavender, #E6E6FA, [230,230,250], false
124-
floral white, #FFFAF0, [255,250,240], false
125-
alice blue, #F0F8FF, [240,248,255], false
126-
ghost white, #F8F8FF, [248,248,255], false
12752
honeydew, #F0FFF0, [240,255,240], false
12853
ivory, #FFFFF0, [255,255,240], false
12954
azure, #F0FFFF, [240,255,255], false
13055
snow, #FFFAFA, [255,250,250], false
13156
black, #000000, [0,0,0], true
132-
dim gray, #696969, [105,105,105], false
13357
gray, #808080, [128,128,128], true
134-
dark gray, #A9A9A9, [169,169,169], false
13558
silver, #C0C0C0, [192,192,192], false
136-
light gray, #D3D3D3, [211,211,211], false
13759
gainsboro, #DCDCDC, [220,220,220], false
138-
white smoke, #F5F5F5, [245,245,245], false
13960
white, #FFFFFF, [255,255,255], true

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

Lines changed: 56 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ from colors metadata _score
1515
;
1616

1717
// tag::knn-function-result[]
18-
color:text | rgb_vector:dense_vector
19-
green | [0.0, 128.0, 0.0]
20-
dark green | [0.0, 100.0, 0.0]
21-
forest green | [34.0, 139.0, 34.0]
22-
dark olive green | [85.0, 107.0, 47.0]
23-
sea green | [46.0, 139.0, 87.0]
24-
dark slate gray | [47.0, 79.0, 79.0]
25-
lime green | [50.0, 205.0, 50.0]
26-
olive drab | [107.0, 142.0, 35.0]
27-
black | [0.0, 0.0, 0.0]
28-
olive | [128.0, 128.0, 0.0]
18+
color:text | rgb_vector:dense_vector
19+
green | [0.0, 128.0, 0.0]
20+
black | [0.0, 0.0, 0.0]
21+
olive | [128.0, 128.0, 0.0]
22+
teal | [0.0, 128.0, 128.0]
23+
lime | [0.0, 255.0, 0.0]
24+
sienna | [160.0, 82.0, 45.0]
25+
maroon | [128.0, 0.0, 0.0]
26+
navy | [0.0, 0.0, 128.0]
27+
gray | [128.0, 128.0, 128.0]
28+
chartreuse | [127.0, 255.0, 0.0]
2929
// end::knn-function-result[]
3030
;
3131

@@ -41,11 +41,11 @@ from colors metadata _score
4141
| limit 4
4242
;
4343

44-
color:text | rgb_vector:dense_vector
45-
cyan | [0.0, 255.0, 255.0]
46-
deep sky blue | [0.0, 191.0, 255.0]
47-
dark turquoise | [0.0, 206.0, 209.0]
48-
turquoise | [64.0, 224.0, 208.0]
44+
color:text | rgb_vector:dense_vector
45+
cyan | [0.0, 255.0, 255.0]
46+
turquoise | [64.0, 224.0, 208.0]
47+
aqua marine | [127.0, 255.0, 212.0]
48+
teal | [0.0, 128.0, 128.0]
4949
;
5050

5151
knnSearchWithSimilarityOption
@@ -57,12 +57,12 @@ from colors metadata _score
5757
| keep color, rgb_vector
5858
;
5959

60-
color:text | rgb_vector:dense_vector
60+
color:text | rgb_vector:dense_vector
6161
pink | [255.0, 192.0, 203.0]
62-
light pink | [255.0, 182.0, 193.0]
6362
peach puff | [255.0, 218.0, 185.0]
6463
bisque | [255.0, 228.0, 196.0]
6564
wheat | [245.0, 222.0, 179.0]
65+
6666
;
6767

6868
knnHybridSearch
@@ -99,8 +99,6 @@ from colors metadata _score
9999

100100
color:text | rgb_vector:dense_vector
101101
olive | [128.0, 128.0, 0.0]
102-
olive drab | [107.0, 142.0, 35.0]
103-
dark olive green | [85.0, 107.0, 47.0]
104102
;
105103

106104
knnAfterKeep
@@ -116,10 +114,10 @@ from colors metadata _score
116114

117115
rgb_vector:dense_vector
118116
[127.0, 255.0, 0.0]
119-
[124.0, 252.0, 0.0]
120-
[173.0, 255.0, 47.0]
121-
[154.0, 205.0, 50.0]
122-
[50.0, 205.0, 50.0]
117+
[128.0, 128.0, 0.0]
118+
[255.0, 255.0, 0.0]
119+
[0.0, 255.0, 0.0]
120+
[218.0, 165.0, 32.0]
123121
;
124122

125123
knnAfterDrop
@@ -134,11 +132,11 @@ from colors metadata _score
134132
;
135133

136134
rgb_vector:dense_vector
137-
[127.0, 255.0, 0.0]
138-
[124.0, 252.0, 0.0]
139-
[173.0, 255.0, 47.0]
140-
[154.0, 205.0, 50.0]
141-
[50.0, 205.0, 50.0]
135+
[127.0, 255.0, 0.0]
136+
[255.0, 255.0, 0.0]
137+
[128.0, 128.0, 0.0]
138+
[0.0, 255.0, 0.0]
139+
[218.0, 165.0, 32.0]
142140
;
143141

144142
knnAfterEval
@@ -152,17 +150,17 @@ from colors metadata _score
152150
| limit 10
153151
;
154152

155-
color:text | composed_name:boolean
156-
olive | false
157-
olive drab | true
158-
dark golden rod | true
159-
saddle brown | true
160-
dark olive green | true
161-
sienna | false
162-
chocolate | false
163-
yellow green | true
164-
peru | false
165-
forest green | true
153+
color:text | composed_name:boolean
154+
olive | false
155+
sienna | false
156+
chocolate | false
157+
peru | false
158+
golden rod | true
159+
brown | false
160+
firebrick | false
161+
chartreuse | false
162+
green | false
163+
maroon | false
166164
;
167165

168166
knnWithConjunction
@@ -175,19 +173,15 @@ from colors metadata _score
175173
| keep color, hex_code, rgb_vector
176174
| limit 10
177175
;
178-
ignoreOrder:true
179-
180-
color:text | hex_code:keyword | rgb_vector:dense_vector
181-
corn silk | #FFF8DC | [255.0, 248.0, 220.0]
182-
floral white | #FFFAF0 | [255.0, 250.0, 240.0]
183-
ivory | #FFFFF0 | [255.0, 255.0, 240.0]
184-
lavender blush | #FFF0F5 | [255.0, 240.0, 245.0]
185-
lemon chiffon | #FFFACD | [255.0, 250.0, 205.0]
186-
light yellow | #FFFFE0 | [255.0, 255.0, 224.0]
187-
sea shell | #FFF5EE | [255.0, 245.0, 238.0]
188-
snow | #FFFAFA | [255.0, 250.0, 250.0]
189-
white | #FFFFFF | [255.0, 255.0, 255.0]
190-
yellow | #FFFF00 | [255.0, 255.0, 0.0]
176+
177+
color:text | hex_code:keyword | rgb_vector:dense_vector
178+
ivory | #FFFFF0 | [255.0, 255.0, 240.0]
179+
sea shell | #FFF5EE | [255.0, 245.0, 238.0]
180+
snow | #FFFAFA | [255.0, 250.0, 250.0]
181+
white | #FFFFFF | [255.0, 255.0, 255.0]
182+
corn silk | #FFF8DC | [255.0, 248.0, 220.0]
183+
lemon chiffon | #FFFACD | [255.0, 250.0, 205.0]
184+
yellow | #FFFF00 | [255.0, 255.0, 0.0]
191185
;
192186

193187
knnWithDisjunctionAndFiltersConjunction
@@ -242,30 +236,31 @@ testKnnWithNonPushableDisjunctions
242236
required_capability: knn_function
243237

244238
from colors metadata _score
245-
| where knn(rgb_vector, [128,128,0], {"k": 140, "similarity": 30}) or length(color) > 17
239+
| where knn(rgb_vector, [128,128,0], {"k": 140, "similarity": 30}) or length(color) > 10
246240
| sort _score desc, color asc
247241
| keep color
248242
;
249243

250244
color:text
251245
olive
252-
light golden rod yellow
253-
medium aqua marine
254-
medium spring green
246+
aqua marine
247+
lemon chiffon
248+
papaya whip
255249
;
256250

257251
testKnnWithNonPushableDisjunctionsOnComplexExpressions
258252
required_capability: knn_function
259253

260254
from colors metadata _score
261-
| where (knn(rgb_vector, [128,128,0], {"k": 140, "similarity": 40}) and length(color) > 5) or (knn(rgb_vector, [128,0,128], {"k": 140, "similarity": 40}) and primary == false)
255+
| 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)
262256
| sort _score desc, color asc
263257
| keep color, primary
264258
;
265259

266260
color:text | primary:boolean
261+
olive | false
267262
purple | false
268-
dark magenta | false
263+
indigo | false
269264
;
270265

271266
testKnnInStatsNonPushable
@@ -277,7 +272,7 @@ from colors
277272
;
278273

279274
c: long
280-
59
275+
50
281276
;
282277

283278
testKnnInStatsWithGrouping
@@ -290,6 +285,6 @@ from colors
290285
;
291286

292287
c: long | primary: boolean
293-
50 | false
288+
41 | false
294289
9 | true
295290
;

0 commit comments

Comments
 (0)