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

fix zero period in PeriodGranularity causing gran.iterable(start, end) infinite loop (#3644)

This commit is contained in:
kaijianding 2016-11-02 18:10:07 +08:00 committed by Nishant
parent 4b0d6cf789
commit 2961406b90
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
processing/src/main/java/io/druid/granularity/DurationGranularity.java
View File

@ -21,6 +21,7 @@ package io.druid.granularity;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import com.google.common.primitives.Longs;
import org.joda.time.DateTime;
@ -42,6 +43,7 @@ public class DurationGranularity extends BaseQueryGranularity
public DurationGranularity(long millis, long origin)
{
Preconditions.checkArgument(millis > 0, "duration should be greater than 0!");
this.length = millis;
this.origin = origin % length;
}

4
processing/src/main/java/io/druid/granularity/PeriodGranularity.java
View File

@ -21,6 +21,7 @@ package io.druid.granularity;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import io.druid.java.util.common.StringUtils;
import org.joda.time.Chronology;
import org.joda.time.DateTime;
@ -44,7 +45,8 @@ public class PeriodGranularity extends BaseQueryGranularity
@JsonProperty("timeZone") DateTimeZone tz
)
{
this.period = period;
this.period = Preconditions.checkNotNull(period, "period can't be null!");
Preconditions.checkArgument(!Period.ZERO.equals(period), "zero period is not acceptable in QueryGranularity!");
this.chronology = tz == null ? ISOChronology.getInstanceUTC() : ISOChronology.getInstance(tz);
if(origin == null)
{

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

@ -19,6 +19,7 @@
package io.druid.granularity;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@ -642,6 +643,13 @@ public class QueryGranularityTest
String jsonOut = mapper.writeValueAsString(expected);
Assert.assertEquals(expected, mapper.readValue(jsonOut, QueryGranularity.class));
String illegalJson = "{ \"type\": \"period\", \"period\": \"P0D\" }";
try {
mapper.readValue(illegalJson, QueryGranularity.class);
Assert.fail();
}
catch (JsonMappingException e) {
}
}
@Test
@ -659,6 +667,14 @@ public class QueryGranularityTest
DurationGranularity expected = new DurationGranularity(5, 2);
Assert.assertEquals(expected, mapper.readValue(mapper.writeValueAsString(expected), QueryGranularity.class));
String illegalJson = "{ \"type\": \"duration\", \"duration\": \"0\" }";
try {
mapper.readValue(illegalJson, QueryGranularity.class);
Assert.fail();
}
catch (JsonMappingException e) {
}
}
@Test