This is an automated email from the ASF dual-hosted git repository. chenyz pushed a commit to branch builtin-udtf in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1496caa6ac881a25447da50e1d1fef14be999317 Author: Chen YZ <[email protected]> AuthorDate: Wed Mar 19 17:12:26 2025 +0800 save --- .../distribute/TableDistributedPlanGenerator.java | 16 ++++++++++------ .../operator/process/tvf/TableFunctionOperatorTest.java | 3 ++- .../builtin/relational/TableBuiltinTableFunction.java | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) 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 7f8ca7a4883..5ddeb38bad8 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 @@ -292,7 +292,7 @@ public class TableDistributedPlanGenerator boolean pushDown = context.isPushDownGrouping(); try { context.setPushDownGrouping(node.isEnableParalleled()); - if (node.isEnableParalleled()) { +// if (node.isEnableParalleled()) { List<PlanNode> result = new ArrayList<>(); context.setExpectedOrderingScheme(node.getOrderingScheme()); List<PlanNode> childrenNodes = node.getChild().accept(this, context); @@ -310,13 +310,13 @@ public class TableDistributedPlanGenerator false, node.getPartitionKeyCount() - 1); result.add(subSortNode); - nodeOrderingMap.put(subSortNode.getPlanNodeId(), subSortNode.getOrderingScheme()); +// nodeOrderingMap.put(subSortNode.getPlanNodeId(), subSortNode.getOrderingScheme()); } } return result; - } else { - return visitSort(node, context); - } +// } else { +// return visitSort(node, context); +// } } finally { context.setPushDownGrouping(pushDown); } @@ -495,7 +495,7 @@ public class TableDistributedPlanGenerator final DeviceTableScanNode node, final PlanContext context) { if (context.isPushDownGrouping()) { return constructDeviceTableScanByTags(node, context); -// return constructDeviceTableScanTmp(node, context); + // return constructDeviceTableScanTmp(node, context); } else { return constructDeviceTableScanByRegionReplicaSet(node, context); } @@ -1094,6 +1094,10 @@ public class TableDistributedPlanGenerator } } + // select * from TABLE(p99(TABLE(t1)) + // TFN -> ScanNode + + private void buildRegionNodeMap( AggregationTableScanNode originalAggTableScanNode, List<List<TRegionReplicaSet>> regionReplicaSetsList, diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index 687d15a8fb6..bbf943b5bde 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -203,7 +203,8 @@ public class TableFunctionOperatorTest { Collections.singletonList(1), Arrays.asList(0, 1, 3), Arrays.asList(0, 1, 2, 3), - Arrays.asList(TSDataType.TIMESTAMP, TSDataType.STRING, TSDataType.DOUBLE, TSDataType.INT32)); + Arrays.asList( + TSDataType.TIMESTAMP, TSDataType.STRING, TSDataType.DOUBLE, TSDataType.INT32)); PartitionState state = partitionRecognizer.nextState(); Assert.assertEquals(PartitionState.INIT_STATE, state); Assert.assertEquals(PartitionState.INIT_STATE, partitionRecognizer.nextState()); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java index 32cc9cd9ad6..a86e96328d6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/relational/TableBuiltinTableFunction.java @@ -19,8 +19,8 @@ package org.apache.iotdb.commons.udf.builtin.relational; -import org.apache.iotdb.commons.udf.builtin.relational.tvf.HOPTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CapacityTableFunction; +import org.apache.iotdb.commons.udf.builtin.relational.tvf.HOPTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.SessionTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.VariationTableFunction; import org.apache.iotdb.udf.api.relational.TableFunction;
