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
The following commit(s) were added to refs/heads/ty/TableModelGrammar by this
push:
new a37a10e150d change wrong using Session to SessionInfo
a37a10e150d is described below
commit a37a10e150d92a7b9c38637516f51e340608161b
Author: JackieTien97 <[email protected]>
AuthorDate: Sun Apr 7 16:59:31 2024 +0800
change wrong using Session to SessionInfo
---
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 47 +---------------------
.../plan/relational/planner/LogicalPlanner.java | 6 +--
.../plan/relational/planner/PlanBuilder.java | 7 ++--
.../plan/relational/planner/QueryPlanner.java | 6 +--
.../plan/relational/planner/RelationPlanner.java | 6 +--
.../relational/planner/RelationalModelPlanner.java | 2 +-
6 files changed, 16 insertions(+), 58 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
index a8ba63cc813..f970838f31b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
@@ -81,15 +81,8 @@ import
org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationSt
import
org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions;
-import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType;
-import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnHandle;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
-import
org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException;
-import
org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
-import
org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction;
-import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableHandle;
-import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadata;
-import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema;
+import
org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
@@ -182,7 +175,6 @@ import org.apache.iotdb.tsfile.read.common.block.TsBlock;
import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
import org.apache.iotdb.tsfile.read.common.block.column.Column;
import org.apache.iotdb.tsfile.read.common.block.column.TsBlockSerde;
-import org.apache.iotdb.tsfile.read.common.type.Type;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import org.apache.iotdb.tsfile.read.filter.factory.TimeFilterApi;
import org.apache.iotdb.tsfile.utils.Binary;
@@ -277,42 +269,7 @@ public class ClientRPCServiceImpl implements
IClientRPCServiceWithHandler {
public ClientRPCServiceImpl() {
partitionFetcher = ClusterPartitionFetcher.getInstance();
schemaFetcher = ClusterSchemaFetcher.getInstance();
- metadata =
- new Metadata() {
- @Override
- public boolean tableExists(QualifiedObjectName name) {
- return false;
- }
-
- @Override
- public TableSchema getTableSchema(SessionInfo session, TableHandle
tableHandle) {
- return null;
- }
-
- @Override
- public TableMetadata getTableMetadata(SessionInfo session,
TableHandle tableHandle) {
- return null;
- }
-
- @Override
- public Optional<TableHandle> getTableHandle(
- SessionInfo session, QualifiedObjectName name) {
- return Optional.empty();
- }
-
- @Override
- public Map<String, ColumnHandle> getColumnHandles(
- SessionInfo session, TableHandle tableHandle) {
- return null;
- }
-
- @Override
- public ResolvedFunction resolveOperator(
- OperatorType operatorType, List<? extends Type> argumentTypes)
- throws OperatorNotFoundException {
- return null;
- }
- };
+ metadata = new TableMetadataImpl();
relationSqlParser = new SqlParser();
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
index 1f578074143..517f627106f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
@@ -15,6 +15,7 @@ package
org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
@@ -25,7 +26,6 @@ import
org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.relational.sql.tree.Query;
import org.apache.iotdb.db.relational.sql.tree.Statement;
import org.apache.iotdb.db.relational.sql.tree.Table;
-import org.apache.iotdb.session.Session;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -44,7 +44,7 @@ public class LogicalPlanner {
private final MPPQueryContext context;
- private final Session session;
+ private final SessionInfo session;
private final SymbolAllocator symbolAllocator = new SymbolAllocator();
private final Metadata metadata;
private final WarningCollector warningCollector;
@@ -52,7 +52,7 @@ public class LogicalPlanner {
public LogicalPlanner(
MPPQueryContext context,
Metadata metadata,
- Session session,
+ SessionInfo session,
WarningCollector warningCollector) {
this.context = context;
this.metadata = metadata;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java
index cd29f30a1c4..2045233cb37 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java
@@ -14,12 +14,12 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.db.queryengine.common.QueryId;
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope;
import
org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.relational.sql.tree.Expression;
-import org.apache.iotdb.session.Session;
import com.google.common.collect.ImmutableMap;
@@ -38,7 +38,8 @@ class PlanBuilder {
this.root = root;
}
- public static PlanBuilder newPlanBuilder(RelationPlan plan, Analysis
analysis, Session session) {
+ public static PlanBuilder newPlanBuilder(
+ RelationPlan plan, Analysis analysis, SessionInfo session) {
return newPlanBuilder(plan, analysis, ImmutableMap.of(), session);
}
@@ -46,7 +47,7 @@ class PlanBuilder {
RelationPlan plan,
Analysis analysis,
Map<ScopeAware<Expression>, Symbol> mappings,
- Session session) {
+ SessionInfo session) {
return new PlanBuilder(plan.getRoot());
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java
index fde2f1530ae..8a94321d735 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java
@@ -14,6 +14,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.db.queryengine.common.QueryId;
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef;
@@ -29,7 +30,6 @@ import org.apache.iotdb.db.relational.sql.tree.OrderBy;
import org.apache.iotdb.db.relational.sql.tree.Query;
import org.apache.iotdb.db.relational.sql.tree.QuerySpecification;
import org.apache.iotdb.db.relational.sql.tree.SortItem;
-import org.apache.iotdb.session.Session;
import org.apache.iotdb.tsfile.read.common.type.Type;
import com.google.common.collect.ImmutableList;
@@ -54,7 +54,7 @@ class QueryPlanner {
private final QueryId idAllocator;
// private final Map<NodeRef<LambdaArgumentDeclaration>, Symbol>
lambdaDeclarationToSymbolMap;
// private final PlannerContext plannerContext;
- private final Session session;
+ private final SessionInfo session;
// private final SubqueryPlanner subqueryPlanner;
private final Map<NodeRef<Node>, RelationPlan> recursiveSubqueries;
@@ -62,7 +62,7 @@ class QueryPlanner {
Analysis analysis,
SymbolAllocator symbolAllocator,
QueryId idAllocator,
- Session session,
+ SessionInfo session,
Map<NodeRef<Node>, RelationPlan> recursiveSubqueries) {
requireNonNull(analysis, "analysis is null");
requireNonNull(symbolAllocator, "symbolAllocator is null");
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
index a3ae2c9e715..ec08bd7f4d3 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
@@ -14,6 +14,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.db.queryengine.common.QueryId;
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field;
@@ -31,7 +32,6 @@ import org.apache.iotdb.db.relational.sql.tree.Query;
import org.apache.iotdb.db.relational.sql.tree.QuerySpecification;
import org.apache.iotdb.db.relational.sql.tree.SubqueryExpression;
import org.apache.iotdb.db.relational.sql.tree.Table;
-import org.apache.iotdb.session.Session;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -49,14 +49,14 @@ class RelationPlanner extends AstVisitor<RelationPlan,
Void> {
private final Analysis analysis;
private final SymbolAllocator symbolAllocator;
private final QueryId idAllocator;
- private final Session session;
+ private final SessionInfo session;
private final Map<NodeRef<Node>, RelationPlan> recursiveSubqueries;
RelationPlanner(
Analysis analysis,
SymbolAllocator symbolAllocator,
QueryId idAllocator,
- Session session,
+ SessionInfo session,
Map<NodeRef<Node>, RelationPlan> recursiveSubqueries) {
requireNonNull(analysis, "analysis is null");
requireNonNull(symbolAllocator, "symbolAllocator is null");
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationalModelPlanner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationalModelPlanner.java
index df6a4902e1a..e3b19c5d59c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationalModelPlanner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationalModelPlanner.java
@@ -107,7 +107,7 @@ public class RelationalModelPlanner implements IPlanner {
public LogicalQueryPlan doLogicalPlan(IAnalysis analysis, MPPQueryContext
context) {
// TODO need implemented by Beyyes
try {
- new LogicalPlanner(context, metadata, null, null).plan((Analysis)
analysis);
+ new LogicalPlanner(context, metadata, null,
warningCollector).plan((Analysis) analysis);
} catch (IoTDBException e) {
throw new RuntimeException(e);
}
