From 2f50e7599fd61fc76e4c982ec190ee5bcc49c186 Mon Sep 17 00:00:00 2001 From: JackieTien97 Date: Tue, 11 Jun 2024 12:26:25 +0800 Subject: [PATCH] change some name typo and rename relational.sql.tree package to relational.sql.ast to avoid confusing with tree model --- .../thrift/impl/ClientRPCServiceImpl.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../relational/ColumnTransformerBuilder.java | 66 +++--- .../db/queryengine/plan/Coordinator.java | 24 +-- .../plan/analyze/PredicateUtils.java | 6 +- .../config/TableConfigTaskVisitor.java | 26 +-- .../executor/ClusterConfigTaskExecutor.java | 8 +- .../config/executor/IConfigTaskExecutor.java | 8 +- .../metadata/relational/CreateDBTask.java | 2 +- .../metadata/relational/DropDBTask.java | 2 +- .../metadata/relational/ShowDBTask.java | 2 +- .../config/metadata/relational/UseDBTask.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 2 +- .../planner/plan/TableModelTimePredicate.java | 2 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../analyzer/AggregationAnalyzer.java | 66 +++--- .../plan/relational/analyzer/Analysis.java | 38 ++-- .../plan/relational/analyzer/Analyzer.java | 6 +- .../analyzer/CanonicalizationAware.java | 4 +- .../analyzer/ExpressionAnalysis.java | 10 +- .../analyzer/ExpressionAnalyzer.java | 90 ++++---- .../analyzer/ExpressionTreeUtils.java | 14 +- .../plan/relational/analyzer/Field.java | 2 +- .../plan/relational/analyzer/NodeRef.java | 2 +- .../plan/relational/analyzer/RelationId.java | 2 +- .../relational/analyzer/RelationType.java | 2 +- .../plan/relational/analyzer/Scope.java | 8 +- .../analyzer/ScopeReferenceExtractor.java | 4 +- .../analyzer/StatementAnalyzer.java | 142 ++++++------ .../ConvertPredicateToFilterVisitor.java | 38 ++-- .../ConvertPredicateToTimeFilterVisitor.java | 32 +-- .../PredicateCombineIntoTableScanChecker.java | 28 +-- .../PredicatePushIntoMetadataChecker.java | 30 +-- .../PredicatePushIntoScanChecker.java | 30 +-- .../analyzer/predicate/PredicateVisitor.java | 28 +-- .../plan/relational/metadata/Metadata.java | 2 +- .../relational/metadata/MetadataUtil.java | 4 +- .../metadata/TableMetadataImpl.java | 2 +- .../plan/relational/planner/Assignments.java | 2 +- .../relational/planner/LogicalPlanner.java | 6 +- .../planner/OrderingTranslator.java | 2 +- .../plan/relational/planner/PlanBuilder.java | 4 +- .../relational/planner/PredicateUtils.java | 22 +- .../plan/relational/planner/QueryPlanner.java | 20 +- .../relational/planner/RelationPlanner.java | 26 +-- .../planner/RelationalModelPlanner.java | 2 +- .../plan/relational/planner/ScopeAware.java | 6 +- .../plan/relational/planner/Symbol.java | 4 +- .../distribute/FragmentInstanceGenerator.java | 4 +- .../distribute/TableDistributionPlanner.java | 2 +- .../TableModelTypeProviderExtractor.java | 2 +- .../planner/ir/DefaultTraversalVisitor.java | 32 +-- .../planner/ir/DeterminismEvaluator.java | 4 +- .../planner/ir/ExpressionRewriter.java | 32 +-- .../ir/ExpressionTranslateVisitor.java | 32 +-- .../planner/ir/ExpressionTreeRewriter.java | 38 ++-- ...actCommonPredicatesExpressionRewriter.java | 6 +- .../ir/GlobalTimePredicateExtractVisitor.java | 44 ++-- .../plan/relational/planner/ir/IrUtils.java | 8 +- .../plan/relational/planner/ir/IrVisitor.java | 34 +-- .../ir/NormalizeOrExpressionRewriter.java | 12 +- .../planner/ir/RewritingVisitor.java | 32 +-- .../relational/planner/node/FilterNode.java | 2 +- .../relational/planner/node/ProjectNode.java | 2 +- .../planner/node/TableScanNode.java | 2 +- .../optimizations/FilterScanCombine.java | 8 +- .../planner/optimizations/IndexScan.java | 2 +- .../optimizations/PruneUnUsedColumns.java | 6 +- .../optimizations/SimplifyExpressions.java | 2 +- .../sql/{tree => ast}/AddColumn.java | 2 +- .../sql/{tree => ast}/AliasedRelation.java | 2 +- .../sql/{tree => ast}/AllColumns.java | 2 +- .../relational/sql/{tree => ast}/AllRows.java | 2 +- .../ArithmeticBinaryExpression.java | 2 +- .../ArithmeticUnaryExpression.java | 2 +- .../sql/{tree => ast}/AstVisitor.java | 2 +- .../sql/{tree => ast}/BetweenPredicate.java | 2 +- .../sql/{tree => ast}/BinaryLiteral.java | 2 +- .../sql/{tree => ast}/BooleanLiteral.java | 2 +- .../relational/sql/{tree => ast}/Cast.java | 2 +- .../sql/{tree => ast}/CoalesceExpression.java | 2 +- .../sql/{tree => ast}/ColumnDefinition.java | 2 +- .../{tree => ast}/ComparisonExpression.java | 2 +- .../sql/{tree => ast}/CreateDB.java | 2 +- .../sql/{tree => ast}/CreateFunction.java | 2 +- .../sql/{tree => ast}/CreateIndex.java | 2 +- .../sql/{tree => ast}/CreateTable.java | 2 +- .../sql/{tree => ast}/CurrentDatabase.java | 2 +- .../sql/{tree => ast}/CurrentTime.java | 2 +- .../sql/{tree => ast}/CurrentUser.java | 2 +- .../sql/{tree => ast}/DataType.java | 2 +- .../sql/{tree => ast}/DataTypeParameter.java | 2 +- .../sql/{tree => ast}/DecimalLiteral.java | 2 +- .../DefaultExpressionTraversalVisitor.java | 2 +- .../DefaultTraversalVisitor.java | 2 +- .../relational/sql/{tree => ast}/Delete.java | 2 +- .../{tree => ast}/DereferenceExpression.java | 2 +- .../sql/{tree => ast}/DescribeTable.java | 2 +- .../sql/{tree => ast}/DoubleLiteral.java | 2 +- .../sql/{tree => ast}/DropColumn.java | 2 +- .../relational/sql/{tree => ast}/DropDB.java | 2 +- .../sql/{tree => ast}/DropFunction.java | 2 +- .../sql/{tree => ast}/DropIndex.java | 2 +- .../sql/{tree => ast}/DropTable.java | 2 +- .../relational/sql/{tree => ast}/Except.java | 2 +- .../sql/{tree => ast}/ExistsPredicate.java | 2 +- .../relational/sql/{tree => ast}/Explain.java | 2 +- .../sql/{tree => ast}/ExplainAnalyze.java | 2 +- .../sql/{tree => ast}/Expression.java | 2 +- .../sql/{tree => ast}/FieldReference.java | 2 +- .../sql/{tree => ast}/FunctionCall.java | 2 +- .../sql/{tree => ast}/GenericDataType.java | 2 +- .../sql/{tree => ast}/GenericLiteral.java | 2 +- .../relational/sql/{tree => ast}/GroupBy.java | 2 +- .../sql/{tree => ast}/GroupingElement.java | 2 +- .../sql/{tree => ast}/GroupingSets.java | 2 +- .../sql/{tree => ast}/Identifier.java | 2 +- .../sql/{tree => ast}/IfExpression.java | 2 +- .../sql/{tree => ast}/InListExpression.java | 2 +- .../sql/{tree => ast}/InPredicate.java | 2 +- .../relational/sql/{tree => ast}/Insert.java | 2 +- .../sql/{tree => ast}/Intersect.java | 2 +- .../sql/{tree => ast}/IsNotNullPredicate.java | 2 +- .../sql/{tree => ast}/IsNullPredicate.java | 2 +- .../relational/sql/{tree => ast}/Join.java | 2 +- .../sql/{tree => ast}/JoinCriteria.java | 2 +- .../relational/sql/{tree => ast}/JoinOn.java | 2 +- .../sql/{tree => ast}/JoinUsing.java | 2 +- .../sql/{tree => ast}/LikePredicate.java | 2 +- .../relational/sql/{tree => ast}/Limit.java | 2 +- .../relational/sql/{tree => ast}/Literal.java | 2 +- .../sql/{tree => ast}/LogicalExpression.java | 2 +- .../sql/{tree => ast}/LongLiteral.java | 2 +- .../sql/{tree => ast}/NaturalJoin.java | 2 +- .../relational/sql/{tree => ast}/Node.java | 2 +- .../sql/{tree => ast}/NodeLocation.java | 2 +- .../sql/{tree => ast}/NotExpression.java | 2 +- .../sql/{tree => ast}/NullIfExpression.java | 2 +- .../sql/{tree => ast}/NullLiteral.java | 2 +- .../sql/{tree => ast}/NumericParameter.java | 2 +- .../relational/sql/{tree => ast}/Offset.java | 2 +- .../relational/sql/{tree => ast}/OrderBy.java | 2 +- .../sql/{tree => ast}/Parameter.java | 2 +- .../sql/{tree => ast}/Property.java | 2 +- .../sql/{tree => ast}/QualifiedName.java | 2 +- .../QuantifiedComparisonExpression.java | 2 +- .../relational/sql/{tree => ast}/Query.java | 2 +- .../sql/{tree => ast}/QueryBody.java | 2 +- .../sql/{tree => ast}/QuerySpecification.java | 2 +- .../sql/{tree => ast}/Relation.java | 2 +- .../sql/{tree => ast}/RenameColumn.java | 2 +- .../sql/{tree => ast}/RenameTable.java | 2 +- .../relational/sql/{tree => ast}/Row.java | 2 +- .../{tree => ast}/SearchedCaseExpression.java | 2 +- .../relational/sql/{tree => ast}/Select.java | 2 +- .../sql/{tree => ast}/SelectItem.java | 2 +- .../sql/{tree => ast}/SetOperation.java | 2 +- .../sql/{tree => ast}/SetProperties.java | 2 +- .../relational/sql/{tree => ast}/ShowDB.java | 2 +- .../sql/{tree => ast}/ShowFunctions.java | 2 +- .../sql/{tree => ast}/ShowIndex.java | 2 +- .../sql/{tree => ast}/ShowTables.java | 2 +- .../{tree => ast}/SimpleCaseExpression.java | 2 +- .../sql/{tree => ast}/SimpleGroupBy.java | 2 +- .../sql/{tree => ast}/SingleColumn.java | 2 +- .../sql/{tree => ast}/SortItem.java | 2 +- .../{tree => ast}/StackableAstVisitor.java | 2 +- .../sql/{tree => ast}/Statement.java | 2 +- .../sql/{tree => ast}/StringLiteral.java | 2 +- .../sql/{tree => ast}/SubqueryExpression.java | 2 +- .../sql/{tree => ast}/SymbolReference.java | 2 +- .../relational/sql/{tree => ast}/Table.java | 2 +- .../{tree => ast}/TableExpressionType.java | 2 +- .../sql/{tree => ast}/TableSubquery.java | 2 +- .../relational/sql/{tree => ast}/Trim.java | 2 +- .../sql/{tree => ast}/TypeParameter.java | 2 +- .../relational/sql/{tree => ast}/Union.java | 2 +- .../relational/sql/{tree => ast}/Update.java | 2 +- .../sql/{tree => ast}/UpdateAssignment.java | 2 +- .../relational/sql/{tree => ast}/Use.java | 2 +- .../relational/sql/{tree => ast}/Values.java | 2 +- .../sql/{tree => ast}/WhenClause.java | 2 +- .../relational/sql/{tree => ast}/With.java | 2 +- .../sql/{tree => ast}/WithQuery.java | 2 +- .../relational/sql/parser/AstBuilder.java | 202 +++++++++--------- .../sql/parser/ParsingException.java | 2 +- .../plan/relational/sql/parser/SqlParser.java | 10 +- .../plan/relational/sql/util/AstUtil.java | 2 +- .../sql/util/ExpressionFormatter.java | 110 +++++----- .../plan/relational/sql/util/QueryUtil.java | 52 ++--- .../sql/util/ReservedIdentifiers.java | 2 +- .../relational/sql/util/SqlFormatter.java | 102 ++++----- .../type/TypeSignatureTranslator.java | 12 +- .../plan/relational/utils/NodeUtils.java | 4 +- .../dag/column/unary/InColumnTransformer.java | 10 +- .../relational/analyzer/AnalyzerTest.java | 4 +- .../relational/analyzer/TestMatadata.java | 2 +- .../planner/PredicateUtilsTest.java | 2 +- 198 files changed, 943 insertions(+), 943 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/AddColumn.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/AliasedRelation.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/AllColumns.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/AllRows.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ArithmeticBinaryExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ArithmeticUnaryExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/AstVisitor.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/BetweenPredicate.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/BinaryLiteral.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/BooleanLiteral.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Cast.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CoalesceExpression.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ColumnDefinition.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ComparisonExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CreateDB.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CreateFunction.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CreateIndex.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CreateTable.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CurrentDatabase.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CurrentTime.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/CurrentUser.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DataType.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DataTypeParameter.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DecimalLiteral.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DefaultExpressionTraversalVisitor.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DefaultTraversalVisitor.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Delete.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DereferenceExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DescribeTable.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DoubleLiteral.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DropColumn.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DropDB.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DropFunction.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DropIndex.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/DropTable.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Except.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ExistsPredicate.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Explain.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ExplainAnalyze.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Expression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/FieldReference.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/FunctionCall.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/GenericDataType.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/GenericLiteral.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/GroupBy.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/GroupingElement.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/GroupingSets.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Identifier.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/IfExpression.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/InListExpression.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/InPredicate.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Insert.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Intersect.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/IsNotNullPredicate.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/IsNullPredicate.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Join.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/JoinCriteria.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/JoinOn.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/JoinUsing.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/LikePredicate.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Limit.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Literal.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/LogicalExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/LongLiteral.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/NaturalJoin.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Node.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/NodeLocation.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/NotExpression.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/NullIfExpression.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/NullLiteral.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/NumericParameter.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Offset.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/OrderBy.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Parameter.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Property.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/QualifiedName.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/QuantifiedComparisonExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Query.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/QueryBody.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/QuerySpecification.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Relation.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/RenameColumn.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/RenameTable.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Row.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SearchedCaseExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Select.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SelectItem.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SetOperation.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SetProperties.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ShowDB.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ShowFunctions.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ShowIndex.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/ShowTables.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SimpleCaseExpression.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SimpleGroupBy.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SingleColumn.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SortItem.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/StackableAstVisitor.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Statement.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/StringLiteral.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SubqueryExpression.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/SymbolReference.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Table.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/TableExpressionType.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/TableSubquery.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Trim.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/TypeParameter.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Union.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Update.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/UpdateAssignment.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Use.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/Values.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/WhenClause.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/With.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/{tree => ast}/WithQuery.java (98%) 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 d057b07579a7..0acddacb690f 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 @@ -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) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 1f9b24c713b0..ec536eb3612d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -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; 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 b911e2f0da4d..c5c656c07abc 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 @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java index 27b0257d5223..1b42abe62d81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java @@ -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; @@ -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, @@ -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, @@ -280,7 +280,7 @@ private IQueryExecution createQueryExecutionForTableModel( executor, statement.accept(new TableConfigTaskVisitor(clientSession, metadata), queryContext)); } - RelationalModelPlanner treeModelPlanner = + RelationalModelPlanner relationalModelPlanner = new RelationalModelPlanner( statement, sqlParser, @@ -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) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 14dd65960f6d..79f3c1ea4852 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -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; } @@ -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 allMeasurements, Map schemaMap) { if (predicate == null) { @@ -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); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java index 920e3e0b4e0b..6681b8f353f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 641ec2db26d6..bb1ccc1aa017 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java index 205dade55f0d..39c4ed62166e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java index 39fb8a78f4e8..ac990761b967 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/CreateDBTask.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DropDBTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DropDBTask.java index fd166992a05d..d4740be37f71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DropDBTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DropDBTask.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java index 58d02004fa10..0a72f18a3d2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/UseDBTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/UseDBTask.java index b6c0dbd142b3..b23ccf6d643d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/UseDBTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/UseDBTask.java @@ -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; 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 d7d62ec2e86f..e72254d1a7b6 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 @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java index fa7a82f484ea..b299c04e6d7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java @@ -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index 348fa1bfe5e5..440c34a65aab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -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)); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 1040e16d99a9..4e3e12f723ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -21,39 +21,39 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; -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.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.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -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.Node; -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.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -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.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Trim; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WhenClause; +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.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.CurrentTime; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +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.Node; +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.Parameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +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.SubqueryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java index a74f35526b57..9faf14e320d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java @@ -29,25 +29,25 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.security.Identity; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExistsPredicate; -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.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Relation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; +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.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java index 2f9e7879de35..91f625a7fe9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import java.util.List; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java index f505eea7baa5..655909c04608 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java index 25ca4838a925..858ff2e9660c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 4481f5ae423b..f5969d4e40d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -29,50 +29,50 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -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.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.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -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.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -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.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -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.StackableAstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; -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.tree.WhenClause; +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.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.DereferenceExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +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.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +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.Parameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +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.StackableAstVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +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.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import com.google.common.collect.HashMultimap; @@ -103,7 +103,7 @@ import static java.util.Collections.unmodifiableMap; import static java.util.Collections.unmodifiableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DereferenceExpression.isQualifiedAllFieldsReference; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BinaryType.TEXT; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index b671cc7d024f..cb9e7090f8a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.udf.builtin.BuiltinAggregationFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DefaultExpressionTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DereferenceExpression; -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.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; +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.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java index 9de78337b342..1c2ef2774b3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java index 81bc8310fdfe..41564a8d6006 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import static java.lang.System.identityHashCode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java index e2cd97fe7388..6afa4686cc74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.Objects; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java index 22852e559f58..69658c39dd31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index d723f24615aa..dfcc21e4e9c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WithQuery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java index b8afa850de84..215022a0bac3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.Map; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 714b05a8e6b2..a15ed482daa1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -30,73 +30,73 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllRows; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateIndex; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DescribeTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropIndex; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Explain; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingElement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingSets; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Insert; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Intersect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinCriteria; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinOn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinUsing; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Limit; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Relation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.RenameColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SelectItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SetOperation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SetProperties; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowFunctions; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowIndex; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowTables; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleGroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SingleColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Update; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Values; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.With; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WithQuery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateIndex; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropFunction; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropIndex; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowFunctions; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowIndex; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; @@ -141,10 +141,10 @@ import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractAggregateFunctions; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope.BasisType.TABLE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join.Type.FULL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join.Type.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join.Type.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join.Type.RIGHT; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.RIGHT; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 81ac9be63492..434785863f08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -22,25 +22,25 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -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.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.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NullIfExpression; -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.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +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.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.NotExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; +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.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index ff21d15051cb..26040b407fc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -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.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.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +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.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.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.read.filter.factory.FilterFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 03b717f3fe6d..19bd23302273 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IfExpression; -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.LogicalExpression; -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.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; +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.LogicalExpression; +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.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 62551a24b847..5b3eeff0768a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IfExpression; -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.LogicalExpression; -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.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.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; +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.LogicalExpression; +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.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 java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index 130ee689ea1f..600a4570e307 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IfExpression; -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.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NullIfExpression; -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.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; +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.NotExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; +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.SymbolReference; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index 0e0b45855852..e3c2c9b0e7cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -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.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IfExpression; -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.LogicalExpression; -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.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleCaseExpression; +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.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; +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.LogicalExpression; +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.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index fcaed95e4a54..f37aabbce8bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -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.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java index 03b9641fd96a..d625807b57e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java index 7859fc64186e..1c897c9646ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -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.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java index 5bc8a178c117..597ff713cbbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java @@ -13,7 +13,7 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; 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 f1ce49f1c14a..719ede302310 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 @@ -34,9 +34,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.RelationalPlanOptimizer; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.RemoveRedundantIdentityProjections; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SimplifyExpressions; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java index ec24129d8a18..b6bc5b252160 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java @@ -13,7 +13,7 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; public class OrderingTranslator { private OrderingTranslator() {} 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 18ee2adf9fbb..c4dee45822c2 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTranslateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FieldReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import java.util.HashMap; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 4b892c678539..1c07128d62c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -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.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +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.tsfile.utils.Pair; @@ -36,11 +36,11 @@ import java.util.Set; import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.and; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.or; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.and; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.or; public class PredicateUtils { 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 0130b13af470..cc8ff98032a0 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 @@ -25,16 +25,16 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QueryBody; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; 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 d39b008a8ca0..c0386bcbbb26 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 @@ -22,19 +22,19 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Intersect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Values; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 bfe66bdc9218..b936555d401c 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 @@ -39,8 +39,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; import org.apache.iotdb.db.queryengine.plan.scheduler.ClusterScheduler; import org.apache.iotdb.db.queryengine.plan.scheduler.IScheduler; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java index d99be7f06dd9..e757a82bed08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.CanonicalizationAware; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java index 8eab4fd15656..4f48df0890f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/FragmentInstanceGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/FragmentInstanceGenerator.java index a919a46e29d7..623217e340f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/FragmentInstanceGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/FragmentInstanceGenerator.java @@ -33,8 +33,8 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.MultiChildrenSinkNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.tsfile.utils.Pair; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributionPlanner.java index 5511209a3f21..83f1548ee3a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributionPlanner.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import java.util.Collections; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index 2607be6e7134..6364d2154431 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -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.common.type.BooleanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 400a274021a6..369a248177c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -14,22 +14,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -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.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; -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.Row; -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.WhenClause; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +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.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +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.Row; +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.WhenClause; public abstract class DefaultTraversalVisitor extends IrVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java index f0503eb63655..f4f17bfd219c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -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.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index 2584079bb41a..8d03eadc6c15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -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.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; -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.Row; -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.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +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.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +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.Row; +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.SymbolReference; public class ExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTranslateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTranslateVisitor.java index 7a31d2e740f9..5ad5448ddd26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTranslateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTranslateVisitor.java @@ -15,22 +15,22 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder; 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.ComparisonExpression; -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.Identifier; -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.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.NullIfExpression; -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.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +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.Identifier; +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.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.NullIfExpression; +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.SymbolReference; import java.util.List; import java.util.stream.Collectors; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index c6fb30c5300c..f3be5e57c851 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -18,25 +18,25 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -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.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IsNullPredicate; -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.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -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.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WhenClause; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +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.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; +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.NotExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +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.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java index 3789b793c29b..757c2fc38a8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -37,7 +37,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.Operator.OR; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; public final class ExtractCommonPredicatesExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 99e0c62f5689..71efd34ffda3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -20,34 +20,34 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -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.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IfExpression; -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.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.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +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.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; +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.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.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.tsfile.utils.Pair; import java.util.Arrays; import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.and; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.or; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.and; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.or; public class GlobalTimePredicateExtractVisitor extends IrVisitor, GlobalTimePredicateExtractVisitor.Context> { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 7c7448617a48..fa0a4ef9d772 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -27,8 +27,8 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public final class IrUtils { private IrUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrVisitor.java index dc8bcd8da90b..b32d30f4d05f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrVisitor.java @@ -18,23 +18,23 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression; -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.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.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; -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.Row; -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.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +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.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.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +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.Row; +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.SymbolReference; public abstract class IrVisitor extends AstVisitor { public R process(Expression node) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java index 990a3681baa6..8653d92aff2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; @@ -37,8 +37,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.or; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; public final class NormalizeOrExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/RewritingVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/RewritingVisitor.java index 4fd71a7d8681..fe4857cdf184 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/RewritingVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/RewritingVisitor.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Cast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -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.Identifier; -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.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +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.Identifier; +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.NotExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java index 646a6909f939..fc4f662f6e36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java @@ -25,7 +25,7 @@ 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; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import java.io.DataOutputStream; import java.io.IOException; 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 ba23d426519c..b61246080794 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 @@ -21,7 +21,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -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.utils.ReadWriteIOUtils; 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 846a64bcfdff..a20decfe57c3 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 @@ -23,7 +23,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -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.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/FilterScanCombine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/FilterScanCombine.java index e02fa0121231..893f3b966179 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/FilterScanCombine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/FilterScanCombine.java @@ -28,10 +28,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -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.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +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.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.ArrayList; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/IndexScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/IndexScan.java index e2f4a1f3be57..36ef2e02e637 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/IndexScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/IndexScan.java @@ -33,7 +33,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -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.file.metadata.StringArrayDeviceID; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PruneUnUsedColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PruneUnUsedColumns.java index c3b0a12c01b8..db9fb4eaa868 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PruneUnUsedColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PruneUnUsedColumns.java @@ -28,9 +28,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DefaultTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SimplifyExpressions.java index 8abd6273411f..afff2eb2e355 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SimplifyExpressions.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExtractCommonPredicatesExpressionRewriter.extractCommonPredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.NormalizeOrExpressionRewriter.normalizeOrExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AddColumn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index 7a8f09ad04b8..f29b57fd5037 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AliasedRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AliasedRelation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java index f4038deec82b..95d94a7e17f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AliasedRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AllColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AllColumns.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java index 278357d48723..99c83caf648f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AllColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AllRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AllRows.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java index 77dcba26cdc2..e5ae50c33c80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AllRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ArithmeticBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java index 0d7ff6085b6e..da15baae013b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ArithmeticUnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ArithmeticUnaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java index 8fa038559e63..2879081f23fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ArithmeticUnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AstVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java index c829ce6ae35a..d2c1e4874582 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/AstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BetweenPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BetweenPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java index d58ee418185e..5a0f00af4568 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BetweenPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BinaryLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java index 8d6490a59d2d..bb27ea604b48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BooleanLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BooleanLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java index 5b67135e2b8f..9ac55f61aca8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/BooleanLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Cast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Cast.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java index 2143d43c3224..cc8183f8be6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Cast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CoalesceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CoalesceExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java index a819160b1ed8..4a3365207fff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CoalesceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ColumnDefinition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index 698fd2769113..b16a8a28556c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ComparisonExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java index ae6f5eff176d..a70badc932a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateDB.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java index 001fb72a3300..3daa12f07281 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index dfd32100fdd5..3ff15880c1dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateIndex.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index c861f6a1ff63..04d071e89888 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateTable.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index 39b9b2ce3d38..6a434ac97f42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentDatabase.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java index ab964974db2e..9c431eaeb2d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentTime.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentTime.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java index 2e119610c949..b166cf2d0670 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentTime.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentUser.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java index ca206ad6d597..3ab0cc2f9167 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/CurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DataType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java index d6abeb4f5d43..c0e3421efcb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DataTypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DataTypeParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java index f53114276f04..8ed48ae30157 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DataTypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DecimalLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DecimalLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java index c9dc1cc0535b..2841f81221b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DecimalLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DefaultExpressionTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DefaultExpressionTraversalVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java index c11b68eb66cd..127178e97c8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DefaultExpressionTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; /** When walking Expressions, don't traverse into SubqueryExpressions */ public abstract class DefaultExpressionTraversalVisitor extends DefaultTraversalVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DefaultTraversalVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index cbcfb7842552..75f5f186f607 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; public abstract class DefaultTraversalVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Delete.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index 103064169329..3a11ad4f4f6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DereferenceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DereferenceExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java index 5426c7098953..e22e57eb1894 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DereferenceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DescribeTable.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index b57b9cb5c407..823301f7e23c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DoubleLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DoubleLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java index 13146f9ac3a1..d744ad23c8d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DoubleLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropColumn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index 960c3fede635..28c5a91258a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropDB.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index 79d8863604c6..4014210a7a65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index 70afbbe9f91e..1439ea19798b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropIndex.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index fcd1ad6070fd..0b03e8551ca1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropTable.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index 16c724f27a83..13cc623dd5af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Except.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Except.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java index 56ddb52f41c7..eacdab488caa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Except.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ExistsPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ExistsPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java index b2220ee0ab98..e75c5cf2f301 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ExistsPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Explain.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index a21a216c3e6f..9b486309d6b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ExplainAnalyze.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index f777b4c3baa3..bf48c0b5efc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Expression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Expression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Expression.java index 33eefc599dc9..694cf6ca194a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Expression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/FieldReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/FieldReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java index 7a466606c63f..0fcffe6bd1d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/FieldReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/FunctionCall.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/FunctionCall.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java index 2cf9b910f617..004e426ba201 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/FunctionCall.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GenericDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GenericDataType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java index db4da0ba6542..00560ad7cc38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GenericDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GenericLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GenericLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java index 7eefbe18d664..cd2516165584 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GenericLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupBy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java index d2086e6a39a8..289e550d28de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupingElement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupingElement.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java index f3abc3c3fa96..17f1e9cc916b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupingElement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupingSets.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupingSets.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java index 1845229d2d49..ec4789ec3f08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/GroupingSets.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Identifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Identifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java index 2c0c07efa7b3..0b14e47bab68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Identifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IfExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java index d09e539ab085..a287244a0704 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/InListExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/InListExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java index 3d112d1ca384..29f62025b1ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/InListExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/InPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/InPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java index c4fbb81b04d7..b04c222347e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/InPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Insert.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index 97d9af187586..a8ac8fdd0f70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Intersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Intersect.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java index b5e4f98cf723..c1739e0a0f52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Intersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IsNotNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IsNotNullPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java index e78cc81c7475..3aecaf4576ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IsNotNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IsNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IsNullPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java index 9f29aa1d1f08..3afe47d8ea90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/IsNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Join.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Join.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java index 52859894db09..bc936951ec34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Join.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinCriteria.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinCriteria.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java index 7ea6511c5052..3195b983e713 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinCriteria.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinOn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java index 8955ac21443b..16f8fb95fe31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinUsing.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinUsing.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java index 20c07614d254..a2c554004452 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/JoinUsing.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LikePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LikePredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java index 3fa5f6991510..ac6caea6c8fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LikePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Limit.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Limit.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java index 88cb5bd7c355..b313ef14c9ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Limit.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Literal.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Literal.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java index bc6493c69341..71d130ad228a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Literal.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LogicalExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LogicalExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java index d9695f9d0de2..34c008bd60c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LogicalExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LongLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LongLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java index 83079e682098..bd51f0c66471 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/LongLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NaturalJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NaturalJoin.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java index b10602d6ffa3..a628ea511240 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NaturalJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Node.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Node.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Node.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Node.java index cbfd76c75aac..fd5ce98e8ef5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Node.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Node.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NodeLocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NodeLocation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NodeLocation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NodeLocation.java index accb0fdf42e5..98f32813d7e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NodeLocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NodeLocation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NotExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java index 1cbeb8f746fa..e9f0cfc03f21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NullIfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NullIfExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java index 9367c449e98a..464a87b32b06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NullIfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NullLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NullLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java index ca68d23175ec..bdf84f0d7a46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NullLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NumericParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NumericParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java index d812450abeb6..1c9eec5e9c1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/NumericParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Offset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Offset.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java index 421069612be2..ae63bce3a43b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Offset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/OrderBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/OrderBy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java index 9ebfc48c34e0..25eff2b10303 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/OrderBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Parameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Parameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java index bbf06cc3ecac..9f9d934ed443 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Parameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Property.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java index 52ed3c499a99..64b9c757faa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QualifiedName.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QualifiedName.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java index de9536d1d143..db004cf891ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QualifiedName.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QuantifiedComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QuantifiedComparisonExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java index befc6c7e45dd..98205917b04b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QuantifiedComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Query.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java index 9f2b133f517e..f0d9ac5ec33f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QueryBody.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QueryBody.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java index b26d6a93991e..35fefdfbf329 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QueryBody.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QuerySpecification.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java index e81572409792..93ab5d66ad8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Relation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Relation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java index 655d7a45f432..0bb39725468f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Relation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; public abstract class Relation extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/RenameColumn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index 4bcf9ab540ec..be86b506d24b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/RenameTable.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index b8181a065dfd..06d83cc36ec0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Row.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Row.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java index 7de2ebf57200..e61dbffe95ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Row.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SearchedCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SearchedCaseExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java index 07335c0e468f..1a0e888e56d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SearchedCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Select.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Select.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java index b33cd0f4a5de..236dc40d10f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Select.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SelectItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SelectItem.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java index e41b2ff8758d..b5faf104287b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SelectItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; public abstract class SelectItem extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SetOperation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SetOperation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java index 46d57a02a940..c470cbf1d9ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SetOperation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SetProperties.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index 455d3420450b..7a962aa0bcf0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowDB.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index 91b1acdb4f73..8b53b5641f34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowFunctions.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index 52505ee8298b..9dc82bee89ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowIndex.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index 19c8c051d61a..46b902e841f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowTables.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index fefadb6fa456..776937b9a510 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SimpleCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SimpleCaseExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java index 39da55e643e4..f1f6cf9cbb4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SimpleCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SimpleGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SimpleGroupBy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java index d9f720f4814e..88193960f7de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SimpleGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SingleColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SingleColumn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java index 4bd7101ffb82..9f4e3663e6f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SingleColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SortItem.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java index e57686e5d750..0ec1f4c8dd42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/StackableAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/StackableAstVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java index be3e0da91fb3..92579dfc5163 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/StackableAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import java.util.LinkedList; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Statement.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java index a861a7589c13..77cc58e93166 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/StringLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/StringLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java index 1739b3658d6c..1a987f88e08c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/StringLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SubqueryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SubqueryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java index d42bca4c57fd..703f2c9721cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SubqueryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SymbolReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SymbolReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java index 6f25ead378ba..23fba4aa4f5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/SymbolReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Table.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Table.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java index 3220e747cc31..cd726b22b6bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Table.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TableExpressionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableExpressionType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TableExpressionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableExpressionType.java index 6807cb9a51ed..d3700c157b73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TableExpressionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; public enum TableExpressionType { ARITHMETIC_BINARY((short) 1), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TableSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TableSubquery.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java index 74bf1d4c341a..a604a7e01fe5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TableSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Trim.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Trim.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java index 73866f023a2d..78733b7a5ad0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Trim.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TypeParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java index 575d0648195d..2c64f55229ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/TypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Union.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Union.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java index a407d3b85501..0f6230028b89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Union.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Update.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index d2c828014250..e89c96174787 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/UpdateAssignment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/UpdateAssignment.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java index 7b77735e74f5..da541b04c9cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/UpdateAssignment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Use.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index dbdf15cd2f22..cbd4877348fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Values.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Values.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java index b0f781036084..e2d3dd11d577 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/Values.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/WhenClause.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/WhenClause.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java index bef7ec86c7c1..d5af622a12b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/WhenClause.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/With.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/With.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java index 86b4686f981c..58582d5dab70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/With.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/WithQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/WithQuery.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java index 54d5756b3b06..5145083e6470 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/tree/WithQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.tree; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java index 0e5f4ee0d018..02d98c5fac71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java @@ -19,104 +19,104 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllRows; -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.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.ColumnDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateIndex; -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.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DescribeTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropIndex; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExistsPredicate; -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.GenericDataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingElement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingSets; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -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.Insert; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Intersect; -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.Join; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinCriteria; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinOn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinUsing; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Limit; -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.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NodeLocation; -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.NumericParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QueryBody; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Relation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.RenameColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SelectItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SetProperties; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowIndex; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowTables; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SimpleGroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SingleColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Trim; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Update; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.UpdateAssignment; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Values; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.With; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WithQuery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; +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.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.ColumnDefinition; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateIndex; +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.CurrentTime; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropIndex; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; +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.GenericDataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +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.Insert; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; +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.Join; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; +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.NaturalJoin; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +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.NumericParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowIndex; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseVisitor; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; @@ -140,9 +140,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingSets.Type.CUBE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingSets.Type.EXPLICIT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingSets.Type.ROLLUP; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets.Type.CUBE; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; public class AstBuilder extends RelationalSqlBaseVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java index 0508a21a0ee3..3dfc72a46a89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; import org.antlr.v4.runtime.RecognitionException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index 008f7db7b490..c82e1f8a56f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index d90e9e5c9217..09ef3e187203 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java index 1b45c599b36a..3f58f48581b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -19,61 +19,61 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllRows; -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.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GenericDataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingElement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GroupingSets; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -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.Node; -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.NumericParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -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.SimpleGroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SubqueryExpression; -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.tree.TypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WhenClause; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; +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.DereferenceExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +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.Node; +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.NumericParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +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.SimpleGroupBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +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.sql.ast.TypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index c8c7e935d0b0..d6acaef9c860 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -19,32 +19,32 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AliasedRelation; -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.DereferenceExpression; -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.GroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QueryBody; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Relation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SelectItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SingleColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WhenClause; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; +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.DereferenceExpression; +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.GroupBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java index 0168a1439e08..d40f6880b9b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index d417d807cf64..97cb104384ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -19,57 +19,57 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.AllColumns; -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.CreateFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.CreateTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DropTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Explain; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Insert; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Intersect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Join; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinCriteria; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinOn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.JoinUsing; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Limit; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Relation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.RenameColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SelectItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SetProperties; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowFunctions; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.ShowTables; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SingleColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Update; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.UpdateAssignment; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Values; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.WithQuery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; +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.CreateFunction; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropFunction; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowFunctions; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import com.google.common.base.Joiner; import com.google.common.base.Strings; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java index b8e1537fd80e..6cfcc5d81a8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.GenericDataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.NumericParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.TypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java index 614adb1cf266..b7518d241151 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.utils; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.SortItem; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java index 566a05365fb2..0ff3625ffd93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Literal; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.StringLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java index 681205bb4992..f59af819f8f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java @@ -50,9 +50,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.tree.Statement; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java index 02e01b29503c..c8eec5486c04 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -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.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java index aef6efac7ddf..ad68875c1723 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMatadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -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.utils.Pair; import org.junit.Test;