Skip to content

Commit 4937985

Browse files
shmuelhanochshmuelhanoch
committed
More fixes: block lookup join. Delete date_range from unsupported yaml test, it's not unsupported anymore and there is a normal yaml test for it.
1 parent 8bb26b2 commit 4937985

File tree

2 files changed

+134
-144
lines changed

2 files changed

+134
-144
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import static org.elasticsearch.xpack.esql.core.type.DataType.CARTESIAN_SHAPE;
5757
import static org.elasticsearch.xpack.esql.core.type.DataType.DATETIME;
5858
import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_NANOS;
59+
import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_RANGE;
5960
import static org.elasticsearch.xpack.esql.core.type.DataType.DENSE_VECTOR;
6061
import static org.elasticsearch.xpack.esql.core.type.DataType.DOC_DATA_TYPE;
6162
import static org.elasticsearch.xpack.esql.core.type.DataType.DOUBLE;
@@ -246,6 +247,7 @@ public LookupJoinTypesIT(BinaryComparisonOperation operation) {
246247
|| type == TSID_DATA_TYPE
247248
|| type == AGGREGATE_METRIC_DOUBLE // need special handling for loads at the moment
248249
|| type == DENSE_VECTOR // need special handling for loads at the moment
250+
|| type == DATE_RANGE // need special handling for loads at the moment
249251
|| type == GEOHASH
250252
|| type == GEOTILE
251253
|| type == GEOHEX

‎x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml‎

Lines changed: 132 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ setup:
2121
type: completion
2222
date_nanos:
2323
type: date_nanos
24-
date_range:
25-
type: date_range
26-
format: "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
2724
dense_vector:
2825
type: dense_vector
2926
similarity: l2_norm
@@ -86,7 +83,6 @@ setup:
8683
"binary": "U29tZSBiaW5hcnkgYmxvYg==",
8784
"completion": "foo bar",
8885
"date_nanos": "2015-01-01T12:10:30.123456789Z",
89-
"date_range": { "gte": "2015-10-31 12:00:00", "lte": "2050-12-31 12:00:00" },
9086
"dense_vector": [ 0.5, 10, 6 ],
9187
"double_range": { "gte": 1.0, "lte": 2.0 },
9288
"float_range": { "gte": 1.0, "lte": 2.0 },
@@ -166,56 +162,54 @@ unsupported:
166162
- match: { columns.2.original_types: [completion] }
167163
- match: { columns.3.name: date_nanos }
168164
- match: { columns.3.type: date_nanos }
169-
- match: { columns.4.name: date_range }
165+
- match: { columns.4.name: dense_vector }
170166
- match: { columns.4.type: unsupported }
171-
- match: { columns.5.name: dense_vector }
167+
- match: { columns.5.name: double_range }
172168
- match: { columns.5.type: unsupported }
173-
- match: { columns.6.name: double_range }
169+
- match: { columns.6.name: float_range }
174170
- match: { columns.6.type: unsupported }
175-
- match: { columns.7.name: float_range }
176-
- match: { columns.7.type: unsupported }
177-
- match: { columns.8.name: geo_point }
171+
- match: { columns.7.name: geo_point }
172+
- match: { columns.7.type: geo_point }
173+
- match: { columns.8.name: geo_point_alias }
178174
- match: { columns.8.type: geo_point }
179-
- match: { columns.9.name: geo_point_alias }
180-
- match: { columns.9.type: geo_point }
181-
- match: { columns.10.name: geo_shape }
182-
- match: { columns.10.type: geo_shape }
183-
- match: { columns.11.name: histogram }
175+
- match: { columns.9.name: geo_shape }
176+
- match: { columns.9.type: geo_shape }
177+
- match: { columns.10.name: histogram }
178+
- match: { columns.10.type: unsupported }
179+
- match: { columns.11.name: integer_range }
184180
- match: { columns.11.type: unsupported }
185-
- match: { columns.12.name: integer_range }
181+
- match: { columns.12.name: ip_range }
186182
- match: { columns.12.type: unsupported }
187-
- match: { columns.13.name: ip_range }
183+
- match: { columns.13.name: long_range }
188184
- match: { columns.13.type: unsupported }
189-
- match: { columns.14.name: long_range }
190-
- match: { columns.14.type: unsupported }
191-
- match: { columns.15.name: match_only_text }
192-
- match: { columns.15.type: text }
193-
- match: { columns.16.name: name }
194-
- match: { columns.16.type: keyword }
195-
- match: { columns.17.name: point }
196-
- match: { columns.17.type: cartesian_point }
197-
- match: { columns.18.name: rank_feature }
185+
- match: { columns.14.name: match_only_text }
186+
- match: { columns.14.type: text }
187+
- match: { columns.15.name: name }
188+
- match: { columns.15.type: keyword }
189+
- match: { columns.16.name: point }
190+
- match: { columns.16.type: cartesian_point }
191+
- match: { columns.17.name: rank_feature }
192+
- match: { columns.17.type: unsupported }
193+
- match: { columns.18.name: rank_features }
198194
- match: { columns.18.type: unsupported }
199-
- match: { columns.19.name: rank_features }
195+
- match: { columns.19.name: search_as_you_type }
200196
- match: { columns.19.type: unsupported }
201-
- match: { columns.20.name: search_as_you_type }
197+
- match: { columns.20.name: search_as_you_type._2gram }
202198
- match: { columns.20.type: unsupported }
203-
- match: { columns.21.name: search_as_you_type._2gram }
199+
- match: { columns.21.name: search_as_you_type._3gram }
204200
- match: { columns.21.type: unsupported }
205-
- match: { columns.22.name: search_as_you_type._3gram }
201+
- match: { columns.22.name: search_as_you_type._index_prefix }
206202
- match: { columns.22.type: unsupported }
207-
- match: { columns.23.name: search_as_you_type._index_prefix }
208-
- match: { columns.23.type: unsupported }
209-
- match: { columns.24.name: shape }
210-
- match: { columns.24.type: cartesian_shape }
211-
- match: { columns.25.name: some_doc.bar }
212-
- match: { columns.25.type: long }
213-
- match: { columns.26.name: some_doc.foo }
214-
- match: { columns.26.type: keyword }
215-
- match: { columns.27.name: text }
216-
- match: { columns.27.type: text }
217-
- match: { columns.28.name: token_count }
218-
- match: { columns.28.type: integer }
203+
- match: { columns.23.name: shape }
204+
- match: { columns.23.type: cartesian_shape }
205+
- match: { columns.24.name: some_doc.bar }
206+
- match: { columns.24.type: long }
207+
- match: { columns.25.name: some_doc.foo }
208+
- match: { columns.25.type: keyword }
209+
- match: { columns.26.name: text }
210+
- match: { columns.26.type: text }
211+
- match: { columns.27.name: token_count }
212+
- match: { columns.27.type: integer }
219213

220214
- length: { values: 1 }
221215
- match: { values.0.0: null }
@@ -225,28 +219,27 @@ unsupported:
225219
- match: { values.0.4: null }
226220
- match: { values.0.5: null }
227221
- match: { values.0.6: null }
228-
- match: { values.0.7: null }
222+
- match: { values.0.7: "POINT (10.0 12.0)" }
229223
- match: { values.0.8: "POINT (10.0 12.0)" }
230-
- match: { values.0.9: "POINT (10.0 12.0)" }
231-
- match: { values.0.10: "LINESTRING (-97.154 25.996, -97.159 25.998, -97.181 25.991, -97.187 25.985)" }
224+
- match: { values.0.9: "LINESTRING (-97.154 25.996, -97.159 25.998, -97.181 25.991, -97.187 25.985)" }
225+
- match: { values.0.10: null }
232226
- match: { values.0.11: null }
233227
- match: { values.0.12: null }
234228
- match: { values.0.13: null }
235-
- match: { values.0.14: null }
236-
- match: { values.0.15: "foo bar baz" }
237-
- match: { values.0.16: Alice }
238-
- match: { values.0.17: "POINT (-97.15447 25.9961525)" }
229+
- match: { values.0.14: "foo bar baz" }
230+
- match: { values.0.15: Alice }
231+
- match: { values.0.16: "POINT (-97.15447 25.9961525)" }
232+
- match: { values.0.17: null }
239233
- match: { values.0.18: null }
240234
- match: { values.0.19: null }
241235
- match: { values.0.20: null }
242236
- match: { values.0.21: null }
243237
- match: { values.0.22: null }
244-
- match: { values.0.23: null }
245-
- match: { values.0.24: "LINESTRING (-377.03653 389.897676, -377.009051 389.889939)" }
246-
- match: { values.0.25: 12 }
247-
- match: { values.0.26: xy }
248-
- match: { values.0.27: "foo bar" }
249-
- match: { values.0.28: 3 }
238+
- match: { values.0.23: "LINESTRING (-377.03653 389.897676, -377.009051 389.889939)" }
239+
- match: { values.0.24: 12 }
240+
- match: { values.0.25: xy }
241+
- match: { values.0.26: "foo bar" }
242+
- match: { values.0.27: 3 }
250243

251244

252245
# limit 0
@@ -264,56 +257,54 @@ unsupported:
264257
- match: { columns.2.original_types: [completion] }
265258
- match: { columns.3.name: date_nanos }
266259
- match: { columns.3.type: date_nanos }
267-
- match: { columns.4.name: date_range }
260+
- match: { columns.4.name: dense_vector }
268261
- match: { columns.4.type: unsupported }
269-
- match: { columns.5.name: dense_vector }
262+
- match: { columns.5.name: double_range }
270263
- match: { columns.5.type: unsupported }
271-
- match: { columns.6.name: double_range }
264+
- match: { columns.6.name: float_range }
272265
- match: { columns.6.type: unsupported }
273-
- match: { columns.7.name: float_range }
274-
- match: { columns.7.type: unsupported }
275-
- match: { columns.8.name: geo_point }
266+
- match: { columns.7.name: geo_point }
267+
- match: { columns.7.type: geo_point }
268+
- match: { columns.8.name: geo_point_alias }
276269
- match: { columns.8.type: geo_point }
277-
- match: { columns.9.name: geo_point_alias }
278-
- match: { columns.9.type: geo_point }
279-
- match: { columns.10.name: geo_shape }
280-
- match: { columns.10.type: geo_shape }
281-
- match: { columns.11.name: histogram }
270+
- match: { columns.9.name: geo_shape }
271+
- match: { columns.9.type: geo_shape }
272+
- match: { columns.10.name: histogram }
273+
- match: { columns.10.type: unsupported }
274+
- match: { columns.11.name: integer_range }
282275
- match: { columns.11.type: unsupported }
283-
- match: { columns.12.name: integer_range }
276+
- match: { columns.12.name: ip_range }
284277
- match: { columns.12.type: unsupported }
285-
- match: { columns.13.name: ip_range }
278+
- match: { columns.13.name: long_range }
286279
- match: { columns.13.type: unsupported }
287-
- match: { columns.14.name: long_range }
288-
- match: { columns.14.type: unsupported }
289-
- match: { columns.15.name: match_only_text }
290-
- match: { columns.15.type: text }
291-
- match: { columns.16.name: name }
292-
- match: { columns.16.type: keyword }
293-
- match: { columns.17.name: point }
294-
- match: { columns.17.type: cartesian_point }
295-
- match: { columns.18.name: rank_feature }
280+
- match: { columns.14.name: match_only_text }
281+
- match: { columns.14.type: text }
282+
- match: { columns.15.name: name }
283+
- match: { columns.15.type: keyword }
284+
- match: { columns.16.name: point }
285+
- match: { columns.16.type: cartesian_point }
286+
- match: { columns.17.name: rank_feature }
287+
- match: { columns.17.type: unsupported }
288+
- match: { columns.18.name: rank_features }
296289
- match: { columns.18.type: unsupported }
297-
- match: { columns.19.name: rank_features }
290+
- match: { columns.19.name: search_as_you_type }
298291
- match: { columns.19.type: unsupported }
299-
- match: { columns.20.name: search_as_you_type }
292+
- match: { columns.20.name: search_as_you_type._2gram }
300293
- match: { columns.20.type: unsupported }
301-
- match: { columns.21.name: search_as_you_type._2gram }
294+
- match: { columns.21.name: search_as_you_type._3gram }
302295
- match: { columns.21.type: unsupported }
303-
- match: { columns.22.name: search_as_you_type._3gram }
296+
- match: { columns.22.name: search_as_you_type._index_prefix }
304297
- match: { columns.22.type: unsupported }
305-
- match: { columns.23.name: search_as_you_type._index_prefix }
306-
- match: { columns.23.type: unsupported }
307-
- match: { columns.24.name: shape }
308-
- match: { columns.24.type: cartesian_shape }
309-
- match: { columns.25.name: some_doc.bar }
310-
- match: { columns.25.type: long }
311-
- match: { columns.26.name: some_doc.foo }
312-
- match: { columns.26.type: keyword }
313-
- match: { columns.27.name: text }
314-
- match: { columns.27.type: text }
315-
- match: { columns.28.name: token_count }
316-
- match: { columns.28.type: integer }
298+
- match: { columns.23.name: shape }
299+
- match: { columns.23.type: cartesian_shape }
300+
- match: { columns.24.name: some_doc.bar }
301+
- match: { columns.24.type: long }
302+
- match: { columns.25.name: some_doc.foo }
303+
- match: { columns.25.type: keyword }
304+
- match: { columns.26.name: text }
305+
- match: { columns.26.type: text }
306+
- match: { columns.27.name: token_count }
307+
- match: { columns.27.type: integer }
317308

318309
- length: { values: 0 }
319310

@@ -357,56 +348,54 @@ unsupported with sort:
357348
- match: { columns.2.type: unsupported }
358349
- match: { columns.3.name: date_nanos }
359350
- match: { columns.3.type: date_nanos }
360-
- match: { columns.4.name: date_range }
351+
- match: { columns.4.name: dense_vector }
361352
- match: { columns.4.type: unsupported }
362-
- match: { columns.5.name: dense_vector }
353+
- match: { columns.5.name: double_range }
363354
- match: { columns.5.type: unsupported }
364-
- match: { columns.6.name: double_range }
355+
- match: { columns.6.name: float_range }
365356
- match: { columns.6.type: unsupported }
366-
- match: { columns.7.name: float_range }
367-
- match: { columns.7.type: unsupported }
368-
- match: { columns.8.name: geo_point }
357+
- match: { columns.7.name: geo_point }
358+
- match: { columns.7.type: geo_point }
359+
- match: { columns.8.name: geo_point_alias }
369360
- match: { columns.8.type: geo_point }
370-
- match: { columns.9.name: geo_point_alias }
371-
- match: { columns.9.type: geo_point }
372-
- match: { columns.10.name: geo_shape }
373-
- match: { columns.10.type: geo_shape }
374-
- match: { columns.11.name: histogram }
361+
- match: { columns.9.name: geo_shape }
362+
- match: { columns.9.type: geo_shape }
363+
- match: { columns.10.name: histogram }
364+
- match: { columns.10.type: unsupported }
365+
- match: { columns.11.name: integer_range }
375366
- match: { columns.11.type: unsupported }
376-
- match: { columns.12.name: integer_range }
367+
- match: { columns.12.name: ip_range }
377368
- match: { columns.12.type: unsupported }
378-
- match: { columns.13.name: ip_range }
369+
- match: { columns.13.name: long_range }
379370
- match: { columns.13.type: unsupported }
380-
- match: { columns.14.name: long_range }
381-
- match: { columns.14.type: unsupported }
382-
- match: { columns.15.name: match_only_text }
383-
- match: { columns.15.type: text }
384-
- match: { columns.16.name: name }
385-
- match: { columns.16.type: keyword }
386-
- match: { columns.17.name: point }
387-
- match: { columns.17.type: cartesian_point }
388-
- match: { columns.18.name: rank_feature }
371+
- match: { columns.14.name: match_only_text }
372+
- match: { columns.14.type: text }
373+
- match: { columns.15.name: name }
374+
- match: { columns.15.type: keyword }
375+
- match: { columns.16.name: point }
376+
- match: { columns.16.type: cartesian_point }
377+
- match: { columns.17.name: rank_feature }
378+
- match: { columns.17.type: unsupported }
379+
- match: { columns.18.name: rank_features }
389380
- match: { columns.18.type: unsupported }
390-
- match: { columns.19.name: rank_features }
381+
- match: { columns.19.name: search_as_you_type }
391382
- match: { columns.19.type: unsupported }
392-
- match: { columns.20.name: search_as_you_type }
383+
- match: { columns.20.name: search_as_you_type._2gram }
393384
- match: { columns.20.type: unsupported }
394-
- match: { columns.21.name: search_as_you_type._2gram }
385+
- match: { columns.21.name: search_as_you_type._3gram }
395386
- match: { columns.21.type: unsupported }
396-
- match: { columns.22.name: search_as_you_type._3gram }
387+
- match: { columns.22.name: search_as_you_type._index_prefix }
397388
- match: { columns.22.type: unsupported }
398-
- match: { columns.23.name: search_as_you_type._index_prefix }
399-
- match: { columns.23.type: unsupported }
400-
- match: { columns.24.name: shape }
401-
- match: { columns.24.type: cartesian_shape }
402-
- match: { columns.25.name: some_doc.bar }
403-
- match: { columns.25.type: long }
404-
- match: { columns.26.name: some_doc.foo }
405-
- match: { columns.26.type: keyword }
406-
- match: { columns.27.name: text }
407-
- match: { columns.27.type: text }
408-
- match: { columns.28.name: token_count }
409-
- match: { columns.28.type: integer }
389+
- match: { columns.23.name: shape }
390+
- match: { columns.23.type: cartesian_shape }
391+
- match: { columns.24.name: some_doc.bar }
392+
- match: { columns.24.type: long }
393+
- match: { columns.25.name: some_doc.foo }
394+
- match: { columns.25.type: keyword }
395+
- match: { columns.26.name: text }
396+
- match: { columns.26.type: text }
397+
- match: { columns.27.name: token_count }
398+
- match: { columns.27.type: integer }
410399

411400
- length: { values: 1 }
412401
- match: { values.0.0: null }
@@ -416,28 +405,27 @@ unsupported with sort:
416405
- match: { values.0.4: null }
417406
- match: { values.0.5: null }
418407
- match: { values.0.6: null }
419-
- match: { values.0.7: null }
408+
- match: { values.0.7: "POINT (10.0 12.0)" }
420409
- match: { values.0.8: "POINT (10.0 12.0)" }
421-
- match: { values.0.9: "POINT (10.0 12.0)" }
422-
- match: { values.0.10: "LINESTRING (-97.154 25.996, -97.159 25.998, -97.181 25.991, -97.187 25.985)" }
410+
- match: { values.0.9: "LINESTRING (-97.154 25.996, -97.159 25.998, -97.181 25.991, -97.187 25.985)" }
411+
- match: { values.0.10: null }
423412
- match: { values.0.11: null }
424413
- match: { values.0.12: null }
425414
- match: { values.0.13: null }
426-
- match: { values.0.14: null }
427-
- match: { values.0.15: "foo bar baz" }
428-
- match: { values.0.16: Alice }
429-
- match: { values.0.17: "POINT (-97.15447 25.9961525)" }
415+
- match: { values.0.14: "foo bar baz" }
416+
- match: { values.0.15: Alice }
417+
- match: { values.0.16: "POINT (-97.15447 25.9961525)" }
418+
- match: { values.0.17: null }
430419
- match: { values.0.18: null }
431420
- match: { values.0.19: null }
432421
- match: { values.0.20: null }
433422
- match: { values.0.21: null }
434423
- match: { values.0.22: null }
435-
- match: { values.0.23: null }
436-
- match: { values.0.24: "LINESTRING (-377.03653 389.897676, -377.009051 389.889939)" }
437-
- match: { values.0.25: 12 }
438-
- match: { values.0.26: xy }
439-
- match: { values.0.27: "foo bar" }
440-
- match: { values.0.28: 3 }
424+
- match: { values.0.23: "LINESTRING (-377.03653 389.897676, -377.009051 389.889939)" }
425+
- match: { values.0.24: 12 }
426+
- match: { values.0.25: xy }
427+
- match: { values.0.26: "foo bar" }
428+
- match: { values.0.27: 3 }
441429
---
442430
nested declared inline:
443431
- do:

0 commit comments

Comments
 (0)