@@ -383,7 +383,6 @@ public Env transformUnion(Env env, RelRN.Union union) {
383383 @ Override
384384 public Env transformIntersect (Env env , RelRN .Intersect intersect ) {
385385 if (env .rulename .equals ("PruneEmptyIntersect" )) {
386- // 特殊处理:直接生成正确的代码
387386 String builderVar = env .statements ().get (0 ).split (" " )[1 ];
388387 return env .focus (
389388 builderVar + ".push(call.rel(1)).empty()" +
@@ -492,7 +491,6 @@ public Env onMatchCustom(Env env, RelRN custom) {
492491 case org .qed .RRuleInstances .UnionToDistinct .DistinctUnion u -> {
493492 var leftMatch = onMatch (env .next (), u .left ());
494493 var rightMatch = onMatch (leftMatch .next (), u .right ());
495- // Match Union DISTINCT (all=false)
496494 yield rightMatch .grow (
497495 "operand(LogicalUnion.class)" +
498496 ".predicate(union -> !union.all)" +
@@ -640,13 +638,11 @@ else if (env.rulename.equals("AggregateExtractProject")) {
640638 return env .focus ("org.qed.Backends.Calcite.HelperFunctions.extractProjectForAggregate(call)" );
641639 }
642640 else if (env .rulename .equals ("AggregateJoinRemove" )) {
643- // 直接手动构建,不用递归transform
644641 var groupSetDecl = env .declare ("((LogicalAggregate) call.rel(0)).getGroupSet()" );
645642 var envWithGroupSet = groupSetDecl .getValue ();
646643 var aggCallsDecl = envWithGroupSet .declare ("((LogicalAggregate) call.rel(0)).getAggCallList()" );
647644 var envWithAggCalls = aggCallsDecl .getValue ();
648645
649- // 从statements里提取builder变量名 (第一个statement就是 "var var_X = call.builder();")
650646 String builderVar = env .statements ().get (0 ).split (" " )[1 ];
651647
652648 return envWithAggCalls .focus (
@@ -659,7 +655,6 @@ else if (env.rulename.equals("AggregateJoinJoinRemove")) {
659655 return env .focus ("org.qed.Backends.Calcite.HelperFunctions.aggregateJoinJoinRemove(call)" );
660656 }
661657
662- // Default aggregate transformation for other rules
663658 var sourceTransform = transform (env , aggregate .source ());
664659 String builderWithSource = sourceTransform .current ();
665660
0 commit comments