Merge branch 'master' of github.com:metamx/druid into stop_task

client/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

common/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

druid-services/pom.xml

@@ -24,11 +24,11 @@
     <artifactId>druid-services</artifactId>
     <name>druid-services</name>
     <description>druid-services</description>
-    <version>0.3.26-SNAPSHOT</version>
+    <version>0.3.27-SNAPSHOT</version>
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

examples/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <modules>

examples/rand/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid-examples</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

examples/twitter/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid-examples</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

index-common/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

indexer/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

merger/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

pom.xml

@@ -23,7 +23,7 @@
     <groupId>com.metamx</groupId>
     <artifactId>druid</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.26-SNAPSHOT</version>
+    <version>0.3.27-SNAPSHOT</version>
     <name>druid</name>
     <description>druid</description>
     <scm>

realtime/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <properties>

server/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.metamx</groupId>
         <artifactId>druid</artifactId>
-        <version>0.3.26-SNAPSHOT</version>
+        <version>0.3.27-SNAPSHOT</version>
     </parent>
 
     <dependencies>

server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java

@@ -164,7 +164,7 @@ public class IncrementalIndexStorageAdapter implements StorageAdapter
                                 timeStart, new String[][]{}
                             ),
                             new IncrementalIndex.TimeAndDims(
-                                Math.min(actualInterval.getEndMillis(), gran.next(timeStart)), new String[][]{}
+                                Math.min(actualInterval.getEndMillis(), gran.next(input)), new String[][]{}
                             )
                         );
                         time = gran.toDateTime(input);

server/src/main/java/com/metamx/druid/index/v1/QueryableIndexStorageAdapter.java

@@ -272,7 +272,7 @@ public class QueryableIndexStorageAdapter extends BaseStorageAdapter
                   }
 
                   final Offset offset = new TimestampCheckingOffset(
-                      baseOffset, timestamps, Math.min(interval.getEndMillis(), gran.next(timeStart))
+                      baseOffset, timestamps, Math.min(interval.getEndMillis(), gran.next(input))
                   );
 
                   return new Cursor()

server/src/test/java/com/metamx/druid/query/timeseries/TimeseriesQueryRunnerTest.java

@@ -375,6 +375,53 @@ public class TimeseriesQueryRunnerTest
     TestHelper.assertExpectedResults(expectedResults2, results2);
   }
 
+  @Test
+  public void testTimeseriesGranularityNotAlignedOnSegmentBoundariesWithFilter()
+    {
+      TimeseriesQuery query1 = Druids.newTimeseriesQueryBuilder()
+                                     .dataSource(QueryRunnerTestHelper.dataSource)
+                                     .filters(QueryRunnerTestHelper.providerDimension, "spot", "upfront", "total_market")
+                                     .granularity(new PeriodGranularity(new Period("P7D"), null, DateTimeZone.forID("America/Los_Angeles")))
+                                     .intervals(
+                                         Arrays.asList(
+                                             new Interval(
+                                                 "2011-01-12T00:00:00.000-08:00/2011-01-20T00:00:00.000-08:00"
+                                             )
+                                         )
+                                     )
+                                     .aggregators(
+                                         Arrays.<AggregatorFactory>asList(
+                                             QueryRunnerTestHelper.rowsCount,
+                                             new LongSumAggregatorFactory(
+                                                 "idx",
+                                                 "index"
+                                             )
+                                         )
+                                     )
+                                     .build();
+
+      List<Result<TimeseriesResultValue>> expectedResults1 = Arrays.asList(
+          new Result<TimeseriesResultValue>(
+              new DateTime("2011-01-06T00:00:00.000-08:00", DateTimeZone.forID("America/Los_Angeles")),
+              new TimeseriesResultValue(
+                  ImmutableMap.<String, Object>of("rows", 13L, "idx", 6071L)
+              )
+          ),
+          new Result<TimeseriesResultValue>(
+              new DateTime("2011-01-13T00:00:00.000-08:00", DateTimeZone.forID("America/Los_Angeles")),
+              new TimeseriesResultValue(
+                  ImmutableMap.<String, Object>of("rows", 91L, "idx", 33382L)
+              )
+          )
+      );
+
+      Iterable<Result<TimeseriesResultValue>> results1 = Sequences.toList(
+          runner.run(query1),
+          Lists.<Result<TimeseriesResultValue>>newArrayList()
+      );
+      TestHelper.assertExpectedResults(expectedResults1, results1);
+    }
+
   @Test
   public void testTimeseriesWithVaryingGranWithFilter()
   {