Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make DateTime timezone aware (#4343) 

* Make DateTime timezone aware

* Change unit tests to make DateTime timezone aware for PeriodGranularity
This commit is contained in:
praveev 2017-06-02 12:45:52 -07:00 committed by Jonathan Wei
parent da32e1ae53
commit 290ed3ab9d
2 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java-util/src/main/java/io/druid/java/util/common/granularity/PeriodGranularity.java
View File

@ -109,19 +109,19 @@ public class PeriodGranularity extends Granularity implements JsonSerializable
@Override @Override
public DateTime increment(DateTime time) public DateTime increment(DateTime time)
{ {
return new DateTime(increment(time.getMillis())); return new DateTime(increment(time.getMillis()), getTimeZone());
} }
@Override @Override
public DateTime decrement(DateTime time) public DateTime decrement(DateTime time)
{ {
return new DateTime(decrement(time.getMillis())); return new DateTime(decrement(time.getMillis()), getTimeZone());
} }
@Override @Override
public DateTime bucketStart(DateTime time) public DateTime bucketStart(DateTime time)
{ {
return new DateTime(truncate(time.getMillis())); return new DateTime(truncate(time.getMillis()), getTimeZone());
} }
// Used only for Segments. Not for Queries // Used only for Segments. Not for Queries

97
processing/src/test/java/io/druid/granularity/QueryGranularityTest.java
View File

@ -322,9 +322,9 @@ public class QueryGranularityTest
final DateTime baseTime = new DateTime("2012-11-04T00:00:00", tz); final DateTime baseTime = new DateTime("2012-11-04T00:00:00", tz);
assertSameInterval( assertSameInterval(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-11-04T00:00:00.000-07:00"), new DateTime("2012-11-04T00:00:00.000-07:00", tz),
new DateTime("2012-11-05T00:00:00.000-08:00"), new DateTime("2012-11-05T00:00:00.000-08:00", tz),
new DateTime("2012-11-06T00:00:00.000-08:00") new DateTime("2012-11-06T00:00:00.000-08:00", tz)
), ),
new PeriodGranularity(new Period("P1D"), null, tz) new PeriodGranularity(new Period("P1D"), null, tz)
.getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Days.days(3)).getMillis())) .getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Days.days(3)).getMillis()))
@ -332,11 +332,11 @@ public class QueryGranularityTest
assertSameInterval( assertSameInterval(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-11-04T00:00:00.000-07:00"), new DateTime("2012-11-04T00:00:00.000-07:00", tz),
new DateTime("2012-11-04T01:00:00.000-07:00"), new DateTime("2012-11-04T01:00:00.000-07:00", tz),
new DateTime("2012-11-04T01:00:00.000-08:00"), new DateTime("2012-11-04T01:00:00.000-08:00", tz),
new DateTime("2012-11-04T02:00:00.000-08:00"), new DateTime("2012-11-04T02:00:00.000-08:00", tz),
new DateTime("2012-11-04T03:00:00.000-08:00") new DateTime("2012-11-04T03:00:00.000-08:00", tz)
), ),
new PeriodGranularity(new Period("PT1H"), null, tz) new PeriodGranularity(new Period("PT1H"), null, tz)
.getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Hours.hours(5)).getMillis())) .getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Hours.hours(5)).getMillis()))
@ -345,11 +345,11 @@ public class QueryGranularityTest
final PeriodGranularity hour = new PeriodGranularity(new Period("PT1H"), null, tz); final PeriodGranularity hour = new PeriodGranularity(new Period("PT1H"), null, tz);
assertSameDateTime( assertSameDateTime(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-11-04T00:00:00.000-07:00"), new DateTime("2012-11-04T00:00:00.000-07:00", tz),
new DateTime("2012-11-04T01:00:00.000-07:00"), new DateTime("2012-11-04T01:00:00.000-07:00", tz),
new DateTime("2012-11-04T01:00:00.000-08:00"), new DateTime("2012-11-04T01:00:00.000-08:00", tz),
new DateTime("2012-11-04T02:00:00.000-08:00"), new DateTime("2012-11-04T02:00:00.000-08:00", tz),
new DateTime("2012-11-04T03:00:00.000-08:00") new DateTime("2012-11-04T03:00:00.000-08:00", tz)
), ),
Lists.newArrayList( Lists.newArrayList(
hour.bucketStart(new DateTime("2012-11-04T00:30:00-07:00")), hour.bucketStart(new DateTime("2012-11-04T00:30:00-07:00")),
@ -368,10 +368,10 @@ public class QueryGranularityTest
final DateTime baseTime = new DateTime("2012-11-03T10:00:00", tz); final DateTime baseTime = new DateTime("2012-11-03T10:00:00", tz);
assertSameInterval( assertSameInterval(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-11-01T00:00:00.000-07:00"), new DateTime("2012-11-01T00:00:00.000-07:00", tz),
new DateTime("2012-12-01T00:00:00.000-08:00"), new DateTime("2012-12-01T00:00:00.000-08:00", tz),
new DateTime("2013-01-01T00:00:00.000-08:00"), new DateTime("2013-01-01T00:00:00.000-08:00", tz),
new DateTime("2013-02-01T00:00:00.000-08:00") new DateTime("2013-02-01T00:00:00.000-08:00", tz)
), ),
new PeriodGranularity(new Period("P1M"), null, tz) new PeriodGranularity(new Period("P1M"), null, tz)
.getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Months.months(3)).getMillis())) .getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Months.months(3)).getMillis()))
@ -385,10 +385,10 @@ public class QueryGranularityTest
final DateTime baseTime = new DateTime("2012-11-03T10:00:00", tz); final DateTime baseTime = new DateTime("2012-11-03T10:00:00", tz);
assertSameInterval( assertSameInterval(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-10-29T00:00:00.000-07:00"), new DateTime("2012-10-29T00:00:00.000-07:00", tz),
new DateTime("2012-11-05T00:00:00.000-08:00"), new DateTime("2012-11-05T00:00:00.000-08:00", tz),
new DateTime("2012-11-12T00:00:00.000-08:00"), new DateTime("2012-11-12T00:00:00.000-08:00", tz),
new DateTime("2012-11-19T00:00:00.000-08:00") new DateTime("2012-11-19T00:00:00.000-08:00", tz)
), ),
new PeriodGranularity(new Period("P1W"), null, tz) new PeriodGranularity(new Period("P1W"), null, tz)
.getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Weeks.weeks(3)).getMillis())) .getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Weeks.weeks(3)).getMillis()))
@ -396,9 +396,9 @@ public class QueryGranularityTest
assertSameInterval( assertSameInterval(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-11-03T10:00:00.000-07:00"), new DateTime("2012-11-03T10:00:00.000-07:00", tz),
new DateTime("2012-11-10T10:00:00.000-08:00"), new DateTime("2012-11-10T10:00:00.000-08:00", tz),
new DateTime("2012-11-17T10:00:00.000-08:00") new DateTime("2012-11-17T10:00:00.000-08:00", tz)
), ),
new PeriodGranularity(new Period("P1W"), baseTime, tz) new PeriodGranularity(new Period("P1W"), baseTime, tz)
.getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Weeks.weeks(3)).getMillis())) .getIterable(new Interval(baseTime.getMillis(), baseTime.plus(Weeks.weeks(3)).getMillis()))
@ -408,17 +408,18 @@ public class QueryGranularityTest
@Test @Test
public void testPeriodTruncateDays() throws Exception public void testPeriodTruncateDays() throws Exception
{ {
final DateTimeZone tz = DateTimeZone.forID("America/Los_Angeles");
final DateTime origin = new DateTime("2012-01-02T05:00:00.000-08:00"); final DateTime origin = new DateTime("2012-01-02T05:00:00.000-08:00");
PeriodGranularity periodOrigin = new PeriodGranularity( PeriodGranularity periodOrigin = new PeriodGranularity(
new Period("P2D"), new Period("P2D"),
origin, origin,
DateTimeZone.forID("America/Los_Angeles") tz
); );
assertSameDateTime( assertSameDateTime(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2011-12-31T05:00:00.000-08:00"), new DateTime("2011-12-31T05:00:00.000-08:00", tz),
new DateTime("2012-01-02T05:00:00.000-08:00"), new DateTime("2012-01-02T05:00:00.000-08:00", tz),
new DateTime("2012-01-04T05:00:00.000-08:00") new DateTime("2012-01-04T05:00:00.000-08:00", tz)
), ),
Lists.newArrayList( Lists.newArrayList(
periodOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")), periodOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")),
@ -431,13 +432,13 @@ public class QueryGranularityTest
PeriodGranularity periodNoOrigin = new PeriodGranularity( PeriodGranularity periodNoOrigin = new PeriodGranularity(
new Period("P2D"), new Period("P2D"),
null, null,
DateTimeZone.forID("America/Los_Angeles") tz
); );
assertSameDateTime( assertSameDateTime(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-01-01T00:00:00.000-08:00"), new DateTime("2012-01-01T00:00:00.000-08:00", tz),
new DateTime("2012-01-01T00:00:00.000-08:00"), new DateTime("2012-01-01T00:00:00.000-08:00", tz),
new DateTime("2012-01-03T00:00:00.000-08:00") new DateTime("2012-01-03T00:00:00.000-08:00", tz)
), ),
Lists.newArrayList( Lists.newArrayList(
periodNoOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")), periodNoOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")),
@ -487,18 +488,19 @@ public class QueryGranularityTest
public void testCompoundPeriodTruncate() throws Exception public void testCompoundPeriodTruncate() throws Exception
{ {
{ {
final DateTimeZone tz = DateTimeZone.forID("America/Los_Angeles");
final DateTime origin = new DateTime("2012-01-02T05:00:00.000-08:00"); final DateTime origin = new DateTime("2012-01-02T05:00:00.000-08:00");
PeriodGranularity periodOrigin = new PeriodGranularity( PeriodGranularity periodOrigin = new PeriodGranularity(
new Period("P1M2D"), new Period("P1M2D"),
origin, origin,
DateTimeZone.forID("America/Los_Angeles") tz
); );
assertSameDateTime( assertSameDateTime(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2011-11-30T05:00:00.000-08:00"), new DateTime("2011-11-30T05:00:00.000-08:00", tz),
new DateTime("2012-01-02T05:00:00.000-08:00"), new DateTime("2012-01-02T05:00:00.000-08:00", tz),
new DateTime("2012-02-04T05:00:00.000-08:00"), new DateTime("2012-02-04T05:00:00.000-08:00", tz),
new DateTime("2012-02-04T05:00:00.000-08:00") new DateTime("2012-02-04T05:00:00.000-08:00", tz)
), ),
Lists.newArrayList( Lists.newArrayList(
periodOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")), periodOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")),
@ -511,14 +513,14 @@ public class QueryGranularityTest
PeriodGranularity periodNoOrigin = new PeriodGranularity( PeriodGranularity periodNoOrigin = new PeriodGranularity(
new Period("P1M2D"), new Period("P1M2D"),
null, null,
DateTimeZone.forID("America/Los_Angeles") tz
); );
assertSameDateTime( assertSameDateTime(
Lists.newArrayList( Lists.newArrayList(
new DateTime("1970-01-01T00:00:00.000-08:00"), new DateTime("1970-01-01T00:00:00.000-08:00", tz),
new DateTime("2011-12-12T00:00:00.000-08:00"), new DateTime("2011-12-12T00:00:00.000-08:00", tz),
new DateTime("2012-01-14T00:00:00.000-08:00"), new DateTime("2012-01-14T00:00:00.000-08:00", tz),
new DateTime("2012-02-16T00:00:00.000-08:00") new DateTime("2012-02-16T00:00:00.000-08:00", tz)
), ),
Lists.newArrayList( Lists.newArrayList(
periodNoOrigin.bucketStart(new DateTime("1970-01-01T05:02:04.123-08:00")), periodNoOrigin.bucketStart(new DateTime("1970-01-01T05:02:04.123-08:00")),
@ -531,18 +533,19 @@ public class QueryGranularityTest
} }
{ {
final DateTimeZone tz = DateTimeZone.forID("America/Los_Angeles");
final DateTime origin = new DateTime("2012-01-02T05:00:00.000-08:00"); final DateTime origin = new DateTime("2012-01-02T05:00:00.000-08:00");
PeriodGranularity periodOrigin = new PeriodGranularity( PeriodGranularity periodOrigin = new PeriodGranularity(
new Period("PT12H5M"), new Period("PT12H5M"),
origin, origin,
DateTimeZone.forID("America/Los_Angeles") tz
); );
assertSameDateTime( assertSameDateTime(
Lists.newArrayList( Lists.newArrayList(
new DateTime("2012-01-01T04:50:00.000-08:00"), new DateTime("2012-01-01T04:50:00.000-08:00", tz),
new DateTime("2012-01-02T05:00:00.000-08:00"), new DateTime("2012-01-02T05:00:00.000-08:00", tz),
new DateTime("2012-01-02T17:05:00.000-08:00"), new DateTime("2012-01-02T17:05:00.000-08:00", tz),
new DateTime("2012-02-03T22:25:00.000-08:00") new DateTime("2012-02-03T22:25:00.000-08:00", tz)
), ),
Lists.newArrayList( Lists.newArrayList(
periodOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")), periodOrigin.bucketStart(new DateTime("2012-01-01T05:00:04.123-08:00")),