-
Notifications
You must be signed in to change notification settings - Fork 25k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SQL: protocol returns ISO 8601 String formatted dates instead of Long…
… for JDBC/ODBC requests (#36800) * Change the way the protocol returns date fields from Long values in case of JDBC/ODBC, to ISO 8601 with millis String. (cherry picked from commit d31eaf7)
- Loading branch information
Showing
7 changed files
with
118 additions
and
39 deletions.
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcDateUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.sql.jdbc; | ||
|
|
||
| import java.sql.Date; | ||
| import java.sql.Time; | ||
| import java.sql.Timestamp; | ||
| import java.time.ZonedDateTime; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.time.format.DateTimeFormatterBuilder; | ||
| import java.util.Locale; | ||
| import java.util.function.Function; | ||
|
|
||
| import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE; | ||
| import static java.time.temporal.ChronoField.HOUR_OF_DAY; | ||
| import static java.time.temporal.ChronoField.MILLI_OF_SECOND; | ||
| import static java.time.temporal.ChronoField.MINUTE_OF_HOUR; | ||
| import static java.time.temporal.ChronoField.SECOND_OF_MINUTE; | ||
|
|
||
| /** | ||
| * JDBC specific datetime specific utility methods. Because of lack of visibility, this class borrows code | ||
| * from {@code org.elasticsearch.xpack.sql.util.DateUtils} and {@code org.elasticsearch.xpack.sql.proto.StringUtils}. | ||
| */ | ||
| final class JdbcDateUtils { | ||
|
|
||
| private static final long DAY_IN_MILLIS = 60 * 60 * 24 * 1000; | ||
|
|
||
| static final DateTimeFormatter ISO_WITH_MILLIS = new DateTimeFormatterBuilder() | ||
| .parseCaseInsensitive() | ||
| .append(ISO_LOCAL_DATE) | ||
| .appendLiteral('T') | ||
| .appendValue(HOUR_OF_DAY, 2) | ||
| .appendLiteral(':') | ||
| .appendValue(MINUTE_OF_HOUR, 2) | ||
| .appendLiteral(':') | ||
| .appendValue(SECOND_OF_MINUTE, 2) | ||
| .appendFraction(MILLI_OF_SECOND, 3, 3, true) | ||
| .appendOffsetId() | ||
| .toFormatter(Locale.ROOT); | ||
|
|
||
| static long asMillisSinceEpoch(String date) { | ||
| ZonedDateTime zdt = ISO_WITH_MILLIS.parse(date, ZonedDateTime::from); | ||
| return zdt.toInstant().toEpochMilli(); | ||
| } | ||
|
|
||
| static Date asDate(String date) { | ||
| return new Date(utcMillisRemoveTime(asMillisSinceEpoch(date))); | ||
| } | ||
|
|
||
| static Time asTime(String date) { | ||
| return new Time(utcMillisRemoveDate(asMillisSinceEpoch(date))); | ||
| } | ||
|
|
||
| static Timestamp asTimestamp(String date) { | ||
| return new Timestamp(asMillisSinceEpoch(date)); | ||
| } | ||
|
|
||
| /* | ||
| * Handles the value received as parameter, as either String (a ZonedDateTime formatted in ISO 8601 standard with millis) - | ||
| * date fields being returned formatted like this. Or a Long value, in case of Histograms. | ||
| */ | ||
| static <R> R asDateTimeField(Object value, Function<String, R> asDateTimeMethod, Function<Long, R> ctor) { | ||
| if (value instanceof String) { | ||
| return asDateTimeMethod.apply((String) value); | ||
| } else { | ||
| return ctor.apply(((Number) value).longValue()); | ||
| } | ||
| } | ||
|
|
||
| private static long utcMillisRemoveTime(long l) { | ||
| return l - (l % DAY_IN_MILLIS); | ||
| } | ||
|
|
||
| private static long utcMillisRemoveDate(long l) { | ||
| return l % DAY_IN_MILLIS; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters