This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/TableModelGrammar in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit eff3915bcfdcb3e27a45c6b0e3a8bedcef389743 Author: JackieTien97 <[email protected]> AuthorDate: Thu Apr 18 10:03:08 2024 +0800 resolve conflicts --- .../iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java | 2 +- .../queryengine/plan/relational/planner/node/TableScanNode.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java index bd699c18b5e..ea34df6f712 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java @@ -91,7 +91,7 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution List<ColumnSchema> columnSchemas = new ArrayList<>(outputColumnCount); int[] columnsIndexArray = new int[outputColumnCount]; Map<Symbol, ColumnSchema> columnSchemaMap = node.getAssignments(); - Map<Symbol, Integer> idAndAttributeColumnsIndexMap = node.getAttributesMap(); + Map<Symbol, Integer> idAndAttributeColumnsIndexMap = node.getIdAndAttributeIndexMap(); List<String> measurementColumnNames = new ArrayList<>(); List<IMeasurementSchema> measurementSchemas = new ArrayList<>(); int measurementColumnCount = 0; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java index f62896907cc..ee599da87e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java @@ -125,10 +125,6 @@ public class TableScanNode extends PlanNode { return this.qualifiedTableName; } - public List<DeviceEntry> getDeviceEntries() { - return this.deviceEntries; - } - public void setDeviceEntries(List<DeviceEntry> deviceEntries) { this.deviceEntries = deviceEntries; } @@ -149,10 +145,6 @@ public class TableScanNode extends PlanNode { return deviceEntries; } - public Map<Symbol, Integer> getAttributesMap() { - return attributesMap; - } - public Expression getPushDownPredicate() { return this.pushDownPredicate; }
