Skip to content

Catch DateTimeException in EsqlDataTypeConverter #137744

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −5
Open

Catch DateTimeException in EsqlDataTypeConverter #137744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ada98be
Catch DateTimeException in EsqlDataTypeConverter
thecoop Nov 7, 2025
ade207b
Update docs/changelog/137744.yaml
thecoop Nov 7, 2025
8aebe34
Merge branch 'main' into esql-date-time-exceptions
thecoop Nov 7, 2025
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
6 changes: 6 additions & 0 deletions docs/changelog/137744.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 137744
summary: Catch `DateTimeException` in `EsqlDataTypeConverter`
area: ES|QL
type: bug
issues:
- 137741
27 changes: 22 additions & 5 deletions ...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@

import java.io.IOException;
import java.math.BigInteger;
import java.time.DateTimeException;
import java.time.Duration;
import java.time.Instant;
import java.time.Period;
Expand Down Expand Up @@ -616,20 +617,36 @@ public static BytesRef stringToSpatial(String field) {
}

public static long dateTimeToLong(String dateTime) {
return DEFAULT_DATE_TIME_FORMATTER.parseMillis(dateTime);
try {
return DEFAULT_DATE_TIME_FORMATTER.parseMillis(dateTime);
} catch (DateTimeException e) {
throw new IllegalArgumentException(e);
}
}

public static long dateTimeToLong(String dateTime, DateFormatter formatter) {
return formatter == null ? dateTimeToLong(dateTime) : formatter.parseMillis(dateTime);
try {
return formatter == null ? dateTimeToLong(dateTime) : formatter.parseMillis(dateTime);
} catch (DateTimeException e) {
throw new IllegalArgumentException(e);
}
}

public static long dateNanosToLong(String dateNano) {
return dateNanosToLong(dateNano, DEFAULT_DATE_NANOS_FORMATTER);
try {
return dateNanosToLong(dateNano, DEFAULT_DATE_NANOS_FORMATTER);
} catch (DateTimeException e) {
throw new IllegalArgumentException(e);
}
}

public static long dateNanosToLong(String dateNano, DateFormatter formatter) {
Instant parsed = DateFormatters.from(formatter.parse(dateNano)).toInstant();
return DateUtils.toLong(parsed);
try {
Instant parsed = DateFormatters.from(formatter.parse(dateNano)).toInstant();
return DateUtils.toLong(parsed);
} catch (DateTimeException e) {
throw new IllegalArgumentException(e);
}
}

public static String dateWithTypeToString(long dateTime, DataType type) {
Expand Down