Skip to content

HIVE-29399: Remove SqlSyntax.FUNCTION_STAR from AVG and SUM functions #6262

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

Merged
zabetak merged 1 commit into from
Jan 13, 2026
Merged

HIVE-29399: Remove SqlSyntax.FUNCTION_STAR from AVG and SUM functions #6262

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
6 changes: 0 additions & 6 deletions ...java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlAverageAggFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.calcite.sql.SqlFunctionCategory;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlSplittableAggFunction;
import org.apache.calcite.sql.SqlSyntax;
import org.apache.calcite.sql.type.SqlOperandTypeChecker;
import org.apache.calcite.sql.type.SqlOperandTypeInference;
import org.apache.calcite.sql.type.SqlReturnTypeInference;
Expand Down Expand Up @@ -52,9 +51,4 @@ public <T> T unwrap(Class<T> clazz) {
}
return super.unwrap(clazz);
}

@Override
public SqlSyntax getSyntax() {
return SqlSyntax.FUNCTION_STAR;
}
}
6 changes: 0 additions & 6 deletions ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlSplittableAggFunction;
import org.apache.calcite.sql.SqlSplittableAggFunction.SumSplitter;
import org.apache.calcite.sql.SqlSyntax;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.type.ReturnTypes;
import org.apache.calcite.sql.type.SqlOperandTypeChecker;
Expand Down Expand Up @@ -130,11 +129,6 @@ public AggregateCall topSplit(RexBuilder rexBuilder,
}
}

@Override
public SqlSyntax getSyntax() {
return SqlSyntax.FUNCTION_STAR;
}

@Override
public SqlAggFunction getRollup() {
return this;
Expand Down
6 changes: 3 additions & 3 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query1.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -1751,7 +1751,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -1803,7 +1803,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
8 changes: 4 additions & 4 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query11.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -1749,7 +1749,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2585,7 +2585,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2911,7 +2911,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query12.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -1455,7 +1455,7 @@
"op": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"operands": [
{
Expand Down
6 changes: 3 additions & 3 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query13.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2420,7 +2420,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "BIGINT",
Expand Down Expand Up @@ -2452,7 +2452,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2486,7 +2486,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
10 changes: 5 additions & 5 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query14.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5659,7 +5659,7 @@ Warning: Map Join MAPJOIN[1187][bigTable=?] in task 'Reducer 26' is a cross prod
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -8058,7 +8058,7 @@ Warning: Map Join MAPJOIN[1187][bigTable=?] in task 'Reducer 26' is a cross prod
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -10325,7 +10325,7 @@ Warning: Map Join MAPJOIN[1187][bigTable=?] in task 'Reducer 26' is a cross prod
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -10697,7 +10697,7 @@ Warning: Map Join MAPJOIN[1187][bigTable=?] in task 'Reducer 26' is a cross prod
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand All @@ -10715,7 +10715,7 @@ Warning: Map Join MAPJOIN[1187][bigTable=?] in task 'Reducer 26' is a cross prod
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "BIGINT",
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/results/clientpositive/perf/tpcds30tb/json/query15.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query16.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,7 +2862,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand All @@ -2880,7 +2880,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
18 changes: 9 additions & 9 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query17.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3876,7 +3876,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "BIGINT",
Expand All @@ -3892,7 +3892,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DOUBLE",
Expand All @@ -3908,7 +3908,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DOUBLE",
Expand Down Expand Up @@ -3956,7 +3956,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "BIGINT",
Expand All @@ -3972,7 +3972,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DOUBLE",
Expand All @@ -3988,7 +3988,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DOUBLE",
Expand Down Expand Up @@ -4036,7 +4036,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "BIGINT",
Expand All @@ -4052,7 +4052,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DOUBLE",
Expand All @@ -4068,7 +4068,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DOUBLE",
Expand Down
14 changes: 7 additions & 7 deletions ql/src/test/results/clientpositive/perf/tpcds30tb/json/query18.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2689,7 +2689,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2723,7 +2723,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2757,7 +2757,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2791,7 +2791,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2825,7 +2825,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2859,7 +2859,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down Expand Up @@ -2893,7 +2893,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/results/clientpositive/perf/tpcds30tb/json/query19.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,7 @@
"agg": {
"name": "sum",
"kind": "SUM",
"syntax": "FUNCTION_STAR"
"syntax": "FUNCTION"
},
"type": {
"type": "DECIMAL",
Expand Down
Loading