1. update artifact version of druid-sql to 0.17.0-PP-SNAPSHOT

2. Aggregate the virtual column for setting granularity using longFirst
fuwhu · Jul 3, 2020 · fe2f854 · fe2f854
1 parent 25afd69
commit fe2f854
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/sql/pom.xml b/sql/pom.xml
@@ -23,6 +23,7 @@
 
   <artifactId>druid-sql</artifactId>
   <name>druid-sql</name>
+  <version>0.17.0-PP-SNAPSHOT</version>
   <description>Druid SQL</description>
 
   <parent>
@@ -233,4 +234,15 @@
     </plugins>
   </build>
 
+  <distributionManagement>
+    <repository>
+      <id>raptor.releases</id>
+      <url>http://paypalcentral.es.paypalcorp.com/nexus/content/repositories/releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>raptor.snapshots</id>
+      <url>http://paypalcentral.es.paypalcorp.com/nexus/content/repositories/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
 </project>
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
@@ -49,7 +49,9 @@
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryDataSource;
+import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.PostAggregator;
+import org.apache.druid.query.aggregation.first.LongFirstAggregatorFactory;
 import org.apache.druid.query.dimension.DimensionSpec;
 import org.apache.druid.query.expression.TimestampFloorExprMacro;
 import org.apache.druid.query.filter.DimFilter;
@@ -120,6 +122,8 @@ public class DruidQuery
   private final RelDataType outputRowType;
   private final VirtualColumnRegistry virtualColumnRegistry;
 
+  private static VirtualColumn granularityVirutalColumn;
+
   public DruidQuery(
       final PartialDruidQuery partialQuery,
       final DataSource dataSource,
@@ -394,6 +398,7 @@ private static List<DimensionExpression> computeDimensions(
                   newDruidExpression,
                   SqlTypeName.VARCHAR
           );
+          granularityVirutalColumn = virtualColumn;
         } else {
           virtualColumn = virtualColumnRegistry.getOrCreateVirtualColumnForExpression(
                   plannerContext,
@@ -733,6 +738,14 @@ public TimeseriesQuery toTimeseriesQuery()
     final Map<String, Object> theContext = new HashMap<>();
     theContext.put("skipEmptyBuckets", true);
     theContext.putAll(plannerContext.getQueryContext());
+    List<AggregatorFactory> aggregatorSpecs = grouping.getAggregatorFactories();
+    if (granularityVirutalColumn != null) {
+      aggregatorSpecs = new ArrayList<>(grouping.getAggregatorFactories());
+      aggregatorSpecs.add(new LongFirstAggregatorFactory(
+              granularityVirutalColumn.getOutputName(),
+              granularityVirutalColumn.getOutputName())
+      );
+    }
 
     return new TimeseriesQuery(
         dataSource,
@@ -741,7 +754,7 @@ public TimeseriesQuery toTimeseriesQuery()
         getVirtualColumns(true),
         filtration.getDimFilter(),
         queryGranularity,
-        grouping.getAggregatorFactories(),
+        aggregatorSpecs,
         postAggregators,
         timeseriesLimit,
         ImmutableSortedMap.copyOf(theContext)
@@ -981,7 +994,7 @@ private static DruidExpression convertTimestampFloorToTimestampFormat(
     } else if (Period.parse("P1M").equals(period)) {
       dateFormat = "yyyyMM";
     } else if (Period.parse("P1D").equals(period)) {
-      dateFormat = "yyyyMMDD";
+      dateFormat = "yyyyMMdd";
     } else {
       throw new ISE("Flooring timestamp at period " +
               period + " is not supported.");