Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
h = v % 24;
v /= 24;
d = v;
buf.append((int) d);
buf.append(d);
buf.append(' ');
number(buf, (int) h, 2);
buf.append(':');
Expand All @@ -538,7 +538,7 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
h = v % 24;
v /= 24;
d = v;
buf.append((int) d);
buf.append(d);
buf.append(' ');
number(buf, (int) h, 2);
buf.append(':');
Expand All @@ -552,22 +552,22 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
h = v % 24;
v /= 24;
d = v;
buf.append((int) d);
buf.append(d);
buf.append(' ');
number(buf, (int) h, 2);
break;
case DAY:
v = roundUp(v, 1000 * 60 * 60 * 24);
d = v / (1000 * 60 * 60 * 24);
buf.append((int) d);
buf.append(d);
break;
case HOUR:
v = roundUp(v, 1000 * 60 * 60);
v /= 1000;
v /= 60;
v /= 60;
h = v;
buf.append((int) h);
buf.append(h);
break;
case HOUR_TO_MINUTE:
v = roundUp(v, 1000 * 60);
Expand All @@ -576,7 +576,7 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
m = v % 60;
v /= 60;
h = v;
buf.append((int) h);
buf.append(h);
buf.append(':');
number(buf, (int) m, 2);
break;
Expand All @@ -589,7 +589,7 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
m = v % 60;
v /= 60;
h = v;
buf.append((int) h);
buf.append(h);
buf.append(':');
number(buf, (int) m, 2);
buf.append(':');
Expand All @@ -603,7 +603,7 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
s = v % 60;
v /= 60;
m = v;
buf.append((int) m);
buf.append(m);
buf.append(':');
number(buf, (int) s, 2);
fraction(buf, scale, ms);
Expand All @@ -613,14 +613,14 @@ public static String intervalDayTimeToString(long v, TimeUnitRange range,
v /= 1000;
v /= 60;
m = v;
buf.append((int) m);
buf.append(m);
break;
case SECOND:
v = roundUp(v, powerX(10, 3 - scale));
ms = v % 1000;
v /= 1000;
s = v;
buf.append((int) s);
buf.append(s);
fraction(buf, scale, ms);
break;
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,18 @@ private void checkTimestampString(String s, int p, long d) {
intervalDayTimeToString(0, TimeUnitRange.MINUTE_TO_SECOND, 0));
assertEquals("+0",
intervalDayTimeToString(0, TimeUnitRange.SECOND, 0));
// Test cases for https://issues.apache.org/jira/browse/CALCITE-7449
// DateTimeUtils.intervalDayTimeToString silently truncates large intervals
assertEquals("+2147483648",
intervalDayTimeToString(2147483648L * 86400000L, TimeUnitRange.DAY, 0));
assertEquals("+51539607552",
intervalDayTimeToString(2147483648L * 86400000L, TimeUnitRange.HOUR, 0));
assertEquals("+51539607552:00",
intervalDayTimeToString(2147483648L * 86400000L, TimeUnitRange.HOUR_TO_MINUTE, 0));
assertEquals("+3092376453120",
intervalDayTimeToString(2147483648L * 86400000L, TimeUnitRange.MINUTE, 0));
assertEquals("+185542587187200",
intervalDayTimeToString(2147483648L * 86400000L, TimeUnitRange.SECOND, 0));
}

@Test public void testYmdToJulian() {
Expand Down
Loading