Skip to content

[CALCITE-7579] REGR_COUNT arguments are dropped in RelNode #4990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chloe-zh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[CALCITE-7579] REGR_COUNT arguments are dropped in RelNode #4990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,8 @@ public interface Config extends RelRule.Config {
.addAll(SqlKind.AVG_AGG_FUNCTIONS)
.addAll(SqlKind.COVAR_AVG_AGG_FUNCTIONS)
.add(SqlKind.SUM)
.build();
.build().stream().filter(k -> k != SqlKind.REGR_COUNT)
.collect(ImmutableSet.toImmutableSet());

@Override default AggregateReduceFunctionsRule toRule() {
return new AggregateReduceFunctionsRule(this);
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/org/apache/calcite/rex/RexBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Expand Down Expand Up @@ -39,7 +39,6 @@
import org.apache.calcite.sql.SqlTimeLiteral;
import org.apache.calcite.sql.SqlTimestampLiteral;
import org.apache.calcite.sql.SqlUtil;
import org.apache.calcite.sql.fun.SqlCountAggFunction;
import org.apache.calcite.sql.fun.SqlLibraryOperators;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.parser.SqlParserPos;
Expand Down Expand Up @@ -388,7 +387,7 @@
List<AggregateCall> aggCalls,
Map<AggregateCall, RexNode> aggCallMapping,
IntPredicate isNullable) {
if (aggCall.getAggregation() instanceof SqlCountAggFunction
if (aggCall.getAggregation().getKind() == SqlKind.COUNT
&& !aggCall.isDistinct()) {
final List<Integer> args = aggCall.getArgList();
final List<Integer> nullableArgs = nullableArgs(args, isNullable);
Expand Down
11 changes: 8 additions & 3 deletions core/src/main/java/org/apache/calcite/sql/fun/SqlCountAggFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,14 @@ public SqlCountAggFunction(String name) {

public SqlCountAggFunction(String name,
SqlOperandTypeChecker sqlOperandTypeChecker) {
super(name, null, SqlKind.COUNT, ReturnTypes.BIGINT, null,
sqlOperandTypeChecker, SqlFunctionCategory.NUMERIC, false, false,
Optionality.FORBIDDEN);
this(name, sqlOperandTypeChecker, SqlKind.COUNT);
}

public SqlCountAggFunction(String name,
SqlOperandTypeChecker sqlOperandTypeChecker,
SqlKind sqlKind) {
super(name, null, sqlKind, ReturnTypes.BIGINT, null, sqlOperandTypeChecker,
SqlFunctionCategory.NUMERIC, false, false, Optionality.FORBIDDEN);
}

//~ Methods ----------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/calcite/sql/fun/SqlRegrCountAggFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
public class SqlRegrCountAggFunction extends SqlCountAggFunction {
public SqlRegrCountAggFunction(SqlKind kind) {
super("REGR_COUNT", OperandTypes.NUMERIC_NUMERIC);
super("REGR_COUNT", OperandTypes.NUMERIC_NUMERIC, kind);
checkArgument(SqlKind.REGR_COUNT == kind, "unsupported sql kind: " + kind);
}
}
Loading