Skip to content

Select query failing if miliseconds used as time for indexing #6937

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
jon-wei merged 6 commits into from
Feb 25, 2019
Merged

Select query failing if miliseconds used as time for indexing #6937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcb2f23
[#1332] Fix - select failing if milis used for idx.
mirkojotic Jan 29, 2019
fe9f9af
Formating correction.
mirkojotic Jan 29, 2019
ff2d877
Address comment: throw original exception.
mirkojotic Jan 30, 2019
4ba8575
Using constant values in tests
mirkojotic Feb 20, 2019
013f3c8
DateTime#of has to support "2011-01-01T00:00:00"
mirkojotic Feb 20, 2019
656957d
Handle only milisec timestamps and ISO8601 strings
mirkojotic Feb 21, 2019
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
12 changes: 11 additions & 1 deletion core/src/main/java/org/apache/druid/java/util/common/DateTimes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,17 @@ public static DateTime utc(long instant)

public static DateTime of(String instant)
{
return new DateTime(instant, ISOChronology.getInstanceUTC());
try {
return new DateTime(instant, ISOChronology.getInstanceUTC());
}
catch (IllegalArgumentException ex) {
try {
return new DateTime(Long.valueOf(instant), ISOChronology.getInstanceUTC());
}
catch (IllegalArgumentException ex2) {
throw ex;
}
}
}

public static DateTime of(
Expand Down
19 changes: 19 additions & 0 deletions core/src/test/java/org/apache/druid/java/util/common/DateTimesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,23 @@ public void testCommonDateTimePattern()
Assert.assertTrue(DateTimes.COMMON_DATE_TIME_PATTERN.matcher(dt.toString()).matches());
}
}

@Test
public void testStringToDateTimeConversion()
{
String seconds = "2018-01-30T06:00:00";
DateTime dt2 = DateTimes.of(seconds);
Assert.assertEquals("2018-01-30T06:00:00.000Z", dt2.toString());

String milis = "1517292000000";
DateTime dt1 = DateTimes.of(milis);
Assert.assertEquals("2018-01-30T06:00:00.000Z", dt1.toString());
}

@Test(expected = IllegalArgumentException.class)
public void testStringToDateTimeConverstion_RethrowInitialException()
{
String invalid = "51729200AZ";
DateTimes.of(invalid);
}
}