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 Date Nanos Addition and Subtraction #116839

Merged
merged 20 commits into from
Dec 2, 2024
Merged

ESQL Date Nanos Addition and Subtraction #116839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cf6705c
type plumbing
not-napoleon Nov 11, 2024
15c5d3a
test case bounds checking, etc
not-napoleon Nov 11, 2024
07cdbf6
actually build the date nanos evaluator
not-napoleon Nov 11, 2024
352cda8
ZonedDateTime vs Instant
not-napoleon Nov 11, 2024
bd71603
fix test verification function
not-napoleon Nov 11, 2024
cb0baca
fix test failure
not-napoleon Nov 12, 2024
f3e031e
fix common types tests
not-napoleon Nov 12, 2024
e9ec7a8
Wire up subtraction
not-napoleon Nov 13, 2024
aa1ef87
pull in datetime tests, and fix error message
not-napoleon Nov 13, 2024
2dddb42
add capability check
not-napoleon Nov 13, 2024
a69c9a5
csv tests for subtract against indexed data
not-napoleon Nov 14, 2024
f6fc138
spotless apply
not-napoleon Nov 14, 2024
9c3a9df
Merge branch 'main' into esql-date-nanos-add-and-subtract
not-napoleon Nov 14, 2024
dff58a0
Merge branch 'main' into esql-date-nanos-add-and-subtract
elasticmachine Nov 18, 2024
bb16502
sort results of CSV tests
not-napoleon Nov 18, 2024
1ba6378
sort results of CSV tests
not-napoleon Nov 18, 2024
35fdb06
Merge branch 'main' into esql-date-nanos-add-and-subtract
not-napoleon Nov 22, 2024
95806b7
remove reference to feature flag
not-napoleon Nov 22, 2024
f5b41aa
Merge branch 'main' into esql-date-nanos-add-and-subtract
not-napoleon Nov 26, 2024
0fbead2
Merge branch 'main' into esql-date-nanos-add-and-subtract
not-napoleon Dec 2, 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
72 changes: 72 additions & 0 deletions docs/reference/esql/functions/kibana/definition/add.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions docs/reference/esql/functions/kibana/definition/sub.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions docs/reference/esql/functions/types/add.asciidoc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions docs/reference/esql/functions/types/sub.asciidoc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,14 @@ public static boolean isDateTimeOrTemporal(DataType t) {
return isDateTime(t) || isTemporalAmount(t);
}

public static boolean isDateTimeOrNanosOrTemporal(DataType t) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered adding DATE_NANOS to isDateTime, but that creates a few problems. First off, we use isDateTime in a lot of places, and touching all of them would have made this already quite large PR even larger. Second, there are clearly some places, such as EsqlDataTypeConverter which clearly need to check for exactly DATETIME type, and would have incorrect behavior if we expanded isDateTime to include DATE_NANOS. Given that, it seemed like adding a new function was the safest way to proceed.

return isDateTime(t) || isTemporalAmount(t) || t == DATE_NANOS;
}

public static boolean isMillisOrNanos(DataType t) {
return t == DATETIME || t == DATE_NANOS;
}

public static boolean areCompatible(DataType left, DataType right) {
if (left == right) {
return true;
Expand Down
Loading