Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESQL: Add UNSUPPORTED type in unit tests #119639

Merged
merged 1 commit into from
Jan 7, 2025
+49 −37
Merged

ESQL: Add UNSUPPORTED type in unit tests #119639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
ESQL: Add UNSUPPORTED type in unit tests 
Small addition to tests, aligning their types better with production
code.
  • Loading branch information
@GalLalouche
GalLalouche committed Jan 7, 2025
commit 005d90a1f979f3fe5f8949175e228dfce2425623
14 changes: 13 additions & 1 deletion .../plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.elasticsearch.core.Booleans;
import org.elasticsearch.core.Releasable;
import org.elasticsearch.core.Releasables;
import org.elasticsearch.core.Strings;
import org.elasticsearch.core.Tuple;
import org.elasticsearch.logging.Logger;
import org.elasticsearch.test.VersionUtils;
Expand Down Expand Up @@ -478,7 +479,15 @@ public enum Type {
GEO_POINT(x -> x == null ? null : GEO.wktToWkb(x), BytesRef.class),
CARTESIAN_POINT(x -> x == null ? null : CARTESIAN.wktToWkb(x), BytesRef.class),
GEO_SHAPE(x -> x == null ? null : GEO.wktToWkb(x), BytesRef.class),
CARTESIAN_SHAPE(x -> x == null ? null : CARTESIAN.wktToWkb(x), BytesRef.class);
CARTESIAN_SHAPE(x -> x == null ? null : CARTESIAN.wktToWkb(x), BytesRef.class),
UNSUPPORTED(Type::convertUnsupported, Void.class);

private static Void convertUnsupported(String s) {
if (s != null) {
throw new IllegalArgumentException(Strings.format("Unsupported type should always be null, was '%s'", s));
}
return null;
}

private static final Map<String, Type> LOOKUP = new HashMap<>();

Expand Down Expand Up @@ -536,6 +545,9 @@ public static Type asType(String name) {
}

public static Type asType(ElementType elementType, Type actualType) {
if (actualType == Type.UNSUPPORTED) {
return UNSUPPORTED;
}
return switch (elementType) {
case INT -> INTEGER;
case LONG -> LONG;
Expand Down
72 changes: 36 additions & 36 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ FROM sample_data, sample_data_str
| LIMIT 1
;

@timestamp:date | client_ip:null | event_duration:long | message:keyword
2023-10-23T13:33:34.937Z | null | 1232382 | Disconnected
@timestamp:date | client_ip:unsupported | event_duration:long | message:keyword
2023-10-23T13:33:34.937Z | null | 1232382 | Disconnected
;

multiIndexSortIpStringEval
Expand All @@ -278,8 +278,8 @@ FROM sample_data, sample_data_str
| LIMIT 1
;

@timestamp:date | client_ip:null | event_duration:long | message:keyword | client_ip_as_ip:ip
2023-10-23T13:33:34.937Z | null | 1232382 | Disconnected | 172.21.0.5
@timestamp:date | client_ip:unsupported | event_duration:long | message:keyword | client_ip_as_ip:ip
2023-10-23T13:33:34.937Z | null | 1232382 | Disconnected | 172.21.0.5
;

multiIndexIpStringStats
Expand Down Expand Up @@ -1270,11 +1270,11 @@ FROM sample_data* METADATA _index
| SORT _index ASC, ts DESC
;

@timestamp:null | client_ip:null | event_duration:long | message:keyword | _index:keyword | ts:date | ts_str:keyword | ts_l:long | ip:ip | ip_str:k
null | null | 8268153 | Connection error | sample_data | 2023-10-23T13:52:55.015Z | 2023-10-23T13:52:55.015Z | 1698069175015 | 172.21.3.15 | 172.21.3.15
null | null | 8268153 | Connection error | sample_data_str | 2023-10-23T13:52:55.015Z | 2023-10-23T13:52:55.015Z | 1698069175015 | 172.21.3.15 | 172.21.3.15
null | null | 8268153 | Connection error | sample_data_ts_long | 2023-10-23T13:52:55.015Z | 1698069175015 | 1698069175015 | 172.21.3.15 | 172.21.3.15
null | null | 8268153 | Connection error | sample_data_ts_nanos | 2023-10-23T13:52:55.015Z | 2023-10-23T13:52:55.015123456Z | 1698069175015123456 | 172.21.3.15 | 172.21.3.15
@timestamp:unsupported | client_ip:unsupported | event_duration:long | message:keyword | _index:keyword | ts:date | ts_str:keyword | ts_l:long | ip:ip | ip_str:k
null | null | 8268153 | Connection error | sample_data | 2023-10-23T13:52:55.015Z | 2023-10-23T13:52:55.015Z | 1698069175015 | 172.21.3.15 | 172.21.3.15
null | null | 8268153 | Connection error | sample_data_str | 2023-10-23T13:52:55.015Z | 2023-10-23T13:52:55.015Z | 1698069175015 | 172.21.3.15 | 172.21.3.15
null | null | 8268153 | Connection error | sample_data_ts_long | 2023-10-23T13:52:55.015Z | 1698069175015 | 1698069175015 | 172.21.3.15 | 172.21.3.15
null | null | 8268153 | Connection error | sample_data_ts_nanos | 2023-10-23T13:52:55.015Z | 2023-10-23T13:52:55.015123456Z | 1698069175015123456 | 172.21.3.15 | 172.21.3.15
;

multiIndexMultiColumnTypesRenameAndKeep
Expand Down Expand Up @@ -1380,8 +1380,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
;

multiIndexIndirectUseOfUnionTypesInEval
Expand All @@ -1392,8 +1392,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword | foo:boolean
null | 172.21.0.5 | 1232382 | Disconnected | true
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword | foo:boolean
null | 172.21.0.5 | 1232382 | Disconnected | true
;

multiIndexIndirectUseOfUnionTypesInRename
Expand All @@ -1404,8 +1404,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | event_message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | event_message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
;

multiIndexIndirectUseOfUnionTypesInKeep
Expand All @@ -1427,8 +1427,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
;

multiIndexIndirectUseOfUnionTypesInWildcardKeep2
Expand All @@ -1439,8 +1439,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
;


Expand All @@ -1451,7 +1451,7 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null
@timestamp:unsupported
null
;

Expand Down Expand Up @@ -1484,9 +1484,9 @@ FROM sample_data, sample_data_ts_long
| WHERE message == "Disconnected"
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
null | 172.21.0.5 | 1232382 | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword
null | 172.21.0.5 | 1232382 | Disconnected
null | 172.21.0.5 | 1232382 | Disconnected
;

multiIndexIndirectUseOfUnionTypesInDissect
Expand All @@ -1496,8 +1496,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword | foo:keyword
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword | foo:keyword
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
;

multiIndexIndirectUseOfUnionTypesInGrok
Expand All @@ -1507,8 +1507,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword | foo:keyword
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword | foo:keyword
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
;

multiIndexIndirectUseOfUnionTypesInEnrich
Expand All @@ -1520,8 +1520,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | event_duration:long | message:keyword | client_ip:keyword | env:keyword
null | 1232382 | Disconnected | 172.21.0.5 | Development
@timestamp:unsupported | event_duration:long | message:keyword | client_ip:keyword | env:keyword
null | 1232382 | Disconnected | 172.21.0.5 | Development
;

multiIndexIndirectUseOfUnionTypesInStats
Expand All @@ -1545,8 +1545,8 @@ FROM sample_data, sample_data_ts_long
| LIMIT 1
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword | foo:long
null | 172.21.0.5 | 1232382 | Disconnected | 8268153
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword | foo:long
null | 172.21.0.5 | 1232382 | Disconnected | 8268153
;

multiIndexIndirectUseOfUnionTypesInLookup-Ignore
Expand All @@ -1558,8 +1558,8 @@ FROM sample_data, sample_data_ts_long
| LOOKUP_🐔 int_number_names ON int
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword | int:integer | name:keyword
null | 172.21.0.5 | 1232382 | Disconnected | 2 | two
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword | int:integer | name:keyword
null | 172.21.0.5 | 1232382 | Disconnected | 2 | two
;

multiIndexIndirectUseOfUnionTypesInMvExpand
Expand All @@ -1570,9 +1570,9 @@ FROM sample_data, sample_data_ts_long
| MV_EXPAND foo
;

@timestamp:null | client_ip:ip | event_duration:long | message:keyword | foo:keyword
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
@timestamp:unsupported | client_ip:ip | event_duration:long | message:keyword | foo:keyword
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
null | 172.21.0.5 | 1232382 | Disconnected | Disconnected
;

shortIntegerWidening
Expand Down