fix: Fixing issues encountered during the conflict resolution process

FearfulTomcat27 · FearfulTomcat27 · commit c9e8d5757209 · 2026-06-12T10:24:21.000+08:00
diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/TableOperatorGenerator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/TableOperatorGenerator.java
@@ -1330,7 +1330,6 @@ protected AggregationOperator planGlobalAggregation(
                         null,
                         Collections.emptySet(),
                         operatorContext.getMemoryReservationContext())));
-                        Collections.emptySet())));
     return createAggregationOperator(operatorContext, child, aggregatorBuilder.build());
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1330,7 +1330,6 @@ protected AggregationOperator planGlobalAggregation(`
`1330`	`1330`	`null,`
`1331`	`1331`	`Collections.emptySet(),`
`1332`	`1332`	`operatorContext.getMemoryReservationContext())));`
`1333`		`- Collections.emptySet())));`
`1334`	`1333`	`return createAggregationOperator(operatorContext, child, aggregatorBuilder.build());`
`1335`	`1334`	`}`
`1336`	`1335`