From ddb26f2696be8db05c240cac34d6b1b98cb26fdf Mon Sep 17 00:00:00 2001 From: Himanshu Date: Thu, 23 Aug 2018 14:09:31 -0700 Subject: [PATCH] do not ignore ms in ruby time (#6217) --- .../io/druid/java/util/common/parsers/TimestampParser.java | 6 +++--- .../druid/java/util/common/parsers/TimestampParserTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java b/java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java index 7019a550db0..14de994aeda 100644 --- a/java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java +++ b/java-util/src/main/java/io/druid/java/util/common/parsers/TimestampParser.java @@ -79,7 +79,6 @@ public class TimestampParser return numericFun.apply(Long.parseLong(ParserUtils.stripQuotes(input))); }; } else if ("ruby".equalsIgnoreCase(format)) { - // Numeric parser ignores millis for ruby. final Function numericFun = createNumericTimestampParser(format); return input -> { Preconditions.checkArgument(!Strings.isNullOrEmpty(input), "null timestamp"); @@ -103,11 +102,12 @@ public class TimestampParser final String format ) { - // Ignore millis for ruby - if ("posix".equalsIgnoreCase(format) || "ruby".equalsIgnoreCase(format)) { + if ("posix".equalsIgnoreCase(format)) { return input -> DateTimes.utc(TimeUnit.SECONDS.toMillis(input.longValue())); } else if ("nano".equalsIgnoreCase(format)) { return input -> DateTimes.utc(TimeUnit.NANOSECONDS.toMillis(input.longValue())); + } else if ("ruby".equalsIgnoreCase(format)) { + return input -> DateTimes.utc(Double.valueOf(input.doubleValue() * 1000).longValue()); } else { return input -> DateTimes.utc(input.longValue()); } diff --git a/java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java b/java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java index c8738f40141..ef6960d6729 100644 --- a/java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java +++ b/java-util/src/test/java/io/druid/java/util/common/parsers/TimestampParserTest.java @@ -97,8 +97,8 @@ public class TimestampParserTest public void testRuby() { final Function parser = TimestampParser.createObjectTimestampParser("ruby"); - Assert.assertEquals(DateTimes.of("2013-01-16T15:41:47+01:00"), parser.apply("1358347307.435447")); - Assert.assertEquals(DateTimes.of("2013-01-16T15:41:47+01:00"), parser.apply(1358347307.435447D)); + Assert.assertEquals(DateTimes.of("2013-01-16T14:41:47.435Z"), parser.apply("1358347307.435447")); + Assert.assertEquals(DateTimes.of("2013-01-16T14:41:47.435Z"), parser.apply(1358347307.435447D)); } @Test