Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change some name typo and rename relational.sql.tree package to relational.sql.ast to avoid confusing with tree model #12697

Merged
merged 1 commit into from
Jun 11, 2024
Merged

change some name typo and rename relational.sql.tree package to relational.sql.ast to avoid confusing with tree model #12697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ private TSExecuteStatementResp executeStatementInternal(
schemaFetcher,
req.getTimeout());
} else {
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement s =
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement s =
relationSqlParser.createStatement(statement);

if (s == null) {
Expand Down
2 changes: 1 addition & 1 deletion ...b-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType;
import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics;

import org.apache.tsfile.read.filter.basic.Filter;
Expand Down
66 changes: 33 additions & 33 deletions ...n/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,39 @@
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticUnaryExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AstVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BinaryLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Cast;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CoalesceExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CurrentDatabase;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CurrentTime;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CurrentUser;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DecimalLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DoubleLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IfExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InListExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IsNotNullPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IsNullPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LikePredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Literal;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LongLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NotExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NullIfExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NullLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SearchedCaseExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleCaseExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.StringLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SymbolReference;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Trim;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim;
import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer;
Expand Down
24 changes: 12 additions & 12 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
import org.apache.iotdb.db.queryengine.plan.planner.TreeModelPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationalModelPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DescribeTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowTables;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use;
import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.utils.SetThreadName;
Expand Down Expand Up @@ -233,7 +233,7 @@ private IQueryExecution createQueryExecutionForTreeModel(
}

public ExecutionResult executeForTableModel(
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement statement,
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement,
SqlParser sqlParser,
IClientSession clientSession,
long queryId,
Expand All @@ -257,7 +257,7 @@ public ExecutionResult executeForTableModel(
}

private IQueryExecution createQueryExecutionForTableModel(
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement statement,
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement,
SqlParser sqlParser,
IClientSession clientSession,
MPPQueryContext queryContext,
Expand All @@ -280,7 +280,7 @@ private IQueryExecution createQueryExecutionForTableModel(
executor,
statement.accept(new TableConfigTaskVisitor(clientSession, metadata), queryContext));
}
RelationalModelPlanner treeModelPlanner =
RelationalModelPlanner relationalModelPlanner =
new RelationalModelPlanner(
statement,
sqlParser,
Expand All @@ -290,7 +290,7 @@ private IQueryExecution createQueryExecutionForTableModel(
scheduledExecutor,
SYNC_INTERNAL_SERVICE_CLIENT_MANAGER,
ASYNC_INTERNAL_SERVICE_CLIENT_MANAGER);
return new QueryExecution(treeModelPlanner, queryContext, executor);
return new QueryExecution(relationalModelPlanner, queryContext, executor);
}

public IQueryExecution getQueryExecution(Long queryId) {
Expand Down
6 changes: 3 additions & 3 deletions ...e/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public static Filter convertPredicateToTimeFilter(Expression predicate) {
}

public static Filter convertPredicateToTimeFilter(
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression predicate) {
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression predicate) {
if (predicate == null) {
return null;
}
Expand All @@ -308,7 +308,7 @@ public static Filter convertPredicateToFilter(
}

public static Filter convertPredicateToFilter(
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression predicate,
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression predicate,
List<String> allMeasurements,
Map<Symbol, ColumnSchema> schemaMap) {
if (predicate == null) {
Expand Down Expand Up @@ -429,7 +429,7 @@ public static boolean predicateCanPushIntoScan(Expression predicate) {
}

public static boolean predicateCanPushIntoScan(
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression predicate) {
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression predicate) {
return new org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate
.PredicatePushIntoScanChecker()
.process(predicate, null);
Expand Down
26 changes: 13 additions & 13 deletions ...in/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.ShowTablesTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.UseDBTask;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AstVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ColumnDefinition;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CurrentDatabase;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataType;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DescribeTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowTables;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException;

import org.apache.tsfile.common.conf.TSFileDescriptor;
Expand Down
8 changes: 4 additions & 4 deletions ...apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.expression.visitor.TransformToViewExpressionVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write.view.AlterLogicalViewNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountTimeSlotListStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CreateContinuousQueryStatement;
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write.view.AlterLogicalViewNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountDatabaseStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountTimeSlotListStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.CreateContinuousQueryStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...g/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB;

import com.google.common.util.concurrent.ListenableFuture;

Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DropDBTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;

import com.google.common.util.concurrent.ListenableFuture;

Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB;
import org.apache.iotdb.rpc.TSStatusCode;

import com.google.common.util.concurrent.ListenableFuture;
Expand Down
2 changes: 1 addition & 1 deletion .../org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/UseDBTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;

import com.google.common.util.concurrent.ListenableFuture;

Expand Down
2 changes: 1 addition & 1 deletion ...de/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;

Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan;

import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils;
import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;

import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.utils.ReadWriteIOUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...tanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static TimePredicate deserialize(ByteBuffer byteBuffer) {
return new TreeModelTimePredicate(Expression.deserialize(byteBuffer));
} else {
return new TableModelTimePredicate(
org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression.deserialize(
org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression.deserialize(
byteBuffer));
}
}
Expand Down
Loading
Loading