Skip to content

Commit 43b1075

Browse files
not-napoleonnot-napoleon
committed
Revert "fix exact subfield tests"
This reverts commit 270f066.
1 parent 63bf7d1 commit 43b1075

File tree

1 file changed

+34
-67
lines changed

1 file changed

+34
-67
lines changed

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

Lines changed: 34 additions & 67 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,15 +45,12 @@ 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"
5754
- do:
5855
allowed_warnings_regex:
5956
- "No limit defined, adding default limit of \\[.*\\]"
@@ -75,14 +72,11 @@ setup:
7572
- match: { columns.5.type: "keyword" }
7673

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

8178
---
8279
"filter ignore above":
83-
- requires:
84-
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
85-
reason: "Behavior changed in #126623"
8680
- do:
8781
allowed_warnings_regex:
8882
- "No limit defined, adding default limit of \\[.*\\]"
@@ -104,7 +98,7 @@ setup:
10498
- match: { columns.5.type: "keyword" }
10599

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

109103
- do:
110104
allowed_warnings_regex:
@@ -127,7 +121,7 @@ setup:
127121
- match: { columns.5.type: "keyword" }
128122

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

132126

133127
- do:
@@ -197,13 +191,10 @@ setup:
197191
- match: { columns.5.type: "keyword" }
198192

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

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

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

230-
---
231-
"filter with normalizer 2":
232-
- requires:
233-
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
234-
reason: "Behavior changed in #126623"
235222
- do:
236223
allowed_warnings_regex:
237224
- "No limit defined, adding default limit of \\[.*\\]"
238225
esql.query:
239226
body:
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'
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'
241228

242229
- match: { columns.0.name: "text_ignore_above" }
243230
- match: { columns.0.type: "text" }
@@ -252,15 +239,11 @@ setup:
252239
- match: { columns.5.name: "non_indexed.raw" }
253240
- match: { columns.5.type: "keyword" }
254241

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" ] }
242+
- length: { values: 1 }
243+
- match: { values.0: [ "this", "this", "abc", "abc", "bar", "bar" ]}
258244

259245
---
260246
"sort ignore above":
261-
- requires:
262-
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
263-
reason: "Behavior changed in #126623"
264247
- do:
265248
allowed_warnings_regex:
266249
- "No limit defined, adding default limit of \\[.*\\]"
@@ -282,8 +265,8 @@ setup:
282265
- match: { columns.5.type: "keyword" }
283266

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

288271
- do:
289272
allowed_warnings_regex:
@@ -306,8 +289,8 @@ setup:
306289
- match: { columns.5.type: "keyword" }
307290

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

312295
- do:
313296
allowed_warnings_regex:
@@ -330,8 +313,8 @@ setup:
330313
- match: { columns.5.type: "keyword" }
331314

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

336319
- do:
337320
allowed_warnings_regex:
@@ -354,14 +337,11 @@ setup:
354337
- match: { columns.5.type: "keyword" }
355338

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

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

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

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

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

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

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

447417

448418
---
449419
"non indexed":
450-
- requires:
451-
cluster_features: "mapper.keyword.keyword_normalizer_synthetic_source"
452-
reason: "Behavior changed in #126623"
453420
- do:
454421
allowed_warnings_regex:
455422
- "No limit defined, adding default limit of \\[.*\\]"
@@ -471,8 +438,8 @@ setup:
471438
- match: { columns.5.type: "keyword" }
472439

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

477444
- do:
478445
allowed_warnings_regex:
@@ -495,8 +462,8 @@ setup:
495462
- match: { columns.5.type: "keyword" }
496463

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

501468
- do:
502469
allowed_warnings_regex:
@@ -519,4 +486,4 @@ setup:
519486
- match: { columns.5.type: "keyword" }
520487

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

0 commit comments

Comments
 (0)