(iotdb) branch ty/TableModelGrammar updated: fix typeprovider

[caogaofei]

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/ty/TableModelGrammar by this 
push:
     new b9044f09c0a fix typeprovider
b9044f09c0a is described below

commit b9044f09c0a8ec1a3c17c7e955e6fa3bed6416ae
Author: Beyyes <cgf1...@foxmail.com>
AuthorDate: Thu Apr 18 10:24:05 2024 +0800

    fix typeprovider
---
 .../queryengine/execution/relational/ColumnTransformerBuilder.java  | 2 +-
 .../iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java   | 2 +-
 .../db/queryengine/plan/relational/planner/node/OutputNode.java     | 6 ++++++
 .../db/queryengine/plan/relational/planner/node/ProjectNode.java    | 4 ----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
index 2685376f87a..ca90eff8dc0 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
@@ -668,7 +668,7 @@ public class ColumnTransformerBuilder
     }
 
     public Type getType(SymbolReference symbolReference) {
-      return typeProvider.get(Symbol.from(symbolReference));
+      return typeProvider.getTableModelType(Symbol.from(symbolReference));
     }
   }
 }
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 ea34df6f712..d027ceb6498 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
@@ -364,7 +364,7 @@ public class TableOperatorGenerator extends 
PlanVisitor<Operator, LocalExecution
     return node.getChildren().stream()
         .map(PlanNode::getOutputSymbols)
         .flatMap(List::stream)
-        .map(s -> getTSDataType(typeProvider.get(s)))
+        .map(s -> getTSDataType(typeProvider.getTableModelType(s)))
         .collect(Collectors.toList());
   }
 
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java
index 514a7bce382..9b06d0b8d40 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java
@@ -2,6 +2,7 @@ package 
org.apache.iotdb.db.queryengine.plan.relational.planner.node;
 
 import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
 import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
 import 
org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode;
 import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
 
@@ -27,6 +28,11 @@ public class OutputNode extends SingleChildProcessNode {
     this.outputs = ImmutableList.copyOf(outputs);
   }
 
+  @Override
+  public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+    return visitor.visitOutput(this, context);
+  }
+
   @Override
   public PlanNode clone() {
     return new OutputNode(id, child, columnNames, outputs);
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
index a05eb4b2f67..96f5da07379 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
@@ -49,8 +49,4 @@ public class ProjectNode extends SingleChildProcessNode {
   public List<Symbol> getOutputSymbols() {
     return assignments.getOutputs();
   }
-
-  public Assignments getAssignments() {
-    return this.assignments;
-  }
 }