This is an automated email from the ASF dual-hosted git repository.
fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new ab51878 SQL: Support AVG on system tables. (#6601)
ab51878 is described below
commit ab518781bbb029d41ad5b1ee6a8a0055dc2d3c3a
Author: Gian Merlino <[email protected]>
AuthorDate: Tue Nov 13 14:31:33 2018 -0800
SQL: Support AVG on system tables. (#6601)
---
.../java/org/apache/druid/sql/calcite/planner/Rules.java | 2 ++
.../java/org/apache/druid/sql/calcite/CalciteQueryTest.java | 12 +++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java
b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java
index 7fa66ef..e5883fa 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Rules.java
@@ -34,6 +34,7 @@ import
org.apache.calcite.rel.rules.AggregateExpandDistinctAggregatesRule;
import org.apache.calcite.rel.rules.AggregateJoinTransposeRule;
import org.apache.calcite.rel.rules.AggregateProjectMergeRule;
import org.apache.calcite.rel.rules.AggregateProjectPullUpConstantsRule;
+import org.apache.calcite.rel.rules.AggregateReduceFunctionsRule;
import org.apache.calcite.rel.rules.AggregateRemoveRule;
import org.apache.calcite.rel.rules.AggregateStarTableRule;
import org.apache.calcite.rel.rules.AggregateValuesRule;
@@ -209,6 +210,7 @@ public class Rules
return ImmutableList.<RelOptRule>builder()
.addAll(baseRuleSet(plannerContext, queryMaker))
.addAll(Bindables.RULES)
+ .add(AggregateReduceFunctionsRule.INSTANCE)
.build();
}
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
index 9261e71..89dd10c 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
@@ -610,15 +610,21 @@ public class CalciteQueryTest extends CalciteTestBase
}
@Test
- public void testMinOnInformationSchemaColumns() throws Exception
+ public void testAggregatorsOnInformationSchemaColumns() throws Exception
{
+ // Not including COUNT DISTINCT, since it isn't supported by
BindableAggregate, and so it can't work.
testQuery(
- "SELECT MIN(JDBC_TYPE)\n"
+ "SELECT\n"
+ + " COUNT(JDBC_TYPE),\n"
+ + " SUM(JDBC_TYPE),\n"
+ + " AVG(JDBC_TYPE),\n"
+ + " MIN(JDBC_TYPE),\n"
+ + " MAX(JDBC_TYPE)\n"
+ "FROM INFORMATION_SCHEMA.COLUMNS\n"
+ "WHERE TABLE_SCHEMA = 'druid' AND TABLE_NAME = 'foo'",
ImmutableList.of(),
ImmutableList.of(
- new Object[]{-5L}
+ new Object[]{8L, 1249L, 156L, -5L, 1111L}
)
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
