hive git commit: HIVE-19868 : Add support for float aggregator (Slim Bouguerra via Ashutosh Chauhan)
Repository: hive Updated Branches: refs/heads/branch-3 f7daaea7e -> 6e6849ce9 HIVE-19868 : Add support for float aggregator (Slim Bouguerra via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6e6849ce Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6e6849ce Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6e6849ce Branch: refs/heads/branch-3 Commit: 6e6849ce9904f6dfd20f6bfcdd36f7f7e3c402b4 Parents: f7daaea Author: Slim Bouguerra Authored: Wed Jun 13 10:13:57 2018 -0500 Committer: Ashutosh Chauhan Committed: Wed Jun 13 10:15:46 2018 -0500 -- .../org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java | 3 +++ .../results/clientpositive/druid/druidmini_expressions.q.out | 6 +++--- .../results/clientpositive/druid/druidmini_extractTime.q.out | 6 +++--- ql/src/test/results/clientpositive/druid/druidmini_test1.q.out | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/6e6849ce/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java -- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java index 597761b..5a48d0f 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java @@ -50,6 +50,7 @@ import io.druid.metadata.SQLMetadataConnector; import io.druid.metadata.storage.mysql.MySQLConnector; import io.druid.query.aggregation.AggregatorFactory; import io.druid.query.aggregation.DoubleSumAggregatorFactory; +import io.druid.query.aggregation.FloatSumAggregatorFactory; import io.druid.query.aggregation.LongSumAggregatorFactory; import io.druid.query.expression.LikeExprMacro; import io.druid.query.expression.RegexpExtractExprMacro; @@ -825,6 +826,8 @@ public final class DruidStorageHandlerUtils { af = new LongSumAggregatorFactory(columnNames.get(i), columnNames.get(i)); break; case FLOAT: +af = new FloatSumAggregatorFactory(columnNames.get(i), columnNames.get(i)); +break; case DOUBLE: af = new DoubleSumAggregatorFactory(columnNames.get(i), columnNames.get(i)); break; http://git-wip-us.apache.org/repos/asf/hive/blob/6e6849ce/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out -- diff --git a/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out b/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out index b34f47b..fd77a91 100644 --- a/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out +++ b/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out @@ -90,7 +90,7 @@ FROM druid_table_n0 WHERE ceil(cfloat) > 0 AND floor(cdouble) * 2 < 1000 OR ln(c POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table_n0 POSTHOOK: Output: hdfs://### HDFS PATH ### -19884.64700973034 2737341914472 8.51628242804E11 85162041365468151649880 +19884.646918177605 2737341914472 8.51628242804E11 85162041365468151649880 PREHOOK: query: SELECT SUM(cfloat + 1), CAST(SUM(cdouble + ctinyint) AS INTEGER), SUM(ctinyint) + 1 , CAST(SUM(csmallint) + SUM(cint) AS DOUBLE), SUM(cint), SUM(cbigint) FROM druid_table_n0 WHERE ceil(cfloat) > 0 AND floor(cdouble) * 2 < 1000 PREHOOK: type: QUERY @@ -101,7 +101,7 @@ FROM druid_table_n0 WHERE ceil(cfloat) > 0 AND floor(cdouble) * 2 < 1000 POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table_n0 POSTHOOK: Output: hdfs://### HDFS PATH ### -54430.27000427246 -374044551268 1.31919188502E11 13192298494892160895030 +54430.269943237305 -374044551268 1.31919188502E11 13192298494892160895030 PREHOOK: query: SELECT SUM(cfloat + 1), CAST(SUM(cdouble + ctinyint) AS INTEGER), SUM(ctinyint) + 1 , CAST(SUM(csmallint) + SUM(cint) AS DOUBLE), SUM(cint), SUM(cbigint) FROM druid_table_n0 WHERE ln(cdouble) / log10(10) > 0 AND COS(cint) > 0 OR SIN(cdouble) > 1 PREHOOK: type: QUERY @@ -112,7 +112,7 @@ FROM druid_table_n0 WHERE ln(cdouble) / log10(10) > 0 AND COS(cint) > 0 OR SIN( POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table_n0 POSTHOOK: Output: hdfs://### HDFS PATH ### --2389.516991734504727640645-5707 7.19705549994E11 71969742870613774723379 +-2389.517022252083 27640645-5707 7.19705549994E11 71969742870613774723379 PREHOOK: query:
hive git commit: HIVE-19868 : Add support for float aggregator (Slim Bouguerra via Ashutosh Chauhan)
Repository: hive Updated Branches: refs/heads/master 7b7f5a3c9 -> bdf39e43a HIVE-19868 : Add support for float aggregator (Slim Bouguerra via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/bdf39e43 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/bdf39e43 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/bdf39e43 Branch: refs/heads/master Commit: bdf39e43a7c4225dec9d74dbc5bbdfb0cd685ec5 Parents: 7b7f5a3 Author: Slim Bouguerra Authored: Wed Jun 13 10:13:57 2018 -0500 Committer: Ashutosh Chauhan Committed: Wed Jun 13 10:13:57 2018 -0500 -- .../org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java | 3 +++ .../results/clientpositive/druid/druidmini_expressions.q.out | 6 +++--- .../results/clientpositive/druid/druidmini_extractTime.q.out | 6 +++--- ql/src/test/results/clientpositive/druid/druidmini_test1.q.out | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/bdf39e43/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java -- diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java index 597761b..5a48d0f 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java @@ -50,6 +50,7 @@ import io.druid.metadata.SQLMetadataConnector; import io.druid.metadata.storage.mysql.MySQLConnector; import io.druid.query.aggregation.AggregatorFactory; import io.druid.query.aggregation.DoubleSumAggregatorFactory; +import io.druid.query.aggregation.FloatSumAggregatorFactory; import io.druid.query.aggregation.LongSumAggregatorFactory; import io.druid.query.expression.LikeExprMacro; import io.druid.query.expression.RegexpExtractExprMacro; @@ -825,6 +826,8 @@ public final class DruidStorageHandlerUtils { af = new LongSumAggregatorFactory(columnNames.get(i), columnNames.get(i)); break; case FLOAT: +af = new FloatSumAggregatorFactory(columnNames.get(i), columnNames.get(i)); +break; case DOUBLE: af = new DoubleSumAggregatorFactory(columnNames.get(i), columnNames.get(i)); break; http://git-wip-us.apache.org/repos/asf/hive/blob/bdf39e43/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out -- diff --git a/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out b/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out index b34f47b..fd77a91 100644 --- a/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out +++ b/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out @@ -90,7 +90,7 @@ FROM druid_table_n0 WHERE ceil(cfloat) > 0 AND floor(cdouble) * 2 < 1000 OR ln(c POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table_n0 POSTHOOK: Output: hdfs://### HDFS PATH ### -19884.64700973034 2737341914472 8.51628242804E11 85162041365468151649880 +19884.646918177605 2737341914472 8.51628242804E11 85162041365468151649880 PREHOOK: query: SELECT SUM(cfloat + 1), CAST(SUM(cdouble + ctinyint) AS INTEGER), SUM(ctinyint) + 1 , CAST(SUM(csmallint) + SUM(cint) AS DOUBLE), SUM(cint), SUM(cbigint) FROM druid_table_n0 WHERE ceil(cfloat) > 0 AND floor(cdouble) * 2 < 1000 PREHOOK: type: QUERY @@ -101,7 +101,7 @@ FROM druid_table_n0 WHERE ceil(cfloat) > 0 AND floor(cdouble) * 2 < 1000 POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table_n0 POSTHOOK: Output: hdfs://### HDFS PATH ### -54430.27000427246 -374044551268 1.31919188502E11 13192298494892160895030 +54430.269943237305 -374044551268 1.31919188502E11 13192298494892160895030 PREHOOK: query: SELECT SUM(cfloat + 1), CAST(SUM(cdouble + ctinyint) AS INTEGER), SUM(ctinyint) + 1 , CAST(SUM(csmallint) + SUM(cint) AS DOUBLE), SUM(cint), SUM(cbigint) FROM druid_table_n0 WHERE ln(cdouble) / log10(10) > 0 AND COS(cint) > 0 OR SIN(cdouble) > 1 PREHOOK: type: QUERY @@ -112,7 +112,7 @@ FROM druid_table_n0 WHERE ln(cdouble) / log10(10) > 0 AND COS(cint) > 0 OR SIN( POSTHOOK: type: QUERY POSTHOOK: Input: default@druid_table_n0 POSTHOOK: Output: hdfs://### HDFS PATH ### --2389.516991734504727640645-5707 7.19705549994E11 71969742870613774723379 +-2389.517022252083 27640645-5707 7.19705549994E11 71969742870613774723379 PREHOOK: query: SELE