Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-20 00:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PeriodGranularity.bucketStart for days that don't start with midnight. (#8711)

Browse Source 
* Fix PeriodGranularity.bucketStart for days that don't start with midnight.

* Use more newspeak method.
This commit is contained in:
Gian Merlino 2019-10-22 10:00:52 -07:00 committed by Fangjin Yang
parent e919eccc4b
commit bb4368baec
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/apache/druid/java/util/common/granularity/PeriodGranularity.java
View File

@ -307,8 +307,7 @@ public class PeriodGranularity extends Granularity implements JsonSerializable
} }
return t; return t;
} else { } else {
t = chronology.hourOfDay().roundFloor(t); return chronology.dayOfMonth().roundFloor(t);
return chronology.hourOfDay().set(t, 0);
} }
} }
@ -330,8 +329,7 @@ public class PeriodGranularity extends Granularity implements JsonSerializable
} }
return t; return t;
} else { } else {
t = chronology.minuteOfHour().roundFloor(t); return chronology.hourOfDay().roundFloor(t);
return chronology.minuteOfHour().set(t, 0);
} }
} }
@ -350,8 +348,7 @@ public class PeriodGranularity extends Granularity implements JsonSerializable
} }
return t; return t;
} else { } else {
t = chronology.secondOfMinute().roundFloor(t); return chronology.minuteOfHour().roundFloor(t);
return chronology.secondOfMinute().set(t, 0);
} }
} }

37
core/src/test/java/org/apache/druid/java/util/common/GranularityTest.java
View File

@ -19,6 +19,7 @@
package org.apache.druid.java.util.common; package org.apache.druid.java.util.common;
import com.google.common.collect.ImmutableList;
import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.java.util.common.granularity.Granularities;
import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.granularity.Granularity;
import org.apache.druid.java.util.common.granularity.GranularityType; import org.apache.druid.java.util.common.granularity.GranularityType;
@ -34,6 +35,8 @@ import org.junit.Test;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
public class GranularityTest public class GranularityTest
{ {
@ -772,6 +775,40 @@ public class GranularityTest
} }
} }
@Test // Regression test for https://github.com/apache/incubator-druid/issues/5200.
public void testIncrementOverSpringForward()
{
// Sao Paulo daylight savings time in 2017 starts at midnight. When we spring forward, 00:00:00 doesn't exist.
// (The clock goes straight from 23:59:59 to 01:00:00.) This test verifies we handle the case correctly while
// iterating through Paulistano days.
final DateTimeZone saoPaulo = DateTimes.inferTzFromString("America/Sao_Paulo");
final PeriodGranularity granSaoPauloDay = new PeriodGranularity(
Period.days(1),
null,
saoPaulo
);
final Iterable<Interval> intervals = granSaoPauloDay.getIterable(
new Interval(
new DateTime("2017-10-14", saoPaulo),
new DateTime("2017-10-17", saoPaulo)
)
);
// Similar to what query engines do: call granularity.bucketStart on the datetimes returned by their cursors.
// (And the cursors, in turn, use getIterable like above.)
Assert.assertEquals(
ImmutableList.of(
new DateTime("2017-10-14", saoPaulo),
new DateTime("2017-10-15T01", saoPaulo),
new DateTime("2017-10-16", saoPaulo)
),
StreamSupport.stream(intervals.spliterator(), false)
.map(interval -> granSaoPauloDay.bucketStart(interval.getStart()))
.collect(Collectors.toList())
);
}
private static class PathDate private static class PathDate
{ {
public final String path; public final String path;