github-advanced-security[bot] commented on code in PR #17378: URL: https://github.com/apache/druid/pull/17378#discussion_r1806414299
########## sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java: ########## @@ -0,0 +1,317 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.sql.calcite.rule; + +import com.google.common.collect.ImmutableList; +import org.apache.calcite.plan.RelOptCluster; +import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.rel.RelCollations; +import org.apache.calcite.rel.core.Aggregate; +import org.apache.calcite.rel.core.AggregateCall; +import org.apache.calcite.rel.core.Project; +import org.apache.calcite.rel.rules.AggregateCaseToFilterRule; +import org.apache.calcite.rel.rules.SubstitutionRule; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rex.RexBuilder; +import org.apache.calcite.rex.RexCall; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexOver; +import org.apache.calcite.rex.RexShuttle; +import org.apache.calcite.rex.RexWindow; +import org.apache.calcite.rex.RexWindowBound; +import org.apache.calcite.sql.SqlAggFunction; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlPostfixOperator; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.tools.RelBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Druid version of {@link AggregateCaseToFilterRule} + * after enhancing the upstream one to support cases like + * SUM(CASE WHEN COND THEN COL1 ELSE 0 END) + * without introducing an inner case this should be removed. + */ +public class DruidAggregateCaseToFilterRule extends RelOptRule implements SubstitutionRule +{ + public DruidAggregateCaseToFilterRule() + { + super(operand(Aggregate.class, operand(Project.class, any()))); Review Comment: ## Deprecated method or constructor invocation Invoking [RelOptRule.operand](1) should be avoided because it has been deprecated. [Show more details](https://github.com/apache/druid/security/code-scanning/8414) ########## sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java: ########## @@ -0,0 +1,317 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.sql.calcite.rule; + +import com.google.common.collect.ImmutableList; +import org.apache.calcite.plan.RelOptCluster; +import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.rel.RelCollations; +import org.apache.calcite.rel.core.Aggregate; +import org.apache.calcite.rel.core.AggregateCall; +import org.apache.calcite.rel.core.Project; +import org.apache.calcite.rel.rules.AggregateCaseToFilterRule; +import org.apache.calcite.rel.rules.SubstitutionRule; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rex.RexBuilder; +import org.apache.calcite.rex.RexCall; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexOver; +import org.apache.calcite.rex.RexShuttle; +import org.apache.calcite.rex.RexWindow; +import org.apache.calcite.rex.RexWindowBound; +import org.apache.calcite.sql.SqlAggFunction; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlPostfixOperator; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.tools.RelBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Druid version of {@link AggregateCaseToFilterRule} + * after enhancing the upstream one to support cases like + * SUM(CASE WHEN COND THEN COL1 ELSE 0 END) + * without introducing an inner case this should be removed. + */ +public class DruidAggregateCaseToFilterRule extends RelOptRule implements SubstitutionRule +{ + public DruidAggregateCaseToFilterRule() + { + super(operand(Aggregate.class, operand(Project.class, any()))); + } + + @Override + public void onMatch(RelOptRuleCall call) + { + final Aggregate aggregate = call.rel(0); + final Project project = call.rel(1); + final List<AggregateCall> newCalls = new ArrayList<>(aggregate.getAggCallList().size()); + final List<RexNode> newProjects = new ArrayList<>(project.getProjects()); + + for (AggregateCall aggregateCall : aggregate.getAggCallList()) { + AggregateCall newCall = transform(aggregateCall, project, newProjects); + + if (newCall == null) { + newCalls.add(aggregateCall); + } else { + newCalls.add(newCall); + } + } + + if (newCalls.equals(aggregate.getAggCallList())) { + return; + } + + final RelBuilder relBuilder = call.builder() + .push(project.getInput()) + .project(newProjects); + + final RelBuilder.GroupKey groupKey = relBuilder.groupKey(aggregate.getGroupSet(), aggregate.getGroupSets()); + + relBuilder.aggregate(groupKey, newCalls) + .convert(aggregate.getRowType(), false); + + call.transformTo(relBuilder.build()); + call.getPlanner().prune(aggregate); + } + + private static @Nullable AggregateCall transform(AggregateCall call, + Project project, List<RexNode> newProjects) + { + final int singleArg = soleArgument(call); + if (singleArg < 0) { + return null; + } + + final RexNode rexNode = project.getProjects().get(singleArg); + if (!isThreeArgCase(rexNode)) { + return null; + } + + final RelOptCluster cluster = project.getCluster(); + final RexBuilder rexBuilder = cluster.getRexBuilder(); + final RexCall caseCall = (RexCall) rexNode; + + // If one arg is null and the other is not, reverse them and set "flip", + // which negates the filter. + final boolean flip = RexLiteral.isNullLiteral(caseCall.operands.get(1)) + && !RexLiteral.isNullLiteral(caseCall.operands.get(2)); + final RexNode arg1 = caseCall.operands.get(flip ? 2 : 1); + final RexNode arg2 = caseCall.operands.get(flip ? 1 : 2); + + // Operand 1: Filter + final SqlPostfixOperator op = flip ? SqlStdOperatorTable.IS_NOT_TRUE : SqlStdOperatorTable.IS_TRUE; + final RexNode filterFromCase = rexBuilder.makeCall(op, caseCall.operands.get(0)); + + // Combine the CASE filter with an honest-to-goodness SQL FILTER, if the + // latter is present. + final RexNode filter; + if (call.filterArg >= 0) { + filter = rexBuilder.makeCall( + SqlStdOperatorTable.AND, + project.getProjects().get(call.filterArg), + filterFromCase + ); + } else { + filter = filterFromCase; + } + + final SqlKind kind = call.getAggregation().getKind(); + if (call.isDistinct()) { + return null; + } + + if (kind == SqlKind.COUNT // Case C + && arg1.isA(SqlKind.LITERAL) + && !RexLiteral.isNullLiteral(arg1) + && RexLiteral.isNullLiteral(arg2)) { + newProjects.add(filter); + return AggregateCall.create( + SqlStdOperatorTable.COUNT, + false, + false, + false, + call.rexList, + ImmutableList.of(), + newProjects.size() - 1, + null, + RelCollations.EMPTY, call.getType(), + call.getName() + ); + } else if (kind == SqlKind.SUM0 // Case B + && isIntLiteral(arg1, BigDecimal.ONE) + && isIntLiteral(arg2, BigDecimal.ZERO)) { + + newProjects.add(filter); + final RelDataTypeFactory typeFactory = cluster.getTypeFactory(); + final RelDataType dataType = typeFactory.createTypeWithNullability( + typeFactory.createSqlType(SqlTypeName.BIGINT), false + ); + return AggregateCall.create( + SqlStdOperatorTable.COUNT, + false, + false, + false, + call.rexList, + ImmutableList.of(), + newProjects.size() - 1, + null, + RelCollations.EMPTY, + dataType, + call.getName() + ); + } else if ((RexLiteral.isNullLiteral(arg2) // Case A1 + && call.getAggregation().allowsFilter()) + || (kind == SqlKind.SUM0 // Case A2 + && isIntLiteral(arg2, BigDecimal.ZERO))) { + newProjects.add(arg1); + newProjects.add(filter); + return AggregateCall.create( + call.getAggregation(), + false, + false, + false, + call.rexList, + ImmutableList.of(newProjects.size() - 2), + newProjects.size() - 1, + null, + RelCollations.EMPTY, + call.getType(), + call.getName() + ); + + } else if (kind == SqlKind.SUM && isIntLiteral(arg2, BigDecimal.ZERO)) { + newProjects.add(arg1); + newProjects.add(filter); + + RelDataType newType = rexBuilder.getTypeFactory().createTypeWithNullability(call.getType(), true); + return AggregateCall.create( + call.getAggregation(), + false, + false, + true, + call.rexList, + ImmutableList.of(newProjects.size() - 2), + newProjects.size() - 1, + null, + RelCollations.EMPTY, + newType, call.getName() + ); + } + + return null; + } + + /** + * Returns the argument, if an aggregate call has a single argument, otherwise + * -1. + */ + private static int soleArgument(AggregateCall aggregateCall) + { + return aggregateCall.getArgList().size() == 1 + ? aggregateCall.getArgList().get(0) + : -1; + } + + private static boolean isThreeArgCase(final RexNode rexNode) + { + return rexNode.getKind() == SqlKind.CASE + && ((RexCall) rexNode).operands.size() == 3; + } + + private static boolean isIntLiteral(RexNode rexNode, BigDecimal value) + { + return rexNode instanceof RexLiteral + && SqlTypeName.INT_TYPES.contains(rexNode.getType().getSqlTypeName()) + && value.equals(((RexLiteral) rexNode).getValueAs(BigDecimal.class)); + } + + private static class RewriteShuttle extends RexShuttle Review Comment: ## Unused classes and interfaces Unused class: RewriteShuttle is not referenced within this codebase. If not used as an external API it should be removed. [Show more details](https://github.com/apache/druid/security/code-scanning/8417) ########## sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java: ########## @@ -0,0 +1,317 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.sql.calcite.rule; + +import com.google.common.collect.ImmutableList; +import org.apache.calcite.plan.RelOptCluster; +import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.rel.RelCollations; +import org.apache.calcite.rel.core.Aggregate; +import org.apache.calcite.rel.core.AggregateCall; +import org.apache.calcite.rel.core.Project; +import org.apache.calcite.rel.rules.AggregateCaseToFilterRule; +import org.apache.calcite.rel.rules.SubstitutionRule; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rex.RexBuilder; +import org.apache.calcite.rex.RexCall; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexOver; +import org.apache.calcite.rex.RexShuttle; +import org.apache.calcite.rex.RexWindow; +import org.apache.calcite.rex.RexWindowBound; +import org.apache.calcite.sql.SqlAggFunction; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlPostfixOperator; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.tools.RelBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Druid version of {@link AggregateCaseToFilterRule} + * after enhancing the upstream one to support cases like + * SUM(CASE WHEN COND THEN COL1 ELSE 0 END) + * without introducing an inner case this should be removed. + */ +public class DruidAggregateCaseToFilterRule extends RelOptRule implements SubstitutionRule +{ + public DruidAggregateCaseToFilterRule() + { + super(operand(Aggregate.class, operand(Project.class, any()))); Review Comment: ## Deprecated method or constructor invocation Invoking [RelOptRule.any](1) should be avoided because it has been deprecated. [Show more details](https://github.com/apache/druid/security/code-scanning/8416) ########## sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java: ########## @@ -0,0 +1,317 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.sql.calcite.rule; + +import com.google.common.collect.ImmutableList; +import org.apache.calcite.plan.RelOptCluster; +import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.rel.RelCollations; +import org.apache.calcite.rel.core.Aggregate; +import org.apache.calcite.rel.core.AggregateCall; +import org.apache.calcite.rel.core.Project; +import org.apache.calcite.rel.rules.AggregateCaseToFilterRule; +import org.apache.calcite.rel.rules.SubstitutionRule; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.calcite.rex.RexBuilder; +import org.apache.calcite.rex.RexCall; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexOver; +import org.apache.calcite.rex.RexShuttle; +import org.apache.calcite.rex.RexWindow; +import org.apache.calcite.rex.RexWindowBound; +import org.apache.calcite.sql.SqlAggFunction; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlPostfixOperator; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.tools.RelBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Druid version of {@link AggregateCaseToFilterRule} + * after enhancing the upstream one to support cases like + * SUM(CASE WHEN COND THEN COL1 ELSE 0 END) + * without introducing an inner case this should be removed. + */ +public class DruidAggregateCaseToFilterRule extends RelOptRule implements SubstitutionRule +{ + public DruidAggregateCaseToFilterRule() + { + super(operand(Aggregate.class, operand(Project.class, any()))); Review Comment: ## Deprecated method or constructor invocation Invoking [RelOptRule.operand](1) should be avoided because it has been deprecated. [Show more details](https://github.com/apache/druid/security/code-scanning/8415) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
