You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2018/09/25 17:37:05 UTC
[GitHub] gianm closed pull request #6374: SQL: Unwrap IS_TRUE,
IS_FALSE and friends when building a filter.
gianm closed pull request #6374: SQL: Unwrap IS_TRUE, IS_FALSE and friends when building a filter.
URL: https://github.com/apache/incubator-druid/pull/6374
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java
index 75018e0b359..17579b1c1ce 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/Expressions.java
@@ -22,6 +22,17 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import org.apache.calcite.jdbc.JavaTypeFactoryImpl;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.type.SqlTypeFamily;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.druid.common.config.NullHandling;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.granularity.Granularity;
@@ -41,7 +52,6 @@
import org.apache.druid.query.filter.SelectorDimFilter;
import org.apache.druid.query.ordering.StringComparator;
import org.apache.druid.query.ordering.StringComparators;
-import org.apache.druid.common.config.NullHandling;
import org.apache.druid.segment.column.Column;
import org.apache.druid.segment.column.ValueType;
import org.apache.druid.sql.calcite.filtration.BoundRefKey;
@@ -50,16 +60,6 @@
import org.apache.druid.sql.calcite.planner.Calcites;
import org.apache.druid.sql.calcite.planner.PlannerContext;
import org.apache.druid.sql.calcite.table.RowSignature;
-import org.apache.calcite.jdbc.JavaTypeFactoryImpl;
-import org.apache.calcite.rel.core.Project;
-import org.apache.calcite.rex.RexCall;
-import org.apache.calcite.rex.RexInputRef;
-import org.apache.calcite.rex.RexLiteral;
-import org.apache.calcite.rex.RexNode;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.SqlOperator;
-import org.apache.calcite.sql.type.SqlTypeFamily;
-import org.apache.calcite.sql.type.SqlTypeName;
import org.joda.time.Interval;
import javax.annotation.Nullable;
@@ -219,12 +219,20 @@ public static DimFilter toFilter(
final RexNode expression
)
{
- if (expression.getKind() == SqlKind.CAST && expression.getType().getSqlTypeName() == SqlTypeName.BOOLEAN) {
+ final SqlKind kind = expression.getKind();
+
+ if (kind == SqlKind.IS_TRUE || kind == SqlKind.IS_NOT_FALSE) {
+ return toFilter(plannerContext, rowSignature, Iterables.getOnlyElement(((RexCall) expression).getOperands()));
+ } else if (kind == SqlKind.IS_FALSE || kind == SqlKind.IS_NOT_TRUE) {
+ return new NotDimFilter(
+ toFilter(plannerContext, rowSignature, Iterables.getOnlyElement(((RexCall) expression).getOperands()))
+ );
+ } else if (kind == SqlKind.CAST && expression.getType().getSqlTypeName() == SqlTypeName.BOOLEAN) {
// Calcite sometimes leaves errant, useless cast-to-booleans inside filters. Strip them and continue.
return toFilter(plannerContext, rowSignature, Iterables.getOnlyElement(((RexCall) expression).getOperands()));
- } else if (expression.getKind() == SqlKind.AND
- || expression.getKind() == SqlKind.OR
- || expression.getKind() == SqlKind.NOT) {
+ } else if (kind == SqlKind.AND
+ || kind == SqlKind.OR
+ || kind == SqlKind.NOT) {
final List<DimFilter> filters = Lists.newArrayList();
for (final RexNode rexNode : ((RexCall) expression).getOperands()) {
final DimFilter nextFilter = toFilter(
@@ -238,12 +246,12 @@ public static DimFilter toFilter(
filters.add(nextFilter);
}
- if (expression.getKind() == SqlKind.AND) {
+ if (kind == SqlKind.AND) {
return new AndDimFilter(filters);
- } else if (expression.getKind() == SqlKind.OR) {
+ } else if (kind == SqlKind.OR) {
return new OrDimFilter(filters);
} else {
- assert expression.getKind() == SqlKind.NOT;
+ assert kind == SqlKind.NOT;
return new NotDimFilter(Iterables.getOnlyElement(filters));
}
} else {
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 f6f6aabc4c7..e0f48dcefb1 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
@@ -2729,7 +2729,8 @@ public void testFilteredAggregations() throws Exception
+ "SUM(case when dim1 <> '1' then cnt end) filter(WHERE dim2 = 'a'), "
+ "SUM(CASE WHEN dim1 <> '1' THEN cnt ELSE 0 END), "
+ "MAX(CASE WHEN dim1 <> '1' THEN cnt END), "
- + "COUNT(DISTINCT CASE WHEN dim1 <> '1' THEN m1 END) "
+ + "COUNT(DISTINCT CASE WHEN dim1 <> '1' THEN m1 END), "
+ + "SUM(cnt) filter(WHERE dim2 = 'a' AND dim1 = 'b') "
+ "FROM druid.foo",
ImmutableList.of(
Druids.newTimeseriesQueryBuilder()
@@ -2792,6 +2793,10 @@ public void testFilteredAggregations() throws Exception
true
),
NOT(SELECTOR("dim1", "1", null))
+ ),
+ new FilteredAggregatorFactory(
+ new LongSumAggregatorFactory("a11", "cnt"),
+ AND(SELECTOR("dim2", "a", null), SELECTOR("dim1", "b", null))
)
))
.context(TIMESERIES_CONTEXT_DEFAULT)
@@ -2799,10 +2804,10 @@ public void testFilteredAggregations() throws Exception
),
NullHandling.replaceWithDefault() ?
ImmutableList.of(
- new Object[]{1L, 5L, 1L, 2L, 5L, 5L, 2L, 1L, 5L, 1L, 5L}
+ new Object[]{1L, 5L, 1L, 2L, 5L, 5L, 2L, 1L, 5L, 1L, 5L, 0L}
) :
ImmutableList.of(
- new Object[]{1L, 5L, 1L, 3L, 5L, 5L, 2L, 1L, 5L, 1L, 5L}
+ new Object[]{1L, 5L, 1L, 3L, 5L, 5L, 2L, 1L, 5L, 1L, 5L, null}
)
);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org