Skip to content

fix zero period in PeriodGranularity causing infinite loop then OOM #3644

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
nishantmonu51 merged 1 commit into from
Nov 2, 2016
Merged

fix zero period in PeriodGranularity causing infinite loop then OOM #3644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions processing/src/main/java/io/druid/granularity/DurationGranularity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

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;

Expand All @@ -42,6 +43,7 @@ public DurationGranularity(

public DurationGranularity(long millis, long origin)
{
Preconditions.checkArgument(millis > 0, "duration should be greater than 0!");
this.length = millis;
this.origin = origin % length;
}
Expand Down
4 changes: 3 additions & 1 deletion processing/src/main/java/io/druid/granularity/PeriodGranularity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

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;
Expand All @@ -44,7 +45,8 @@ public PeriodGranularity(
@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)
{
Expand Down
16 changes: 16 additions & 0 deletions processing/src/test/java/io/druid/granularity/QueryGranularityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -642,6 +643,13 @@ public void testSerializePeriod() throws Exception
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);
Copy link
Copy Markdown
Contributor

@gianm gianm Nov 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest Assert.fail() here just to make sure the exception is actually thrown. Or, use the @Rule ExpectedException (example in FileTaskLogsTest)

Copy link
Copy Markdown
Contributor Author

@kaijianding kaijianding Nov 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modified.

Assert.fail();
}
catch (JsonMappingException e) {
}
}

@Test
Expand All @@ -659,6 +667,14 @@ public void testSerializeDuration() throws Exception

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
Expand Down