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 653912ecea9ac677bfbdec9a15186c490c1c6128
Merge: 87c5d8ada3b e40d2d4a79b
Author: JackieTien97 <[email protected]>
AuthorDate: Sat Apr 20 10:01:32 2024 +0800

    merge master

 .../source/relational/TableScanOperator.java       |  2 ++
 .../relational/ColumnTransformerBuilder.java       | 19 +++++++++----
 .../plan/planner/TableOperatorGenerator.java       | 28 ++++++++++++------
 .../relational/analyzer/StatementAnalyzer.java     | 33 +++++++++++++---------
 .../plan/relational/planner/LogicalPlanner.java    |  7 +++--
 .../plan/relational/planner/RelationPlanner.java   |  4 ---
 .../plan/relational/planner/SymbolAllocator.java   | 24 ++++++----------
 .../distribute/RelationalDistributionPlanner.java  | 16 +++++++++++
 8 files changed, 84 insertions(+), 49 deletions(-)

diff --cc 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java
index 6a60aeda038,96ce0ad30e7..306ce8d362a
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java
@@@ -18,10 -18,7 +18,8 @@@ import org.apache.iotdb.db.queryengine.
  import org.apache.iotdb.db.relational.sql.tree.Expression;
  import org.apache.iotdb.db.relational.sql.tree.FunctionCall;
  import org.apache.iotdb.db.relational.sql.tree.SymbolReference;
 -import org.apache.iotdb.tsfile.read.common.type.Type;
 +
- import com.google.common.primitives.Ints;
- import org.apache.tsfile.read.common.type.LongType;
 +import org.apache.tsfile.read.common.type.Type;
  
  import java.util.HashMap;
  import java.util.Map;

Reply via email to