Skip to content

Fixing DST bug in data_nanos support #1943

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
merged 3 commits into from
Apr 7, 2022
Merged

Fixing DST bug in data_nanos support #1943

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
245164b
fixing DST bug in data_nanos support
masseyke Apr 6, 2022
3e3ec9e
Merge branch 'master' into fix/nano-timezone-bug
masseyke Apr 7, 2022
7047d8c
forcing build
masseyke Apr 7, 2022
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
8 changes: 5 additions & 3 deletions mr/src/main/java/org/elasticsearch/hadoop/serialization/builder/JdkValueWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@

import javax.xml.bind.DatatypeConverter;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
Expand Down Expand Up @@ -131,8 +132,9 @@ else if (value instanceof Iterable) {
}
else if (value instanceof Timestamp) {
Timestamp timestamp = (Timestamp) value;
LocalDateTime localDateTime = timestamp.toLocalDateTime();
OffsetDateTime offsetDateTime = OffsetDateTime.of(localDateTime, OffsetDateTime.now().getOffset());
long epochSeconds = timestamp.getTime() / 1000; // Getting rid of millisconds because they're captured in timestamp.getNanos()
Instant instant = Instant.ofEpochSecond(epochSeconds, timestamp.getNanos());
OffsetDateTime offsetDateTime = OffsetDateTime.ofInstant(instant, ZoneId.systemDefault());
generator.writeString(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(offsetDateTime));
}
else if (value instanceof Date) {
Expand Down