Skip to content

Commit 0b9633e

Browse files
committed
[fix][core] Add catch error for AggregateExpandDistinctAggregatesRule
1 parent b2f1bab commit 0b9633e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,12 @@ public AggregateExpandDistinctAggregatesRule(
256256

257257
// For each set of operands, find and rewrite all calls which have that
258258
// set of operands.
259-
for (Pair<List<Integer>, Integer> argList : distinctCallArgLists) {
260-
doRewrite(relBuilder, aggregate, n++, argList.left, argList.right, refs);
259+
try {
260+
for (Pair<List<Integer>, Integer> argList : distinctCallArgLists) {
261+
doRewrite(relBuilder, aggregate, n++, argList.left, argList.right, refs);
262+
}
263+
} catch (Throwable e) {
264+
return;
261265
}
262266
// It is assumed doRewrite above replaces nulls in refs
263267
@SuppressWarnings("assignment.type.incompatible")

0 commit comments

Comments
 (0)