Skip to content

[ESQL] test date nanos union type #116265

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

Merged
not-napoleon merged 9 commits into from
Nov 11, 2024
Merged

[ESQL] test date nanos union type #116265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c183f2c
initial date nanos union type tests
not-napoleon Oct 29, 2024
0cdf0b3
Merge branch 'main' into esql-test-date-nanos-union-type
not-napoleon Nov 5, 2024
a5a0303
fixed a bunch of tests
not-napoleon Nov 5, 2024
ca497a1
Merge branch 'main' into esql-test-date-nanos-union-type
not-napoleon Nov 7, 2024
61b1112
gate test on bugfix
not-napoleon Nov 7, 2024
24dd880
Merge branch 'main' into esql-test-date-nanos-union-type
not-napoleon Nov 7, 2024
ac0c60c
added date trunc test, updated a few other tests
not-napoleon Nov 7, 2024
6c1bb7b
response to PR feedback
not-napoleon Nov 11, 2024
0d56643
Merge branch 'main' into esql-test-date-nanos-union-type
elasticmachine Nov 11, 2024
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
3 changes: 2 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 @@ -13,6 +13,7 @@
import org.elasticsearch.common.breaker.NoopCircuitBreaker;
import org.elasticsearch.common.network.InetAddresses;
import org.elasticsearch.common.time.DateFormatters;
import org.elasticsearch.common.time.DateUtils;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.compute.data.Block;
import org.elasticsearch.compute.data.BlockFactory;
Expand Down Expand Up @@ -471,7 +472,7 @@ public enum Type {
return null;
}
Instant parsed = DateFormatters.from(ISO_DATE_WITH_NANOS.parse(x)).toInstant();
return parsed.getEpochSecond() * 1_000_000_000 + parsed.getNano();
return DateUtils.toLong(parsed);
}, (l, r) -> l instanceof Long maybeIP ? maybeIP.compareTo((Long) r) : l.toString().compareTo(r.toString()), Long.class),
BOOLEAN(Booleans::parseBoolean, Boolean.class),
GEO_POINT(x -> x == null ? null : GEO.wktToWkb(x), BytesRef.class),
Expand Down
4 changes: 4 additions & 0 deletions ...n/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ public class CsvTestsDataLoader {
private static final TestsDataset SAMPLE_DATA_TS_LONG = SAMPLE_DATA.withIndex("sample_data_ts_long")
.withData("sample_data_ts_long.csv")
.withTypeMapping(Map.of("@timestamp", "long"));
private static final TestsDataset SAMPLE_DATA_TS_NANOS = SAMPLE_DATA.withIndex("sample_data_ts_nanos")
.withData("sample_data_ts_nanos.csv")
.withTypeMapping(Map.of("@timestamp", "date_nanos"));
private static final TestsDataset MISSING_IP_SAMPLE_DATA = new TestsDataset("missing_ip_sample_data");
private static final TestsDataset CLIENT_IPS = new TestsDataset("clientips");
private static final TestsDataset CLIENT_CIDR = new TestsDataset("client_cidr");
Expand Down Expand Up @@ -101,6 +104,7 @@ public class CsvTestsDataLoader {
Map.entry(ALERTS.indexName, ALERTS),
Map.entry(SAMPLE_DATA_STR.indexName, SAMPLE_DATA_STR),
Map.entry(SAMPLE_DATA_TS_LONG.indexName, SAMPLE_DATA_TS_LONG),
Map.entry(SAMPLE_DATA_TS_NANOS.indexName, SAMPLE_DATA_TS_NANOS),
Map.entry(MISSING_IP_SAMPLE_DATA.indexName, MISSING_IP_SAMPLE_DATA),
Map.entry(CLIENT_IPS.indexName, CLIENT_IPS),
Map.entry(CLIENT_CIDR.indexName, CLIENT_CIDR),
Expand Down
8 changes: 8 additions & 0 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_nanos.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@timestamp:date_nanos,client_ip:ip,event_duration:long,message:keyword
2023-10-23T13:55:01.543123456Z,172.21.3.15,1756467,Connected to 10.1.0.1
2023-10-23T13:53:55.832123456Z,172.21.3.15,5033755,Connection error
2023-10-23T13:52:55.015123456Z,172.21.3.15,8268153,Connection error
2023-10-23T13:51:54.732123456Z,172.21.3.15,725448,Connection error
2023-10-23T13:33:34.937123456Z,172.21.0.5,1232382,Disconnected
2023-10-23T12:27:28.948123456Z,172.21.2.113,2764889,Connected to 10.1.0.2
2023-10-23T12:15:03.360123456Z,172.21.2.162,3450233,Connected to 10.1.0.3
Loading