Skip to content

Commit 270f066

Browse files
not-napoleonnot-napoleon
committed
fix exact subfield tests
1 parent 5c9f989 commit 270f066

File tree

1 file changed

+67
-34
lines changed

1 file changed

+67
-34
lines changed

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

Lines changed: 67 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
setup:
33
- requires:
4-
cluster_features: ["gte_v8.13.0"]
4+
cluster_features: [ "gte_v8.13.0" ]
55
reason: "Exact subfields fixed in v 8.13"
66
test_runner_features: allowed_warnings_regex
77
- do:
@@ -45,12 +45,15 @@ setup:
4545
refresh: true
4646
body:
4747
- { "index": { } }
48-
- { "emp_no": 10, "text_ignore_above":"this is a long text", "text_normalizer": "CamelCase", "non_indexed": "foo"}
48+
- { "emp_no": 10, "text_ignore_above": "this is a long text", "text_normalizer": "CamelCase", "non_indexed": "foo" }
4949
- { "index": { } }
50-
- { "emp_no": 20, "text_ignore_above":"this", "text_normalizer": "abc", "non_indexed": "bar"}
50+
- { "emp_no": 20, "text_ignore_above": "this", "text_normalizer": "abc", "non_indexed": "bar" }
5151

5252
---
5353
"extract":
54+
- requires:
55+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
56+
reason: "Behavior changed in #126623"
5457
- do:
5558
allowed_warnings_regex:
5659
- "No limit defined, adding default limit of \\[.*\\]"
@@ -72,11 +75,14 @@ setup:
7275
- match: { columns.5.type: "keyword" }
7376

7477
- length: { values: 2 }
75-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
76-
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ]}
78+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
79+
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ] }
7780

7881
---
7982
"filter ignore above":
83+
- requires:
84+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
85+
reason: "Behavior changed in #126623"
8086
- do:
8187
allowed_warnings_regex:
8288
- "No limit defined, adding default limit of \\[.*\\]"
@@ -98,7 +104,7 @@ setup:
98104
- match: { columns.5.type: "keyword" }
99105

100106
- length: { values: 1 }
101-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
107+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
102108

103109
- do:
104110
allowed_warnings_regex:
@@ -121,7 +127,7 @@ setup:
121127
- match: { columns.5.type: "keyword" }
122128

123129
- length: { values: 1 }
124-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
130+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
125131

126132

127133
- do:
@@ -191,10 +197,13 @@ setup:
191197
- match: { columns.5.type: "keyword" }
192198

193199
- length: { values: 1 }
194-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
200+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
195201

196202
---
197-
"filter with normalizer":
203+
"filter with normalizer 1":
204+
- requires:
205+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
206+
reason: "Behavior changed in #126623"
198207
- do:
199208
allowed_warnings_regex:
200209
- "No limit defined, adding default limit of \\[.*\\]"
@@ -216,15 +225,19 @@ setup:
216225
- match: { columns.5.type: "keyword" }
217226

218227
- length: { values: 1 }
219-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
220-
228+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
221229

230+
---
231+
"filter with normalizer 2":
232+
- requires:
233+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
234+
reason: "Behavior changed in #126623"
222235
- do:
223236
allowed_warnings_regex:
224237
- "No limit defined, adding default limit of \\[.*\\]"
225238
esql.query:
226239
body:
227-
query: 'from test | where text_normalizer == text_normalizer.raw | keep text_ignore_above, text_ignore_above.raw, text_normalizer, text_normalizer.raw, non_indexed, non_indexed.raw'
240+
query: 'from test | where text_normalizer == text_normalizer.raw | SORT emp_no | keep text_ignore_above, text_ignore_above.raw, text_normalizer, text_normalizer.raw, non_indexed, non_indexed.raw'
228241

229242
- match: { columns.0.name: "text_ignore_above" }
230243
- match: { columns.0.type: "text" }
@@ -239,11 +252,15 @@ setup:
239252
- match: { columns.5.name: "non_indexed.raw" }
240253
- match: { columns.5.type: "keyword" }
241254

242-
- length: { values: 1 }
243-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
255+
- length: { values: 2 }
256+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
257+
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ] }
244258

245259
---
246260
"sort ignore above":
261+
- requires:
262+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
263+
reason: "Behavior changed in #126623"
247264
- do:
248265
allowed_warnings_regex:
249266
- "No limit defined, adding default limit of \\[.*\\]"
@@ -265,8 +282,8 @@ setup:
265282
- match: { columns.5.type: "keyword" }
266283

267284
- length: { values: 2 }
268-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
269-
- match: { values.1: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
285+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
286+
- match: { values.1: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
270287

271288
- do:
272289
allowed_warnings_regex:
@@ -289,8 +306,8 @@ setup:
289306
- match: { columns.5.type: "keyword" }
290307

291308
- length: { values: 2 }
292-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
293-
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ]}
309+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
310+
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ] }
294311

295312
- do:
296313
allowed_warnings_regex:
@@ -313,8 +330,8 @@ setup:
313330
- match: { columns.5.type: "keyword" }
314331

315332
- length: { values: 2 }
316-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
317-
- match: { values.1: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
333+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
334+
- match: { values.1: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
318335

319336
- do:
320337
allowed_warnings_regex:
@@ -337,11 +354,14 @@ setup:
337354
- match: { columns.5.type: "keyword" }
338355

339356
- length: { values: 2 }
340-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
341-
- match: { values.1: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
357+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
358+
- match: { values.1: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
342359

343360
---
344-
"sort normalizer":
361+
"sort normalizer 1":
362+
- requires:
363+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
364+
reason: "Behavior changed in #126623"
345365
- do:
346366
allowed_warnings_regex:
347367
- "No limit defined, adding default limit of \\[.*\\]"
@@ -363,9 +383,14 @@ setup:
363383
- match: { columns.5.type: "keyword" }
364384

365385
- length: { values: 2 }
366-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
367-
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ]}
386+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
387+
- match: { values.1: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
368388

389+
---
390+
"sort normalizer 2":
391+
- requires:
392+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
393+
reason: "Behavior changed in #126623"
369394
- do:
370395
allowed_warnings_regex:
371396
- "No limit defined, adding default limit of \\[.*\\]"
@@ -387,9 +412,14 @@ setup:
387412
- match: { columns.5.type: "keyword" }
388413

389414
- length: { values: 2 }
390-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
391-
- match: { values.1: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
415+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
416+
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ] }
392417

418+
---
419+
"sort normalizer 3":
420+
- requires:
421+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
422+
reason: "Behavior changed in #126623"
393423
- do:
394424
allowed_warnings_regex:
395425
- "No limit defined, adding default limit of \\[.*\\]"
@@ -411,12 +441,15 @@ setup:
411441
- match: { columns.5.type: "keyword" }
412442

413443
- length: { values: 2 }
414-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
415-
- match: { values.1: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
444+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
445+
- match: { values.1: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
416446

417447

418448
---
419449
"non indexed":
450+
- requires:
451+
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
452+
reason: "Behavior changed in #126623"
420453
- do:
421454
allowed_warnings_regex:
422455
- "No limit defined, adding default limit of \\[.*\\]"
@@ -438,8 +471,8 @@ setup:
438471
- match: { columns.5.type: "keyword" }
439472

440473
- length: { values: 2 }
441-
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
442-
- match: { values.1: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
474+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ] }
475+
- match: { values.1: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
443476

444477
- do:
445478
allowed_warnings_regex:
@@ -462,8 +495,8 @@ setup:
462495
- match: { columns.5.type: "keyword" }
463496

464497
- length: { values: 2 }
465-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
466-
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ]}
498+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }
499+
- match: { values.1: [ "this", "this", "abc", "abc", "bar", "bar" ] }
467500

468501
- do:
469502
allowed_warnings_regex:
@@ -486,4 +519,4 @@ setup:
486519
- match: { columns.5.type: "keyword" }
487520

488521
- length: { values: 1 }
489-
- match: { values.0: [ "this is a long text", null, "CamelCase", "camelcase", "foo", "foo"] }
522+
- match: { values.0: [ "this is a long text", null, "camelcase", "camelcase", "foo", "foo" ] }

0 commit comments

Comments
 (0)