godfreyhe commented on a change in pull request #10760:
[FLINK-15466][table-planner] Fix bug of `FlinkAggregateExpandDistinct…
URL: https://github.com/apache/flink/pull/10760#discussion_r363136157
##########
File path:
flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateExpandDistinctAggregatesRule.java
##########
@@ -471,10 +474,24 @@ private void rewriteUsingGroupingSets(RelOptRuleCall
call,
final RexNode nodeZ = nodes.remove(nodes.size() - 1);
for (Map.Entry<ImmutableBitSet, Integer> entry :
filters.entrySet()) {
final long v = groupValue(fullGroupSet,
entry.getKey());
- nodes.add(
+ // Remap and get the filterArg of the distinct
aggregate call.
+ int distinctAggCallFilterArg =
remap(fullGroupSet,
+
groupSetToDistinctAggCallFilterArg.getOrDefault(entry.getKey(), -1));
+ if (distinctAggCallFilterArg < 0) {
+ nodes.add(
relBuilder.alias(
-
relBuilder.equals(nodeZ, relBuilder.literal(v)),
- "$g_" + v));
+
relBuilder.equals(nodeZ, relBuilder.literal(v)),
+ "$g_" + v));
+ } else {
+ RexBuilder rexBuilder =
aggregate.getCluster().getRexBuilder();
+ // merge the filter of the distinct
aggregate call itself.
+ nodes.add(relBuilder.alias(
Review comment:
it's better to extract `nodes.add(relBuilder.alias(project, "$g_" + v)` as
common part
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
