Skip to content

Commit 43e4404

Browse files
authored
ESQL: Readd union types capability to indirect tests (#119776)
This PR re-adds the union types capabilities to the CSV-spec tests using indirect union types, which were removed in #119273.
1 parent 9d8504f commit 43e4404

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,3 @@ tests:
443443
- class: org.elasticsearch.upgrades.SearchStatesIT
444444
method: testCanMatch
445445
issue: https://github.com/elastic/elasticsearch/issues/118718
446-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
447-
method: test {union_types.MultiIndexIndirectUseOfUnionTypesInMvExpand SYNC}
448-
issue: https://github.com/elastic/elasticsearch/issues/119584
449-
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
450-
issue: https://github.com/elastic/elasticsearch/issues/119622

x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,7 @@ client_ip:ip | event_duration:long | message:keyword | @timestamp:keywo
13751375
# Once INLINESTATS supports expressions in agg functions and groups, convert the group in the inlinestats
13761376

13771377
multiIndexIndirectUseOfUnionTypesInSort
1378+
required_capability: union_types
13781379
FROM sample_data, sample_data_ts_long
13791380
| SORT client_ip ASC
13801381
| LIMIT 1
@@ -1397,6 +1398,7 @@ FROM sample_data, sample_data_ts_long
13971398
;
13981399

13991400
multiIndexIndirectUseOfUnionTypesInRename
1401+
required_capability: union_types
14001402
required_capability: union_types_fix_rename_resolution
14011403
FROM sample_data, sample_data_ts_long
14021404
| RENAME message AS event_message
@@ -1409,6 +1411,7 @@ FROM sample_data, sample_data_ts_long
14091411
;
14101412

14111413
multiIndexIndirectUseOfUnionTypesInKeep
1414+
required_capability: union_types
14121415
FROM sample_data, sample_data_ts_long
14131416
| KEEP client_ip, event_duration, message
14141417
| SORT client_ip ASC
@@ -1420,6 +1423,7 @@ client_ip:ip | event_duration:long | message:keyword
14201423
;
14211424

14221425
multiIndexIndirectUseOfUnionTypesInWildcardKeep
1426+
required_capability: union_types
14231427
required_capability: union_types_fix_rename_resolution
14241428
FROM sample_data, sample_data_ts_long
14251429
| KEEP *
@@ -1432,6 +1436,7 @@ FROM sample_data, sample_data_ts_long
14321436
;
14331437

14341438
multiIndexIndirectUseOfUnionTypesInWildcardKeep2
1439+
required_capability: union_types
14351440
required_capability: union_types_fix_rename_resolution
14361441
FROM sample_data, sample_data_ts_long
14371442
| KEEP *e*
@@ -1468,6 +1473,7 @@ client_ip:ip | event_duration:long | message:keyword
14681473
;
14691474

14701475
multiIndexIndirectUseOfUnionTypesInWildcardDrop
1476+
required_capability: union_types
14711477
required_capability: union_types_fix_rename_resolution
14721478
FROM sample_data, sample_data_ts_long
14731479
| DROP *time*
@@ -1480,6 +1486,7 @@ client_ip:ip | event_duration:long | message:keyword
14801486
;
14811487

14821488
multiIndexIndirectUseOfUnionTypesInWhere
1489+
required_capability: union_types
14831490
FROM sample_data, sample_data_ts_long
14841491
| WHERE message == "Disconnected"
14851492
;
@@ -1490,6 +1497,7 @@ FROM sample_data, sample_data_ts_long
14901497
;
14911498

14921499
multiIndexIndirectUseOfUnionTypesInDissect
1500+
required_capability: union_types
14931501
FROM sample_data, sample_data_ts_long
14941502
| DISSECT message "%{foo}"
14951503
| SORT client_ip ASC
@@ -1501,6 +1509,7 @@ FROM sample_data, sample_data_ts_long
15011509
;
15021510

15031511
multiIndexIndirectUseOfUnionTypesInGrok
1512+
required_capability: union_types
15041513
FROM sample_data, sample_data_ts_long
15051514
| GROK message "%{WORD:foo}"
15061515
| SORT client_ip ASC
@@ -1512,6 +1521,7 @@ FROM sample_data, sample_data_ts_long
15121521
;
15131522

15141523
multiIndexIndirectUseOfUnionTypesInEnrich
1524+
required_capability: union_types
15151525
required_capability: enrich_load
15161526
FROM sample_data, sample_data_ts_long
15171527
| EVAL client_ip = client_ip::keyword
@@ -1525,6 +1535,7 @@ FROM sample_data, sample_data_ts_long
15251535
;
15261536

15271537
multiIndexIndirectUseOfUnionTypesInStats
1538+
required_capability: union_types
15281539
FROM sample_data, sample_data_ts_long
15291540
| STATS foo = max(event_duration) BY client_ip
15301541
| SORT client_ip ASC
@@ -1538,6 +1549,7 @@ foo:long | client_ip:ip
15381549
;
15391550

15401551
multiIndexIndirectUseOfUnionTypesInInlineStats-Ignore
1552+
required_capability: union_types
15411553
required_capability: inlinestats
15421554
FROM sample_data, sample_data_ts_long
15431555
| INLINESTATS foo = max(event_duration)
@@ -1550,6 +1562,7 @@ FROM sample_data, sample_data_ts_long
15501562
;
15511563

15521564
multiIndexIndirectUseOfUnionTypesInLookup-Ignore
1565+
required_capability: union_types
15531566
required_capability: lookup_v4
15541567
FROM sample_data, sample_data_ts_long
15551568
| SORT client_ip ASC
@@ -1563,6 +1576,7 @@ FROM sample_data, sample_data_ts_long
15631576
;
15641577

15651578
multiIndexIndirectUseOfUnionTypesInMvExpand
1579+
required_capability: union_types
15661580
FROM sample_data, sample_data_ts_long
15671581
| EVAL foo = MV_APPEND(message, message)
15681582
| SORT client_ip ASC

0 commit comments

Comments
 (0)