Skip to content

GH-1293: Use floor division when splitting epoch millis into day and time #1294

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
AbhishekPathania wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-1293: Use floor division when splitting epoch millis into day and time #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions .../flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,12 @@ public static long applyCalendarOffset(long milliseconds, Calendar calendar) {
* @return a {@link Timestamp} object representing the given Epoch millis
*/
public static Timestamp getTimestampValue(long millisWithCalendar) {
long milliseconds = millisWithCalendar;
if (milliseconds < 0) {
// LocalTime#ofNanoDay only accepts positive values
milliseconds -= ((milliseconds / MILLIS_PER_DAY) - 1) * MILLIS_PER_DAY;
}

// Millis are negative before 1970, where only floor semantics keep the epoch day
// and the time-of-day remainder on the same day (and the remainder non-negative).
return Timestamp.valueOf(
LocalDateTime.of(
LocalDate.ofEpochDay(millisWithCalendar / MILLIS_PER_DAY),
LocalTime.ofNanoOfDay(TimeUnit.MILLISECONDS.toNanos(milliseconds % MILLIS_PER_DAY))));
LocalDate.ofEpochDay(Math.floorDiv(millisWithCalendar, MILLIS_PER_DAY)),
LocalTime.ofNanoOfDay(
TimeUnit.MILLISECONDS.toNanos(Math.floorMod(millisWithCalendar, MILLIS_PER_DAY)))));
}
}
11 changes: 11 additions & 0 deletions ...ght-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,15 @@ public void testShouldGetTimestampNegative() {

assertThat(expected, is(actual));
}

@Test
public void testShouldGetTimestampNegativeNotAlignedToDay() {
final long epochMilli = negativeEpochMilli + 3600000L; // 1950-06-01 01:00:00 UTC
final Instant instant = Instant.ofEpochMilli(epochMilli);

final Timestamp expected = Timestamp.from(instant);
final Timestamp actual = DateTimeUtils.getTimestampValue(epochMilli);

assertThat(expected, is(actual));
}
}
Loading