Skip to content

Commit 67240a5

Browse files
committed
Fix mistake in merge
1 parent b081c1a commit 67240a5

File tree

1 file changed

+2
-83
lines changed

1 file changed

+2
-83
lines changed

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/190_lookup_join.yml

Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
setup:
33
- requires:
4-
test_runner_features: [capabilities, contains, allowed_warnings]
4+
test_runner_features: [capabilities, contains]
55
capabilities:
66
- method: POST
77
path: /_query
88
parameters: []
9-
capabilities: [join_lookup_v12, join_lookup_skip_mv_warnings]
9+
capabilities: [join_lookup_v12]
1010
reason: "uses LOOKUP JOIN"
1111
- do:
1212
indices.create:
@@ -18,16 +18,6 @@ setup:
1818
type: long
1919
color:
2020
type: keyword
21-
- do:
22-
indices.create:
23-
index: test-mv
24-
body:
25-
mappings:
26-
properties:
27-
key:
28-
type: long
29-
color:
30-
type: keyword
3121
- do:
3222
indices.create:
3323
index: test-lookup-1
@@ -54,19 +44,6 @@ setup:
5444
type: long
5545
color:
5646
type: keyword
57-
- do:
58-
indices.create:
59-
index: test-lookup-mv
60-
body:
61-
settings:
62-
index:
63-
mode: lookup
64-
mappings:
65-
properties:
66-
key:
67-
type: long
68-
color:
69-
type: keyword
7047
- do:
7148
indices.create:
7249
index: test-lookup-no-key
@@ -111,28 +88,6 @@ setup:
11188
- { "key": 1, "color": "cyan" }
11289
- { "index": { } }
11390
- { "key": 2, "color": "yellow" }
114-
- do:
115-
bulk:
116-
index: "test-mv"
117-
refresh: true
118-
body:
119-
- { "index": { } }
120-
- { "key": 1, "color": "red" }
121-
- { "index": { } }
122-
- { "key": 2, "color": "blue" }
123-
- { "index": { } }
124-
- { "key": [0, 1, 2], "color": null }
125-
- do:
126-
bulk:
127-
index: "test-lookup-mv"
128-
refresh: true
129-
body:
130-
- { "index": { } }
131-
- { "key": 1, "color": "cyan" }
132-
- { "index": { } }
133-
- { "key": 2, "color": "yellow" }
134-
- { "index": { } }
135-
- { "key": [0, 1, 2], "color": "green" }
13691
- do:
13792
bulk:
13893
index: "test-lookup-no-key"
@@ -268,42 +223,6 @@ pattern-single:
268223
- match: { error.type: "parsing_exception" }
269224
- contains: { error.reason: "line 1:36: invalid index pattern [test-lookup-1*], * is not allowed in LOOKUP JOIN" }
270225

271-
---
272-
mv-on-lookup:
273-
- do:
274-
esql.query:
275-
body:
276-
query: 'FROM test | SORT key | LOOKUP JOIN test-lookup-mv ON key'
277-
allowed_warnings:
278-
- "No limit defined, adding default limit of [1000]"
279-
- "Line 1:24: evaluation of [LOOKUP JOIN test-lookup-mv ON key] failed, treating result as null. Only first 20 failures recorded."
280-
- "Line 1:24: java.lang.IllegalArgumentException: LOOKUP JOIN encountered multi-value"
281-
282-
- match: {columns.0.name: "key"}
283-
- match: {columns.0.type: "long"}
284-
- match: {columns.1.name: "color"}
285-
- match: {columns.1.type: "keyword"}
286-
- match: {values.0: [1, "cyan"]}
287-
- match: {values.1: [2, "yellow"]}
288-
289-
---
290-
mv-on-query:
291-
- do:
292-
esql.query:
293-
body:
294-
query: 'FROM test-mv | SORT key | LOOKUP JOIN test-lookup-1 ON key | LIMIT 4'
295-
allowed_warnings:
296-
- "Line 1:27: evaluation of [LOOKUP JOIN test-lookup-1 ON key] failed, treating result as null. Only first 20 failures recorded."
297-
- "Line 1:27: java.lang.IllegalArgumentException: LOOKUP JOIN encountered multi-value"
298-
299-
- match: {columns.0.name: "key"}
300-
- match: {columns.0.type: "long"}
301-
- match: {columns.1.name: "color"}
302-
- match: {columns.1.type: "keyword"}
303-
- match: {values.0: [[0, 1, 2], null]}
304-
- match: {values.1: [1, "cyan"]}
305-
- match: {values.2: [2, "yellow"]}
306-
307226
---
308227
lookup-no-key:
309228
- do:

0 commit comments

Comments
 (0)