This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/fixPushDownProject in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8ba69593e3629b7f0d27d61f222f06c82720c5df Author: Minghui Liu <[email protected]> AuthorDate: Tue May 14 00:33:31 2024 +0800 fix UT --- .../distribution/AggregationAlignByDeviceTest.java | 44 --- .../planner/distribution/AlignedByDeviceTest.java | 328 ++------------------- 2 files changed, 27 insertions(+), 345 deletions(-) diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java index 1753102d812..f6bb0deea1c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java @@ -209,17 +209,6 @@ public class AggregationAlignByDeviceTest { firstFiTopNode.getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); assertTrue( firstFiTopNode.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - firstFiTopNode - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); secondFiRoot = plan.getInstances().get(1).getFragment().getPlanNodeTree(); @@ -229,17 +218,6 @@ public class AggregationAlignByDeviceTest { secondFiRoot.getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); assertTrue( secondFiRoot.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - secondFiRoot - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); // two aggregation measurement, two devices, with filter @@ -260,17 +238,6 @@ public class AggregationAlignByDeviceTest { firstFiTopNode.getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); assertTrue( firstFiTopNode.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - firstFiTopNode - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); secondFiRoot = plan.getInstances().get(1).getFragment().getPlanNodeTree(); @@ -280,17 +247,6 @@ public class AggregationAlignByDeviceTest { secondFiRoot.getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); assertTrue( secondFiRoot.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - secondFiRoot - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java index 80a024ce7f6..9788584e217 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java @@ -137,14 +137,16 @@ public class AlignedByDeviceTest { assertTrue(f1Root.getChildren().get(0).getChildren().get(0) instanceof DeviceViewNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof RawDataAggregationNode); + instanceof SeriesAggregationScanNode); assertTrue( - f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); + f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(1) + instanceof SeriesAggregationScanNode); assertTrue(f2Root instanceof IdentitySinkNode); assertTrue(f2Root.getChildren().get(0) instanceof DeviceViewNode); - assertTrue(f2Root.getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); - assertTrue(f2Root.getChildren().get(0).getChildren().get(1) instanceof RawDataAggregationNode); + assertTrue( + f2Root.getChildren().get(0).getChildren().get(0) instanceof SeriesAggregationScanNode); + assertTrue( + f2Root.getChildren().get(0).getChildren().get(1) instanceof SeriesAggregationScanNode); // test of MULTI_SERIES sql = @@ -163,17 +165,7 @@ public class AlignedByDeviceTest { f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) + f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) instanceof LeftOuterTimeJoinNode); assertTrue( f1Root @@ -187,8 +179,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof SeriesSourceNode); assertTrue(f1Root.getChildren().get(0).getChildren().get(1) instanceof ExchangeNode); assertTrue( @@ -371,106 +361,26 @@ public class AlignedByDeviceTest { assertTrue(f1Root.getChildren().get(0).getChildren().get(0) instanceof SingleDeviceViewNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof RawDataAggregationNode); + instanceof AggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof FullOuterTimeJoinNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof SeriesScanNode); + instanceof SeriesAggregationScanNode); assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(1) + f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(1) instanceof ExchangeNode); assertTrue(f1Root.getChildren().get(0).getChildren().get(1) instanceof SingleDeviceViewNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0) - instanceof RawDataAggregationNode); + instanceof AggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof FullOuterTimeJoinNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof SeriesScanNode); + instanceof SeriesAggregationScanNode); assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(1) + f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0).getChildren().get(1) instanceof ExchangeNode); assertTrue(f2Root instanceof ShuffleSinkNode); - assertTrue(f2Root.getChildren().get(0) instanceof SeriesSourceNode); - assertTrue(f2Root.getChildren().get(1) instanceof SeriesSourceNode); + assertTrue(f2Root.getChildren().get(0) instanceof SeriesAggregationScanNode); + assertTrue(f2Root.getChildren().get(1) instanceof SeriesAggregationScanNode); // test of MULTI_SERIES sql = @@ -490,19 +400,6 @@ public class AlignedByDeviceTest { instanceof RawDataAggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); assertTrue( f1Root @@ -516,8 +413,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof FullOuterTimeJoinNode); assertTrue( f1Root @@ -533,8 +428,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof SeriesSourceNode); assertTrue( f1Root @@ -549,8 +442,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) instanceof ExchangeNode); assertTrue(f1Root.getChildren().get(0).getChildren().get(1) instanceof SingleDeviceViewNode); @@ -559,19 +450,6 @@ public class AlignedByDeviceTest { instanceof RawDataAggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); assertTrue( f1Root @@ -585,8 +463,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof FullOuterTimeJoinNode); assertTrue( f1Root @@ -602,8 +478,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof SeriesSourceNode); assertTrue( f1Root @@ -618,8 +492,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) instanceof ExchangeNode); assertTrue(f2Root instanceof ShuffleSinkNode); @@ -739,23 +611,7 @@ public class AlignedByDeviceTest { assertTrue(f1Root.getChildren().get(0).getChildren().get(0) instanceof DeviceViewNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof RawDataAggregationNode); - assertTrue( - f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof SeriesScanNode); + instanceof SeriesAggregationScanNode); assertTrue(f2Root instanceof IdentitySinkNode); assertTrue(f2Root.getChildren().get(0) instanceof DeviceViewNode); assertTrue(f3Root instanceof IdentitySinkNode); @@ -778,8 +634,8 @@ public class AlignedByDeviceTest { f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0) instanceof RawDataAggregationNode); assertTrue( - f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); + f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(1) + instanceof RawDataAggregationNode); assertTrue(f2Root instanceof IdentitySinkNode); assertTrue(f2Root.getChildren().get(0) instanceof DeviceViewNode); assertTrue(f3Root instanceof IdentitySinkNode); @@ -961,107 +817,27 @@ public class AlignedByDeviceTest { assertTrue(f1Root.getChildren().get(0).getChildren().get(0) instanceof SingleDeviceViewNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof RawDataAggregationNode); + instanceof AggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof FullOuterTimeJoinNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof SeriesScanNode); + instanceof SeriesAggregationScanNode); assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(1) + f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(1) instanceof ExchangeNode); assertTrue(f1Root.getChildren().get(0).getChildren().get(1) instanceof SingleDeviceViewNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0) - instanceof RawDataAggregationNode); + instanceof AggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof FullOuterTimeJoinNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - instanceof SeriesScanNode); + instanceof SeriesAggregationScanNode); assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(1) + f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0).getChildren().get(1) instanceof ExchangeNode); assertTrue(f2Root instanceof ShuffleSinkNode); - assertTrue(f2Root.getChildren().get(0) instanceof SeriesScanNode); + assertTrue(f2Root.getChildren().get(0) instanceof SeriesAggregationScanNode); assertTrue(f3Root instanceof ShuffleSinkNode); - assertTrue(f3Root.getChildren().get(0) instanceof SeriesScanNode); + assertTrue(f3Root.getChildren().get(0) instanceof SeriesAggregationScanNode); // test of MULTI_SERIES sql = @@ -1082,19 +858,6 @@ public class AlignedByDeviceTest { instanceof RawDataAggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(0).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); assertTrue( f1Root @@ -1108,8 +871,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof FullOuterTimeJoinNode); assertTrue( f1Root @@ -1125,8 +886,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof SeriesSourceNode); assertTrue( f1Root @@ -1141,8 +900,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) instanceof ExchangeNode); assertTrue( @@ -1156,8 +913,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) instanceof FullOuterTimeJoinNode); assertTrue( @@ -1171,8 +926,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) .getChildren() .get(0) @@ -1188,8 +941,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) .getChildren() .get(1) @@ -1200,19 +951,6 @@ public class AlignedByDeviceTest { instanceof RawDataAggregationNode); assertTrue( f1Root.getChildren().get(0).getChildren().get(1).getChildren().get(0).getChildren().get(0) - instanceof ProjectNode); - assertTrue( - f1Root - .getChildren() - .get(0) - .getChildren() - .get(1) - .getChildren() - .get(0) - .getChildren() - .get(0) - .getChildren() - .get(0) instanceof LeftOuterTimeJoinNode); assertTrue( f1Root @@ -1226,8 +964,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof FullOuterTimeJoinNode); assertTrue( f1Root @@ -1243,8 +979,6 @@ public class AlignedByDeviceTest { .get(0) .getChildren() .get(0) - .getChildren() - .get(0) instanceof SeriesSourceNode); assertTrue( f1Root @@ -1259,8 +993,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) instanceof ExchangeNode); assertTrue( @@ -1274,8 +1006,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) instanceof FullOuterTimeJoinNode); assertTrue( @@ -1289,8 +1019,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) .getChildren() .get(0) @@ -1306,8 +1034,6 @@ public class AlignedByDeviceTest { .getChildren() .get(0) .getChildren() - .get(0) - .getChildren() .get(1) .getChildren() .get(1)
