This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch last_cache in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ad4343e8e5cdebed0a6ccaf088e5542e1083f1a7 Author: Beyyes <[email protected]> AuthorDate: Fri Oct 25 11:05:03 2024 +0800 fix it --- .../db/it/IoTDBMultiIDsWithAttributesTableIT.java | 31 ++++++++++++++-------- .../plan/planner/plan/node/PlanGraphPrinter.java | 2 +- .../distribute/TableDistributedPlanGenerator.java | 10 +++---- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiIDsWithAttributesTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiIDsWithAttributesTableIT.java index 34b8af428a3..b344c5ffc8f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiIDsWithAttributesTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiIDsWithAttributesTableIT.java @@ -615,7 +615,14 @@ public class IoTDBMultiIDsWithAttributesTableIT { retArray, DATABASE_NAME); - // TODO select count(*),count(t1) from (select avg(num+1) as t1 from table0) where time < 0 + expectedHeader = buildHeaders(2); + sql = + "select count(*),count(t1),sum(t1) from (select avg(num+1) as t1 from table0 where time < 0)"; + retArray = + new String[] { + "1,0,null,", + }; + tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME); expectedHeader = buildHeaders(1); retArray = @@ -908,17 +915,19 @@ public class IoTDBMultiIDsWithAttributesTableIT { "1970-01-01T00:00:00.000Z,1970-01-01T00:00:00.000Z,", "1970-01-01T00:00:00.000Z,1970-01-01T00:00:00.000Z," }; + tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME); - // TODO(beyyes) test below - // sql = "select count(*) from (\n" + - // "\tselect device, level, date_bin(1d, time) as bin, \n" + - // "\tcount(num) as count_num, count(*) as count_star, count(device) as - // count_device, - // count(date) as count_date, count(attr1) as count_attr1, count(attr2) as count_attr2, - // count(time) as count_time, avg(num) as avg_num \n" + - // "\tfrom table0 \n" + - // "\tgroup by 3, device, level order by device, level, bin\n" + - // ")\n"; + sql = + "select count(*) from (" + + "select device, level, date_bin(1d, time) as bin, " + + "count(num) as count_num, count(*) as count_star, count(device) as count_device, count(date) as count_date, count(attr1) as count_attr1, count(attr2) as count_attr2, count(time) as count_time, avg(num) as avg_num \n" + + "from table0 " + + "group by 3, device, level order by device, level, bin)"; + retArray = + new String[] { + "28,", + }; + tableResultSetEqualTest(sql, expectedHeader, retArray, DATABASE_NAME); } @Test diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java index d33f0b24481..008369fed2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java @@ -631,7 +631,7 @@ public class PlanGraphPrinter extends PlanVisitor<List<String>, PlanGraphPrinter String.format( "RegionId: %s", node.getRegionReplicaSet() == null || node.getRegionReplicaSet().getRegionId() == null - ? "" + ? "Not Assign" : node.getRegionReplicaSet().getRegionId().getId())); return render(node, boxValue, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java index 925bc23fb2a..71fe54f45ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java @@ -453,12 +453,10 @@ public class TableDistributedPlanGenerator for (DeviceEntry deviceEntry : node.getDeviceEntries()) { List<TRegionReplicaSet> regionReplicaSets = - analysis - .getDataPartitionInfo() - .getDataRegionReplicaSetWithTimeFilter( - node.getQualifiedObjectName().getDatabaseName(), - deviceEntry.getDeviceID(), - node.getTimeFilter()); + analysis.getDataRegionReplicaSetWithTimeFilter( + node.getQualifiedObjectName().getDatabaseName(), + deviceEntry.getDeviceID(), + node.getTimeFilter()); for (TRegionReplicaSet regionReplicaSet : regionReplicaSets) { TableScanNode tableScanNode =
