You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sh...@apache.org on 2026/04/15 07:20:43 UTC
(iotdb) branch calc_commons updated: fix
This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a commit to branch calc_commons
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/calc_commons by this push:
new d19de0b2d59 fix
d19de0b2d59 is described below
commit d19de0b2d594e80f5cbedc2af6a50396e8967d36
Author: shuwenwei <we...@timecho.com>
AuthorDate: Wed Apr 15 15:20:24 2026 +0800
fix
---
.../ArithmeticBinaryColumnTransformer.ftl | 6 +-
.../templates/ArithmeticColumnTransformerApi.ftl | 12 +-
.../templates/ArithmeticUnaryColumnTransformer.ftl | 2 +-
.../plan/planner/TableOperatorGenerator.java | 8 +-
.../expression => }/multi/FunctionType.java | 2 +-
.../function/{function => }/BoundSignature.java | 2 +-
.../function/{function => }/FunctionId.java | 2 +-
.../function/{function => }/FunctionKind.java | 2 +-
.../{function => }/InterpretedFunctionInvoker.java | 2 +-
.../{function => }/LongVariableConstraint.java | 2 +-
.../function/{function => }/OperatorType.java | 2 +-
.../ResolvedFunctionCallBuilder.java | 2 +-
.../function/{function => }/Signature.java | 2 +-
.../{function => }/TableBuiltinTableFunction.java | 8 +-
.../{function => }/TypeVariableConstraint.java | 2 +-
.../arithmetic/AdditionResolver.java | 2 +-
.../arithmetic/DivisionResolver.java | 2 +-
.../{function => }/arithmetic/ModulusResolver.java | 2 +-
.../arithmetic/MultiplicationResolver.java | 2 +-
.../arithmetic/SubtractionResolver.java | 2 +-
.../{function => }/tvf/ClassifyTableFunction.java | 2 +-
.../{function => }/tvf/ForecastTableFunction.java | 6 +-
.../tvf/PatternMatchTableFunction.java | 12 +-
.../{function => }/tvf/TableFunctionUtils.java | 2 +-
.../{function => }/tvf/match/MatchConfig.java | 2 +-
.../{function => }/tvf/match/QetchAlgorithm.java | 18 +-
.../{function => }/tvf/match/model/MatchState.java | 4 +-
.../tvf/match/model/PatternSegment.java | 4 +-
.../{function => }/tvf/match/model/Point.java | 2 +-
.../tvf/match/model/RegexMatchState.java | 6 +-
.../{function => }/tvf/match/model/Section.java | 2 +-
.../plan/relational/metadata/ResolvedFunction.java | 6 +-
.../relational/planner/node/AggregationNode.java | 2 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 12 +-
.../execution/aggregation/AccumulatorFactory.java | 6 +-
.../execution/aggregation/UDAFAccumulator.java | 2 +-
.../SlidingWindowAggregatorFactory.java | 2 +-
.../TableDateBinTimeRangeIterator.java | 2 +-
.../operator/process/FilterAndProjectOperator.java | 20 +-
.../operator/process/TransformOperator.java | 2 +-
.../process/gapfill/GapFillWGroupWMoOperator.java | 2 +-
.../process/gapfill/GapFillWGroupWoMoOperator.java | 2 +-
.../process/gapfill/GapFillWoGroupWMoOperator.java | 2 +-
.../gapfill/GapFillWoGroupWoMoOperator.java | 2 +-
.../process/rowpattern/PatternAggregator.java | 2 +-
.../schema/source/DeviceAttributeUpdater.java | 4 +-
.../schema/source/DeviceBlackListConstructor.java | 4 +-
.../schema/source/DevicePredicateFilter.java | 4 +-
.../schema/source/DevicePredicateHandler.java | 4 +-
.../operator/schema/source/DeviceUpdater.java | 4 +-
.../InformationSchemaContentSupplierFactory.java | 2 +-
.../operator/window/ConditionWindowParameter.java | 2 +-
.../relational/ColumnTransformerBuilder.java | 266 ++++++++++-----------
.../db/queryengine/plan/analyze/Analysis.java | 6 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 16 +-
.../plan/analyze/ConcatPathRewriter.java | 2 +-
.../plan/analyze/ExpressionAnalyzer.java | 52 ++--
.../plan/analyze/ExpressionTypeAnalyzer.java | 40 ++--
.../queryengine/plan/analyze/ExpressionUtils.java | 60 ++---
.../plan/analyze/GroupByLevelHelper.java | 2 +-
.../queryengine/plan/analyze/PredicateUtils.java | 38 +--
.../queryengine/plan/analyze/SelectIntoUtils.java | 4 +-
.../plan/analyze/TemplatedAggregationAnalyze.java | 10 +-
.../queryengine/plan/analyze/TemplatedAnalyze.java | 8 +-
.../db/queryengine/plan/analyze/TemplatedInfo.java | 6 +-
.../db/queryengine/plan/analyze/TypeProvider.java | 2 +-
.../config/executor/ClusterConfigTaskExecutor.java | 4 +-
.../config/metadata/ShowFunctionsTask.java | 2 +-
.../{expression/expression => }/Expression.java | 62 ++---
.../expression => }/ExpressionFactory.java | 44 ++--
.../expression => }/ExpressionType.java | 2 +-
.../UnknownExpressionTypeException.java | 2 +-
.../expression => }/binary/AdditionExpression.java | 8 +-
.../binary/ArithmeticBinaryExpression.java | 6 +-
.../expression => }/binary/BinaryExpression.java | 8 +-
.../binary/CompareBinaryExpression.java | 16 +-
.../expression => }/binary/DivisionExpression.java | 8 +-
.../expression => }/binary/EqualToExpression.java | 8 +-
.../binary/GreaterEqualExpression.java | 8 +-
.../binary/GreaterThanExpression.java | 8 +-
.../binary/LessEqualExpression.java | 8 +-
.../expression => }/binary/LessThanExpression.java | 8 +-
.../expression => }/binary/LogicAndExpression.java | 8 +-
.../binary/LogicBinaryExpression.java | 6 +-
.../expression => }/binary/LogicOrExpression.java | 8 +-
.../expression => }/binary/ModuloExpression.java | 8 +-
.../binary/MultiplicationExpression.java | 8 +-
.../expression => }/binary/NonEqualExpression.java | 8 +-
.../binary/SubtractionExpression.java | 8 +-
.../expression => }/binary/WhenThenExpression.java | 8 +-
.../expression => }/leaf/ConstantOperand.java | 8 +-
.../expression => }/leaf/LeafOperand.java | 4 +-
.../expression => }/leaf/NullOperand.java | 8 +-
.../expression => }/leaf/TimeSeriesOperand.java | 8 +-
.../expression => }/leaf/TimestampOperand.java | 8 +-
.../expression => }/multi/FunctionExpression.java | 16 +-
.../multi/builtin/BuiltInFunctionHelper.java | 2 +-
.../multi/builtin/BuiltInScalarFunctionHelper.java | 8 +-
.../BuiltInScalarFunctionHelperFactory.java | 12 +-
.../multi/builtin/helper/CastFunctionHelper.java | 10 +-
.../multi/builtin/helper/DiffFunctionHelper.java | 10 +-
.../builtin/helper/ReplaceFunctionHelper.java | 10 +-
.../multi/builtin/helper/RoundFunctionHelper.java | 10 +-
.../builtin/helper/SubStringFunctionHelper.java | 8 +-
.../other/CaseWhenThenExpression.java | 14 +-
.../other/GroupByTimeExpression.java | 10 +-
.../expression => }/ternary/BetweenExpression.java | 8 +-
.../expression => }/ternary/TernaryExpression.java | 8 +-
.../expression => }/unary/InExpression.java | 16 +-
.../expression => }/unary/IsNullExpression.java | 8 +-
.../expression => }/unary/LikeExpression.java | 8 +-
.../expression => }/unary/LogicNotExpression.java | 16 +-
.../expression => }/unary/NegationExpression.java | 16 +-
.../expression => }/unary/RegularExpression.java | 8 +-
.../expression => }/unary/UnaryExpression.java | 8 +-
.../BindTypeForTimeSeriesOperandVisitor.java | 8 +-
.../CollectAggregationExpressionsVisitor.java | 8 +-
.../visitor/CollectSourceExpressionsVisitor.java | 10 +-
.../expression => }/visitor/CollectVisitor.java | 12 +-
.../visitor/ColumnTransformerVisitor.java | 94 ++++----
.../visitor/CompleteMeasurementSchemaVisitor.java | 14 +-
.../visitor/ConcatDeviceVisitor.java | 6 +-
.../visitor/CountTimeAggregationAmountVisitor.java | 8 +-
.../visitor/ExistUnknownTypeInExpression.java | 10 +-
.../visitor/ExpressionAnalyzeVisitor.java | 4 +-
.../visitor/ExpressionNormalizeVisitor.java | 8 +-
.../expression => }/visitor/ExpressionVisitor.java | 76 +++---
.../visitor/GetMeasurementExpressionVisitor.java | 6 +-
.../visitor/IntermediateLayerVisitor.java | 36 +--
.../visitor/LowercaseNormalizeVisitor.java | 6 +-
.../visitor/ReconstructVisitor.java | 16 +-
.../visitor/RemoveRootPrefixVisitor.java | 6 +-
.../visitor/ReplaceLogicalViewVisitor.java | 14 +-
.../ReplaceRawPathWithGroupedPathVisitor.java | 10 +-
.../visitor/ReplaceSubTreeWithViewVisitor.java | 6 +-
...edConcatRemoveUnExistentMeasurementVisitor.java | 8 +-
.../visitor/TransformToViewExpressionVisitor.java | 56 ++---
.../cartesian/BindSchemaForExpressionVisitor.java | 14 +-
.../cartesian/BindSchemaForPredicateVisitor.java | 20 +-
.../visitor/cartesian/CartesianProductVisitor.java | 16 +-
...catDeviceAndBindSchemaForExpressionVisitor.java | 14 +-
.../ConcatDeviceAndBindSchemaForHavingVisitor.java | 8 +-
...ncatDeviceAndBindSchemaForPredicateVisitor.java | 16 +-
.../ConcatExpressionWithSuffixPathsVisitor.java | 12 +-
.../visitor/cartesian/QueryContextProvider.java | 2 +-
.../visitor/logical/LogicalAndVisitor.java | 16 +-
.../visitor/logical/LogicalOrVisitor.java | 16 +-
.../PredicateCanPushDownToSourceChecker.java | 6 +-
.../visitor/logical/TimeFilterExistChecker.java | 6 +-
.../predicate/ConvertPredicateToFilterVisitor.java | 44 ++--
.../ConvertPredicateToTimeFilterVisitor.java | 44 ++--
.../predicate/PredicatePushIntoScanChecker.java | 40 ++--
.../visitor/predicate/PredicateSimplifier.java | 48 ++--
.../visitor/predicate/PredicateVisitor.java | 38 +--
.../visitor/predicate/ReversePredicateVisitor.java | 39 ++-
.../plan/optimization/AggregationPushDown.java | 6 +-
.../plan/optimization/LimitOffsetPushDown.java | 2 +-
.../plan/optimization/PredicatePushDown.java | 4 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 64 ++---
.../plan/parser/StatementGenerator.java | 14 +-
.../planner/DataNodeTableOperatorGenerator.java | 4 +-
.../plan/planner/LogicalPlanBuilder.java | 6 +-
.../plan/planner/LogicalPlanVisitor.java | 4 +-
.../plan/planner/OperatorTreeGenerator.java | 18 +-
.../plan/planner/TemplatedLogicalPlan.java | 6 +-
.../plan/planner/TemplatedLogicalPlanBuilder.java | 2 +-
.../distribution/DistributionPlanContext.java | 2 +-
.../SimpleFragmentParallelPlanner.java | 2 +-
.../plan/planner/distribution/SourceRewriter.java | 8 +-
.../plan/planner/plan/TimePredicate.java | 2 +-
.../plan/planner/plan/TreeModelTimePredicate.java | 2 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 2 +-
.../node/process/AggregationMergeSortNode.java | 2 +-
.../planner/plan/node/process/AggregationNode.java | 2 +-
.../plan/planner/plan/node/process/FilterNode.java | 2 +-
.../plan/node/process/RawDataAggregationNode.java | 2 +-
.../planner/plan/node/process/TransformNode.java | 2 +-
.../source/AlignedSeriesAggregationScanNode.java | 2 +-
.../plan/node/source/AlignedSeriesScanNode.java | 2 +-
.../plan/node/source/LastSeriesSourceNode.java | 2 +-
.../node/source/SeriesAggregationScanNode.java | 2 +-
.../node/source/SeriesAggregationSourceNode.java | 2 +-
.../planner/plan/node/source/SeriesScanNode.java | 2 +-
.../plan/node/source/SeriesScanSourceNode.java | 2 +-
.../planner/plan/node/source/SeriesSourceNode.java | 2 +-
.../plan/node/source/ShowDiskUsageNode.java | 2 +-
.../plan/parameter/AggregationDescriptor.java | 2 +-
.../CrossSeriesAggregationDescriptor.java | 2 +-
.../plan/parameter/GroupByConditionParameter.java | 2 +-
.../relational/analyzer/ExpressionAnalyzer.java | 8 +-
.../relational/analyzer/StatementAnalyzer.java | 4 +-
.../predicate/ConvertPredicateToFilterVisitor.java | 2 +-
.../ConvertSchemaPredicateToFilterVisitor.java | 2 +-
.../plan/relational/metadata/Metadata.java | 2 +-
.../metadata/OperatorNotFoundException.java | 2 +-
.../relational/metadata/TableMetadataImpl.java | 16 +-
.../planner/IrExpressionInterpreter.java | 8 +-
.../plan/relational/planner/IrTypeAnalyzer.java | 2 +-
.../plan/relational/planner/PredicateUtils.java | 2 +-
.../distribute/TableDistributedPlanGenerator.java | 6 +-
.../ir/GapFillStartAndEndTimeExtractVisitor.java | 2 +-
.../ir/GlobalTimePredicateExtractVisitor.java | 2 +-
.../iterative/rule/ReplaceWindowWithRowNumber.java | 2 +-
.../iterative/rule/SetOperationNodeTranslator.java | 6 +-
.../iterative/rule/SimplifyCountOverConstant.java | 6 +-
.../rule/TransformCorrelatedScalarSubquery.java | 2 +-
.../relational/planner/iterative/rule/Util.java | 2 +-
.../planner/node/AggregationTableScanNode.java | 2 +-
.../relational/planner/optimizations/Util.java | 6 +-
.../plan/relational/sql/ast/DeleteDevice.java | 4 +-
.../plan/statement/component/GroupByComponent.java | 2 +-
.../component/GroupByConditionComponent.java | 2 +-
.../plan/statement/component/HavingCondition.java | 2 +-
.../plan/statement/component/IntoComponent.java | 2 +-
.../plan/statement/component/OrderByComponent.java | 2 +-
.../plan/statement/component/ResultColumn.java | 2 +-
.../plan/statement/component/SelectComponent.java | 2 +-
.../plan/statement/component/SortItem.java | 2 +-
.../plan/statement/component/WhereCondition.java | 2 +-
.../plan/statement/crud/QueryStatement.java | 8 +-
.../metadata/view/AlterLogicalViewStatement.java | 2 +-
.../metadata/view/CreateLogicalViewStatement.java | 4 +-
.../queryengine/plan/udf/UDFManagementService.java | 2 +-
.../dag/builder/EvaluationDAGBuilder.java | 6 +-
.../AbstractCaseWhenThenColumnTransformer.java | 2 +-
.../dag/{dag/column => }/column/ColumnCache.java | 2 +-
.../{dag/column => }/column/ColumnTransformer.java | 4 +-
.../column/FailFunctionColumnTransformer.java | 2 +-
.../column/TableCaseWhenThenColumnTransformer.java | 2 +-
.../column/TreeCaseWhenThenColumnTransformer.java | 2 +-
.../ArithmeticAdditionColumnTransformer.java | 4 +-
.../binary/ArithmeticBinaryColumnTransformer.java | 4 +-
.../ArithmeticDivisionColumnTransformer.java | 4 +-
.../binary/ArithmeticModuloColumnTransformer.java | 4 +-
.../ArithmeticMultiplicationColumnTransformer.java | 4 +-
.../ArithmeticSubtractionColumnTransformer.java | 4 +-
.../column/binary/BinaryColumnTransformer.java | 4 +-
.../binary/CompareBinaryColumnTransformer.java | 4 +-
.../binary/CompareEqualToColumnTransformer.java | 4 +-
.../CompareGreaterEqualColumnTransformer.java | 4 +-
.../CompareGreaterThanColumnTransformer.java | 4 +-
.../binary/CompareLessEqualColumnTransformer.java | 4 +-
.../binary/CompareLessThanColumnTransformer.java | 4 +-
.../binary/CompareNonEqualColumnTransformer.java | 4 +-
.../column/binary/HmacColumnTransformer.java | 8 +-
.../column/binary/Like2ColumnTransformer.java | 4 +-
.../column/binary/LogicAndColumnTransformer.java | 4 +-
.../binary/LogicBinaryColumnTransformer.java | 4 +-
.../column/binary/LogicOrColumnTransformer.java | 4 +-
.../binary}/factory/HmacStrategiesFactory.java | 4 +-
.../column/binary/strategies/HmacStrategy.java | 2 +-
.../column/leaf/ConstantColumnTransformer.java | 2 +-
.../column/leaf/IdentityColumnTransformer.java | 2 +-
.../column/leaf/LeafColumnTransformer.java | 4 +-
.../column/leaf/NullColumnTransformer.java | 2 +-
.../column/leaf/TimeColumnTransformer.java | 2 +-
.../AbstractGreatestLeastColumnTransformer.java | 4 +-
.../multi/BinaryGreatestColumnTransformer.java | 4 +-
.../column/multi/BinaryLeastColumnTransformer.java | 4 +-
.../multi/BooleanGreatestColumnTransformer.java | 4 +-
.../multi/BooleanLeastColumnTransformer.java | 4 +-
.../column/multi/CoalesceColumnTransformer.java | 4 +-
.../multi/DoubleGreatestColumnTransformer.java | 4 +-
.../column/multi/DoubleLeastColumnTransformer.java | 4 +-
.../multi/FloatGreatestColumnTransformer.java | 4 +-
.../column/multi/FloatLeastColumnTransformer.java | 4 +-
.../multi/InBinaryMultiColumnTransformer.java | 4 +-
.../multi/InBooleanMultiColumnTransformer.java | 4 +-
.../multi/InDoubleMultiColumnTransformer.java | 4 +-
.../multi/InFloatMultiColumnTransformer.java | 4 +-
.../multi/InInt32MultiColumnTransformer.java | 4 +-
.../multi/InInt64MultiColumnTransformer.java | 4 +-
.../column/multi/InMultiColumnTransformer.java | 4 +-
.../multi/Int32GreatestColumnTransformer.java | 4 +-
.../column/multi/Int32LeastColumnTransformer.java | 4 +-
.../multi/Int64GreatestColumnTransformer.java | 4 +-
.../column/multi/Int64LeastColumnTransformer.java | 4 +-
.../multi/LogicalAndMultiColumnTransformer.java | 4 +-
.../multi/LogicalMultiColumnTransformer.java | 4 +-
.../multi/LogicalOrMultiColumnTransformer.java | 4 +-
.../column/multi/MappableUDFColumnTransformer.java | 4 +-
.../column/multi/MultiColumnTransformer.java | 4 +-
.../column/ternary/BetweenColumnTransformer.java | 4 +-
.../ternary/CompareTernaryColumnTransformer.java | 4 +-
.../column/ternary/Like3ColumnTransformer.java | 6 +-
.../column/ternary/LpadColumnTransformer.java | 6 +-
.../column/ternary/RpadColumnTransformer.java | 6 +-
.../column/ternary/TernaryColumnTransformer.java | 4 +-
.../column/ternary/utils/BytePaddingUtils.java | 2 +-
.../udf/UserDefineScalarFunctionTransformer.java | 6 +-
.../unary/ArithmeticNegationColumnTransformer.java | 4 +-
.../column/unary/InColumnTransformer.java | 4 +-
.../column/unary/IsNullColumnTransformer.java | 4 +-
.../column/unary/LikeColumnTransformer.java | 4 +-
.../column/unary/LogicNotColumnTransformer.java | 4 +-
.../column/unary/RegularColumnTransformer.java | 4 +-
.../column/unary/UnaryColumnTransformer.java | 4 +-
.../column/unary/scalar/AbsColumnTransformer.java | 6 +-
.../scalar/AbstractBitwise2ColumnTransformer.java | 6 +-
.../scalar/AbstractBitwiseColumnTransformer.java | 6 +-
.../AbstractCastFunctionColumnTransformer.java | 10 +-
.../scalar/AbstractLengthColumnTransformer.java | 6 +-
.../column/unary/scalar/AcosColumnTransformer.java | 6 +-
.../column/unary/scalar/AsinColumnTransformer.java | 6 +-
.../column/unary/scalar/AtanColumnTransformer.java | 6 +-
.../unary/scalar/BitCount2ColumnTransformer.java | 8 +-
.../unary/scalar/BitCountColumnTransformer.java | 8 +-
.../unary/scalar/BitwiseAnd2ColumnTransformer.java | 6 +-
.../unary/scalar/BitwiseAndColumnTransformer.java | 6 +-
.../scalar/BitwiseLeftShift2ColumnTransformer.java | 6 +-
.../scalar/BitwiseLeftShiftColumnTransformer.java | 6 +-
.../unary/scalar/BitwiseNotColumnTransformer.java | 8 +-
.../unary/scalar/BitwiseOr2ColumnTransformer.java | 6 +-
.../unary/scalar/BitwiseOrColumnTransformer.java | 6 +-
.../BitwiseRightShift2ColumnTransformer.java | 6 +-
...wiseRightShiftArithmetic2ColumnTransformer.java | 6 +-
...twiseRightShiftArithmeticColumnTransformer.java | 6 +-
.../scalar/BitwiseRightShiftColumnTransformer.java | 6 +-
.../unary/scalar/BitwiseXor2ColumnTransformer.java | 6 +-
.../unary/scalar/BitwiseXorColumnTransformer.java | 6 +-
.../unary/scalar/BlobLengthColumnTransformer.java | 4 +-
.../scalar/BytesToDoubleColumnTransformer.java | 10 +-
.../scalar/BytesToFloatColumnTransformer.java | 10 +-
.../unary/scalar/BytesToIntColumnTransformer.java | 10 +-
.../unary/scalar/BytesToLongColumnTransformer.java | 10 +-
.../column/unary/scalar/CRC32Transformer.java | 6 +-
.../scalar/CastFunctionColumnTransformer.java | 4 +-
.../column/unary/scalar/CeilColumnTransformer.java | 6 +-
.../unary/scalar/Concat2ColumnTransformer.java | 8 +-
.../unary/scalar/ConcatColumnTransformer.java | 6 +-
.../unary/scalar/ConcatMultiColumnTransformer.java | 6 +-
.../column/unary/scalar/CosColumnTransformer.java | 6 +-
.../column/unary/scalar/CoshColumnTransformer.java | 6 +-
.../scalar/DateBinFunctionColumnTransformer.java | 6 +-
.../unary/scalar/DegreesColumnTransformer.java | 6 +-
.../column/unary/scalar/DiffColumnTransformer.java | 6 +-
.../scalar/DiffFunctionColumnTransformer.java | 6 +-
.../scalar/DoubleToBytesColumnTransformer.java | 8 +-
.../unary/scalar/EndsWith2ColumnTransformer.java | 8 +-
.../unary/scalar/EndsWithColumnTransformer.java | 8 +-
.../column/unary/scalar/ExpColumnTransformer.java | 6 +-
.../column/unary/scalar/ExtractTransformer.java | 6 +-
.../scalar/FloatToBytesColumnTransformer.java | 8 +-
.../unary/scalar/FloorColumnTransformer.java | 6 +-
.../unary/scalar/FormatColumnTransformer.java | 6 +-
.../scalar/GenericCodecColumnTransformer.java | 10 +-
.../scalar/HmacConstantKeyColumnTransformer.java | 8 +-
.../unary/scalar/IntToBytesColumnTransformer.java | 8 +-
.../unary/scalar/LTrim2ColumnTransformer.java | 8 +-
.../unary/scalar/LTrimColumnTransformer.java | 8 +-
.../unary/scalar/LengthColumnTransformer.java | 4 +-
.../column/unary/scalar/LnColumnTransformer.java | 6 +-
.../unary/scalar/Log10ColumnTransformer.java | 6 +-
.../unary/scalar/LongToBytesColumnTransformer.java | 8 +-
.../unary/scalar/LowerColumnTransformer.java | 6 +-
.../scalar/ObjectLengthColumnTransformer.java | 4 +-
.../unary/scalar/RTrim2ColumnTransformer.java | 8 +-
.../unary/scalar/RTrimColumnTransformer.java | 8 +-
.../unary/scalar/RadiansColumnTransformer.java | 6 +-
.../unary/scalar/RegexpLike2ColumnTransformer.java | 6 +-
.../unary/scalar/RegexpLikeColumnTransformer.java | 6 +-
.../unary/scalar/Replace2ColumnTransformer.java | 6 +-
.../unary/scalar/Replace3ColumnTransformer.java | 6 +-
.../scalar/ReplaceFunctionColumnTransformer.java | 6 +-
.../unary/scalar/RoundColumnTransformer.java | 6 +-
.../scalar/RoundFunctionColumnTransformer.java | 6 +-
.../column/unary/scalar/SignColumnTransformer.java | 6 +-
.../column/unary/scalar/SinColumnTransformer.java | 6 +-
.../column/unary/scalar/SinhColumnTransformer.java | 6 +-
.../column/unary/scalar/SqrtColumnTransformer.java | 6 +-
.../unary/scalar/StartsWith2ColumnTransformer.java | 8 +-
.../unary/scalar/StartsWithColumnTransformer.java | 6 +-
.../unary/scalar/Strcmp2ColumnTransformer.java | 6 +-
.../unary/scalar/StrcmpColumnTransformer.java | 6 +-
.../unary/scalar/Strpos2ColumnTransformer.java | 6 +-
.../unary/scalar/StrposColumnTransformer.java | 6 +-
.../unary/scalar/SubString2ColumnTransformer.java | 6 +-
.../unary/scalar/SubString3ColumnTransformer.java | 8 +-
.../unary/scalar/SubStringColumnTransformer.java | 6 +-
.../column/unary/scalar/TanColumnTransformer.java | 6 +-
.../column/unary/scalar/TanhColumnTransformer.java | 6 +-
.../unary/scalar/Trim2ColumnTransformer.java | 8 +-
.../column/unary/scalar/TrimColumnTransformer.java | 6 +-
.../scalar/TryCastFunctionColumnTransformer.java | 4 +-
.../unary/scalar/UpperColumnTransformer.java | 6 +-
.../scalar/factory/CodecStrategiesFactory.java | 8 +-
.../factory/NumericCodecStrategiesFactory.java | 2 +-
.../unary/scalar/inteface/CodecStrategy.java | 2 +-
.../column/unary/scalar/util/HexUtils.java | 2 +-
.../unary/scalar/util/SpookyHashV2Utils.java | 2 +-
.../unary/scalar/util/TransformerDebugUtils.java | 2 +-
.../dag/input/ConstantInputReader.java | 2 +-
.../intermediate/ConstantIntermediateLayer.java | 2 +-
.../dag/intermediate/IntermediateLayer.java | 2 +-
.../dag/intermediate/MultiInputLayer.java | 2 +-
.../SingleInputMultiReferenceLayer.java | 2 +-
.../SingleInputSingleReferenceLayer.java | 2 +-
.../dag/{dag => }/memory/LayerMemoryAssigner.java | 8 +-
.../unary/scalar/CastFunctionTransformer.java | 2 +-
.../scalar/SubStringFunctionColumnTransformer.java | 4 +-
.../unary/scalar/SubStringFunctionTransformer.java | 2 +-
.../transformation/dag/udf/UDTFContext.java | 4 +-
.../dag/{dag => }/util/BitwiseUtils.java | 2 +-
.../transformation/dag/util/TransformUtils.java | 2 +-
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 4 +-
.../reader/impl/TimeseriesReaderWithViewFetch.java | 4 +-
.../schemaengine/schemaregion/view/ViewPaths.java | 6 +-
.../view/visitor/TransformToExpressionVisitor.java | 52 ++--
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 14 +-
.../queryengine/common/schematree/NodeRefTest.java | 4 +-
.../execution/operator/OperatorMemoryTest.java | 12 +-
.../execution/operator/TransformOperatorTest.java | 4 +-
.../ConvertPredicateToTimeFilterTest.java | 34 +--
.../predicate/PredicatePushIntoScanTest.java | 36 +--
.../predicate/PredicateRemoveNotTest.java | 30 +--
.../expression/predicate/PredicateUtilsTest.java | 10 +-
.../predicate/TreePredicateConversionTest.java | 18 +-
.../serde/CaseWhenThenExpressionTest.java | 18 +-
.../plan/analyze/AggregationDescriptorTest.java | 2 +-
.../queryengine/plan/analyze/AnalyzeFailTest.java | 2 +-
.../db/queryengine/plan/analyze/AnalyzeTest.java | 44 ++--
.../plan/analyze/ExpressionAnalyzerTest.java | 14 +-
.../plan/optimization/AggregationPushDownTest.java | 8 +-
.../optimization/ColumnInjectionPushDownTest.java | 2 +-
.../plan/optimization/LimitOffsetPushDownTest.java | 12 +-
.../plan/optimization/OptimizationTestUtil.java | 2 +-
.../plan/optimization/PredicatePushDownTest.java | 14 +-
.../plan/optimization/TestPlanBuilder.java | 2 +-
.../plan/parser/StatementGeneratorTest.java | 14 +-
.../queryengine/plan/planner/ExpressionTest.java | 6 +-
.../plan/planner/FragmentInstanceSerdeTest.java | 2 +-
.../plan/planner/PipelineBuilderTest.java | 2 +-
.../distribution/AggregationDistributionTest.java | 4 +-
.../plan/planner/distribution/Util.java | 4 +-
.../logical/DataQueryLogicalPlannerTest.java | 10 +-
.../logical/SchemaQueryLogicalPlannerTest.java | 4 +-
.../node/process/AggregationNodeSerdeTest.java | 6 +-
.../planner/node/process/FilterNodeSerdeTest.java | 8 +-
.../node/process/GroupByLevelNodeSerdeTest.java | 8 +-
.../node/process/GroupByTagNodeSerdeTest.java | 10 +-
.../planner/node/process/WindowNodeSerdeTest.java | 6 +-
.../source/SeriesAggregationScanNodeSerdeTest.java | 8 +-
.../plan/relational/analyzer/AnalyzerTest.java | 2 +-
.../plan/relational/analyzer/TSBSMetadata.java | 2 +-
.../relational/analyzer/TableFunctionTest.java | 6 +-
.../plan/relational/analyzer/TestMetadata.java | 6 +-
...meticAndCompareBinaryColumnTransformerTest.java | 13 +-
.../binary/LogicBinaryColumnTransformerTest.java | 5 +-
.../binary/hmac/HmacMd5ColumnTransformerTest.java | 10 +-
.../binary/hmac/HmacSha1ColumnTransformerTest.java | 10 +-
.../hmac/HmacSha256ColumnTransformerTest.java | 10 +-
.../hmac/HmacSha512ColumnTransformerTest.java | 10 +-
.../column/ternary/LpadColumnTransformerTest.java | 3 +-
.../column/ternary/RpadColumnTransformerTest.java | 3 +-
.../column/unary/UnaryColumnTransformerTest.java | 9 +-
.../scalar/BlobLengthColumnTransformerTest.java | 3 +-
.../column/unary/scalar/DateBinFunctionTest.java | 2 +-
.../FromBigEndian32ColumnTransformerTest.java | 6 +-
.../FromBigEndian64ColumnTransformerTest.java | 6 +-
...omIEEE754_32BigEndianColumnTransformerTest.java | 6 +-
...omIEEE754_64BigEndianColumnTransformerTest.java | 6 +-
.../FromLittleEndian32ColumnTransformerTest.java | 6 +-
.../FromLittleEndian64ColumnTransformerTest.java | 6 +-
.../ToBigEndian32ColumnTransformerTest.java | 6 +-
.../ToBigEndian64ColumnTransformerTest.java | 6 +-
...ToIEEE754_32BigEndianColumnTransformerTest.java | 6 +-
...ToIEEE754_64BigEndianColumnTransformerTest.java | 6 +-
.../ToLittleEndian32ColumnTransformerTest.java | 6 +-
.../ToLittleEndian64ColumnTransformerTest.java | 6 +-
.../unary/scalar/ReverseColumnTransformerTest.java | 5 +-
.../FromBase32ColumnTransformerTest.java | 6 +-
.../FromBase64ColumnTransformerTest.java | 6 +-
.../FromBase64UrlColumnTransformerTest.java | 6 +-
.../ToBase32ColumnTransformerTest.java | 6 +-
.../ToBase64ColumnTransformerTest.java | 6 +-
.../ToBase64UrlColumnTransformerTest.java | 6 +-
.../scalar/hashing/Crc32ColumnTransformerTest.java | 4 +-
.../scalar/hashing/Md5ColumnTransformerTest.java | 6 +-
.../hashing/Murmur3ColumnTransformerTest.java | 6 +-
.../scalar/hashing/Sha1ColumnTransformerTest.java | 6 +-
.../hashing/Sha256ColumnTransformerTest.java | 6 +-
.../hashing/Sha512ColumnTransformerTest.java | 6 +-
.../SpookyHashV2_32ColumnTransformerTest.java | 6 +-
.../SpookyHashV2_64ColumnTransformerTest.java | 6 +-
.../hashing/XxHash64ColumnTransformerTest.java | 6 +-
.../hexEncoding/FromHexColumnTransformerTest.java | 6 +-
.../hexEncoding/ToHexColumnTransformerTest.java | 6 +-
.../transformation/dag/util/BitwiseUtilsTest.java | 17 +-
488 files changed, 1989 insertions(+), 2016 deletions(-)
diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl
index 554a2c285ca..2e2c3f50f1c 100644
--- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl
+++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl
@@ -31,7 +31,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
-import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.tsfile.block.column.Column;
@@ -175,7 +175,7 @@ public class ${className} extends BinaryColumnTransformer {
package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
-import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.tsfile.block.column.Column;
@@ -293,7 +293,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl
index 2f71280aef9..038cd0ecd54 100644
--- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl
+++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl
@@ -23,12 +23,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
import org.apache.tsfile.read.common.type.Type;
-import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.AdditionResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.DivisionResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.ModulusResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.MultiplicationResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.SubtractionResolver;
-import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.DoubleNegationColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.FloatNegationColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IntNegationColumnTransformer;
diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl
index c893a601217..0afb3f57085 100644
--- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl
+++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl
@@ -26,7 +26,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
-import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java
index f02df34223e..41ac3da5b93 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java
@@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme;
import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder;
@@ -164,8 +164,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToInt64Litera
import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToStringLiteralVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.utils.datastructure.SortKey;
import org.apache.iotdb.udf.api.relational.TableFunction;
import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java
index 70c4f888e24..ee67c75734c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi;
+package org.apache.iotdb.db.node_commons.plan.expression.multi;
/** */
public enum FunctionType {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java
index 4aae233fd40..4aca02fc832 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java
index 4bec7ab1a76..b6ab0aa4075 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import java.util.Locale;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java
index b07b0968acb..a3cdfa26c03 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java
index 1d148d01bba..6e139182ef5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java
index 52de5597641..2bb222fadd3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import java.util.Objects;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java
index 40d06479025..621d3feb109 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
public enum OperatorType {
ADD("+", 2),
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java
index 4e406fd8cff..06d1f7de1d3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java
index bcb46be547b..2d30e2d74a1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java
index 514d33b6797..004f6114bd3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.CapacityTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.CumulateTableFunction;
@@ -25,9 +25,9 @@ import org.apache.iotdb.commons.udf.builtin.relational.tvf.HOPTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.SessionTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.TumbleTableFunction;
import org.apache.iotdb.commons.udf.builtin.relational.tvf.VariationTableFunction;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ClassifyTableFunction;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.PatternMatchTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ClassifyTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.PatternMatchTableFunction;
import org.apache.iotdb.udf.api.relational.TableFunction;
import java.util.Arrays;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java
index 4517f2fea09..09422c484db 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function;
+package org.apache.iotdb.db.node_commons.plan.relational.function;
import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java
index 4690bc2a416..c4b1de02797 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic;
+package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java
index 11854c0b47c..4a8fd0143d5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic;
+package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java
index 78b2ce53879..3816abd18cb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic;
+package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java
index cb61801c3b0..07e0070d34e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic;
+package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java
index bc79daedc3c..f788d6a50c7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic;
+package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java
index 96e6ae36ee6..576acacf292 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf;
import org.apache.iotdb.ainode.rpc.thrift.TForecastReq;
import org.apache.iotdb.ainode.rpc.thrift.TForecastResp;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java
index a89f1bf771a..3d55302d2ff 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf;
import org.apache.iotdb.ainode.rpc.thrift.TForecastReq;
import org.apache.iotdb.ainode.rpc.thrift.TForecastResp;
@@ -72,8 +72,8 @@ import java.util.Set;
import java.util.stream.Collectors;
import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.checkType;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.parseOptions;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.TableFunctionUtils.checkType;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.TableFunctionUtils.parseOptions;
import static org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender;
public class ForecastTableFunction implements TableFunction {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java
index b300edb1093..f1cf66f7bc3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.QetchAlgorithm;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.MatchState;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Point;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.RegexMatchState;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Section;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.QetchAlgorithm;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.MatchState;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Point;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.RegexMatchState;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Section;
import org.apache.iotdb.udf.api.exception.UDFException;
import org.apache.iotdb.udf.api.relational.TableFunction;
import org.apache.iotdb.udf.api.relational.access.Record;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java
index 7f798a215f9..4ae0339c596 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.udf.api.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java
index 0c0da76cfb7..32bdba11b77 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match;
public class MatchConfig {
// if the gap between new two points is larger than this times gap before, the new point
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java
index d47cce178ed..ebe77106dbd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.MatchState;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.PatternSegment;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Point;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.RegexMatchState;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Section;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.MatchState;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.PatternSegment;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Point;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.RegexMatchState;
+import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Section;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -32,9 +32,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.GAP_TOLERANCE;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.PatternSegment.tangent;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.PatternSegment.tangent;
public class QetchAlgorithm {
private int pointNum = -1;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java
index 4fe89134c26..4435352346a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model;
import java.util.ArrayList;
import java.util.List;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.SHAPE_TOLERANCE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE;
public class MatchState {
private double matchValue = 0.0;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java
index fcb1cf895e5..e7fe93ec36b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model;
import java.util.ArrayList;
import java.util.List;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE;
public class PatternSegment {
// variable area
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java
index 7b7ecc26da2..0a0b0152895 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model;
public class Point {
public double x;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java
index 8d039b1a76d..da64e0b6f0d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -25,8 +25,8 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.List;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.SHAPE_TOLERANCE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE;
public class RegexMatchState {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java
index fee4d4f9f34..af359d5db7e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model;
+package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java
index 3d95026146c..bd1b702ad71 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.node_commons.plan.relational.metadata;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java
index f91d592615d..97b61dddef4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.node_commons.plan.relational.planner.node;
-import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType;
+import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
index e8e145b9705..62f50b06da7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -144,12 +144,12 @@ import org.apache.iotdb.db.queryengine.plan.analyze.schema.ClusterSchemaFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher;
import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult;
import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator;
import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java
index 1896a19573a..fb7938309af 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation;
import org.apache.iotdb.common.rpc.thrift.TAggregationType;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java
index 7f0f9ec24f0..73ec966b84b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.execution.aggregation;
import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory;
import org.apache.iotdb.udf.api.State;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
index 861f621c78c..7e041e8551a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator;
import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java
index c66525a53dc..d79fc284804 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer;
import org.apache.tsfile.read.common.TimeRange;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java
index 73635b9e23b..92beafd3ab3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java
@@ -22,16 +22,16 @@ package org.apache.iotdb.db.queryengine.execution.operator.process;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.AbstractCaseWhenThenColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MappableUDFColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.AbstractCaseWhenThenColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java
index e5b72cd7083..eb75b8edd5a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.YieldableState;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java
index 89623529a3f..c3eb3355211 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java
@@ -30,7 +30,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Set;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
// with month interval
public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java
index 0910ac07fff..40cb5fef8cb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java
@@ -31,7 +31,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Set;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java
index d1cde369a43..738e35cd5cf 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java
@@ -27,7 +27,7 @@ import org.apache.tsfile.enums.TSDataType;
import java.time.ZoneId;
import java.util.List;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java
index f72b818a9e1..d4f8b86abef 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java
@@ -26,7 +26,7 @@ import org.apache.tsfile.enums.TSDataType;
import java.util.List;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin;
public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java
index 2fcd151deb2..7d80cbdb46e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView;
import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition;
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java
index f94425e9e20..cc883bc7ad6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.schema.node.role.IDeviceMNode;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java
index ce4d43434b5..ef71258c7c9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.schema.node.role.IDeviceMNode;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java
index 56e8a776157..42c87b94499 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
import java.util.Iterator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java
index 9dba69842ff..9cd6102c1be 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
import org.apache.iotdb.commons.utils.PathUtils;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java
index a4ef5e715dc..06716c91e36 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.schema.node.role.IDeviceMNode;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java
index 5c1922ae758..58001a89366 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java
@@ -65,7 +65,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo;
import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.node_commons.common.ConnectionInfo;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java
index bc39e0fd29a..a9cc81171fb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.execution.operator.window;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
public class ConditionWindowParameter extends WindowParameter {
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 8850b343a2a..47182c0a849 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
@@ -24,11 +24,11 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.MultiplicationResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression;
@@ -74,129 +74,129 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContex
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.TableCaseWhenThenColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.TableCaseWhenThenColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessThanColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.Like2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.AbstractGreatestLeastColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.CoalesceColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InBinaryMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InBooleanMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InDoubleMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InFloatMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InInt32MultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InInt64MultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.LogicalAndMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.LogicalOrMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.BetweenColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.Like3ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.LpadColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.RpadColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.udf.UserDefineScalarFunctionTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AbsColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AcosColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AsinColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AtanColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitCount2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitCountColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseAnd2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseAndColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseLeftShift2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseLeftShiftColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseNotColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseOr2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseOrColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShift2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseXor2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseXorColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BlobLengthColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToFloatColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CRC32Transformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CastFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CeilColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Concat2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatMultiColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CosColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CoshColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DegreesColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.EndsWith2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.EndsWithColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExpColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExtractTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloatToBytesColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloorColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FormatColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrim2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrimColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LengthColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LnColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Log10ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LowerColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ObjectLengthColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrim2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrimColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RadiansColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RegexpLike2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RegexpLikeColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Replace2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Replace3ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SignColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SinColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SinhColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SqrtColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWith2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Strcmp2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StrcmpColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Strpos2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StrposColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubString2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubString3ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TanColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TanhColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Trim2ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TryCastFunctionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.UpperColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.Like2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.CoalesceColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBinaryMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBooleanMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InDoubleMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InFloatMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt32MultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt64MultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalAndMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalOrMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.Like3ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.LpadColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.RpadColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.udf.UserDefineScalarFunctionTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AbsColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AcosColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AsinColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AtanColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCountColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CeilColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Concat2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CosColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CoshColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DegreesColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWithColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExpColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloorColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FormatColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LengthColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LnColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Log10ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LowerColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RadiansColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace3ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SignColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinhColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SqrtColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrcmpColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrposColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString3ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanhColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Trim2ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.UpperColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis;
import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments;
import org.apache.iotdb.udf.api.relational.ScalarFunction;
@@ -232,15 +232,15 @@ import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType;
import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter;
+import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral;
import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType;
import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy;
import static org.apache.tsfile.read.common.type.BlobType.BLOB;
import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN;
import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
index b837a33cd0d..3dc50e768b7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
@@ -39,9 +39,9 @@ import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySource;
import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceContext;
import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate;
import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
index d60fb710593..dacdc69ba45 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
@@ -62,14 +62,14 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.DataNodeSchemaLockManag
import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.SchemaValidator;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExistUnknownTypeInExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExistUnknownTypeInExpression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.MeasurementGroup;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java
index 0b60a8bd709..041f08e1b5c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.path.PathPatternTreeUtils;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn;
import org.apache.iotdb.db.queryengine.plan.statement.component.SelectComponent;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
index 2d507b13072..9a847a9ebd1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
@@ -27,32 +27,32 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.BindTypeForTimeSeriesOperandVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectAggregationExpressionsVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectSourceExpressionsVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionNormalizeVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.GetMeasurementExpressionVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.LowercaseNormalizeVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ReplaceRawPathWithGroupedPathVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ReplaceSubTreeWithViewVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForPredicateVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.BindTypeForTimeSeriesOperandVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectAggregationExpressionsVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectSourceExpressionsVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionNormalizeVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.GetMeasurementExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.LowercaseNormalizeVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ReplaceRawPathWithGroupedPathVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ReplaceSubTreeWithViewVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForPredicateVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn;
import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction;
import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java
index f621bef85ee..f57c80980de 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java
@@ -21,26 +21,26 @@ package org.apache.iotdb.db.queryengine.plan.analyze;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.common.NodeRef;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDAFInformationInferrer;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer;
import org.apache.iotdb.db.utils.TypeInferenceUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java
index 6754101e0d5..1d9bb7838d5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java
@@ -21,36 +21,36 @@ package org.apache.iotdb.db.queryengine.plan.analyze;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java
index 1e276c91ad8..a220fdf2883 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.tsfile.utils.Pair;
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 bab3676b2f7..55cfd18f16f 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
@@ -23,25 +23,25 @@ import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical.PredicateCanPushDownToSourceChecker;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical.TimeFilterExistChecker;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicatePushIntoScanChecker;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicateSimplifier;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.visitor.predicate.ReversePredicateVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.logical.PredicateCanPushDownToSourceChecker;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.logical.TimeFilterExistChecker;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToFilterVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicatePushIntoScanChecker;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicateSimplifier;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ReversePredicateVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java
index a8441712c2d..7e23b0b4590 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java
@@ -22,8 +22,8 @@ package org.apache.iotdb.db.queryengine.plan.analyze;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.Pair;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java
index 1a91415fade..8e8fd3cd406 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java
@@ -24,11 +24,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn;
import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java
index daf7c33f7c1..21b8d9d8dc1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java
@@ -29,10 +29,10 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn;
import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java
index 911e86fefb7..3bfe91c75d1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.plan.analyze;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
@@ -41,7 +41,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING;
+import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING;
/**
* If in align by device query ,all queried devices are set in one template, we can store the common
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java
index c90456cba0e..e5a6b8458cc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java
@@ -38,7 +38,7 @@ import java.util.Objects;
import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING;
+import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING;
public class TypeProvider {
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 73baddacb4e..cf404e8d57b 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
@@ -250,8 +250,8 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.sys.quota.ShowSpace
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.quota.ShowThrottleQuotaTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowSubscriptionsTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowTopicsTask;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TransformToViewExpressionVisitor;
+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.metadata.write.view.AlterLogicalViewNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
index 8c1dcbce787..b99e8c6fbf3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.udf.UDFInformation;
import org.apache.iotdb.commons.udf.UDFType;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java
similarity index 80%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java
index a3c437cd372..cb0483d75d3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java
@@ -17,42 +17,42 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression;
+package org.apache.iotdb.db.queryengine.plan.expression;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java
similarity index 78%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java
index 463da9bb405..b45a90c5b80 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java
@@ -17,33 +17,33 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression;
+package org.apache.iotdb.db.queryengine.plan.expression;
import org.apache.iotdb.common.rpc.thrift.TAggregationType;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java
index 0b99dce1f50..81a98956c47 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression;
+package org.apache.iotdb.db.queryengine.plan.expression;
public enum ExpressionType {
CONSTANT((short) -4, (short) 1400),
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java
index 346b66987a3..459f19680d6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression;
+package org.apache.iotdb.db.queryengine.plan.expression;
public class UnknownExpressionTypeException extends IllegalArgumentException {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java
index 37ac2f7f74f..88383201cf7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java
index 8bdacebc086..a43e348ffe9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java
index 0ab008d6e48..31a75b2825e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java
similarity index 69%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java
index ba03aaa64af..7b2f744f1d0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.GREATER_EQUAL;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.GREATER_THAN;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.LESS_EQUAL;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.LESS_THAN;
+import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.GREATER_EQUAL;
+import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.GREATER_THAN;
+import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.LESS_EQUAL;
+import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.LESS_THAN;
public abstract class CompareBinaryExpression extends BinaryExpression {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java
index 2128de94fc0..ca8bd5a2d28 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java
index 5378780d55f..ae61914c6a4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java
index 384c079e320..3f8c32cb77e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java
index e6313087f0b..484a0ce51cc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java
index c621a813287..74d80793f7e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java
index 2637450827b..413476f2c49 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java
index a70906d48c8..e73977fd148 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java
index 933b4fc0876..a8adeb070b1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java
index d32c12f9a50..134208d0423 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java
index c29d3f5a0ce..6e98a30bd32 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java
index 0053407607f..8ed7d625d5b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java
index e73b9093e49..e1a19a64d2f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java
index d24f2ba5e53..c6ee62cbeaa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java
index 562d344f944..c12c09852af 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary;
+package org.apache.iotdb.db.queryengine.plan.expression.binary;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import java.nio.ByteBuffer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java
index d46997c1ea8..98b78740ae7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf;
+package org.apache.iotdb.db.queryengine.plan.expression.leaf;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java
index add22bf2241..f01051a5c38 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf;
+package org.apache.iotdb.db.queryengine.plan.expression.leaf;
import org.apache.iotdb.db.node_commons.common.NodeRef;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java
index 046a59748b8..d4ae229171a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf;
+package org.apache.iotdb.db.queryengine.plan.expression.leaf;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java
index 10688633f48..dbc82a3b715 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf;
+package org.apache.iotdb.db.queryengine.plan.expression.leaf;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java
index cb4b9ba7891..459cb753403 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf;
+package org.apache.iotdb.db.queryengine.plan.expression.leaf;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java
index 11836b7ba4f..638bdc79a89 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java
@@ -17,23 +17,23 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi;
+package org.apache.iotdb.db.queryengine.plan.expression.multi;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType;
+import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction;
import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction;
import org.apache.iotdb.db.queryengine.plan.udf.TreeUDFUtils;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer;
import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java
index ddafd90b772..9a7cdfca87f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java
@@ -17,6 +17,6 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin;
public interface BuiltInFunctionHelper {}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java
index f7462584fa2..621b06660a8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.tsfile.enums.TSDataType;
@@ -71,7 +71,7 @@ public interface BuiltInScalarFunctionHelper extends BuiltInFunctionHelper {
/**
* Construct a {@link Transformer} for this built-in function in {@link
- * org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.IntermediateLayerVisitor}
+ * org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor}
*
* @param expression The FunctionExpression representing the scalar function
* @param layerReader input reader
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java
similarity index 69%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java
index 9892793baf3..80cf9d28276 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.DiffFunctionHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.ReplaceFunctionHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.RoundFunctionHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.SubStringFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.DiffFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.ReplaceFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.RoundFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.SubStringFunctionHelper;
public class BuiltInScalarFunctionHelperFactory {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java
index e9a3eb39fe0..9a610ba05fc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CastFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.CastFunctionTransformer;
import org.apache.iotdb.db.utils.DateTimeUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java
index 02445b9ce54..858d21ecad8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.DiffFunctionTransformer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java
index bb81afa54d2..af28d6cc857 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.ReplaceFunctionTransformer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java
index 480cf9c3393..0a4a8bf4a73 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.RoundFunctionTransformer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java
index a251321b972..7d9490ac759 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper;
+package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionTransformer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java
index 0fe1acae156..07023786cf0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other;
+package org.apache.iotdb.db.queryengine.plan.expression.other;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java
index c6e6789a828..4a68d7f01db 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other;
+package org.apache.iotdb.db.queryengine.plan.expression.other;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java
index 6f09047614d..63cc341e80f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java
@@ -19,12 +19,12 @@
*
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary;
+package org.apache.iotdb.db.queryengine.plan.expression.ternary;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.utils.RamUsageEstimator;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java
index a6c3239ea5e..4db828bc4f1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java
@@ -19,13 +19,13 @@
*
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary;
+package org.apache.iotdb.db.queryengine.plan.expression.ternary;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java
index 441fc56333c..78536161df5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.utils.RamUsageEstimator;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java
index 875f5139f74..3baf8dcffd4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.utils.RamUsageEstimator;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java
index 3f1c351a8f8..9a58bfdc46b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.utils.RamUsageEstimator;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java
similarity index 74%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java
index 47d83b4f572..5c8bcf65126 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java
similarity index 77%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java
index 17369a1f22f..b6b0bb453dd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java
index 70581923c71..bd5a4323188 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
import org.apache.tsfile.external.commons.lang3.Validate;
import org.apache.tsfile.utils.RamUsageEstimator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java
index 3659ce76433..50d673a564d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary;
+package org.apache.iotdb.db.queryengine.plan.expression.unary;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
index ab85ec601b2..13df1ff2c2b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java
index 30cfd786270..5595a92585c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import java.util.Collections;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java
similarity index 75%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java
index 761483dbb8c..156dbe72d17 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import java.util.Collections;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java
similarity index 77%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java
index f8d19045580..16e545d768d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
import java.util.ArrayList;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java
index 06d4b1971fe..8e7bb0a129e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java
@@ -17,58 +17,58 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.TreeCaseWhenThenColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticModuloColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicAndColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicOrColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.TreeCaseWhenThenColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticDivisionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticModuloColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticSubtractionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessThanColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicAndColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicOrColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MappableUDFColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.BetweenColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.ArithmeticNegationColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.InColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.RegularColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.ArithmeticNegationColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.InColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.RegularColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils;
@@ -84,7 +84,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.BETWEEN;
+import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.BETWEEN;
import static org.apache.tsfile.enums.TSDataType.UNKNOWN;
import static org.apache.tsfile.read.common.type.LongType.INT64;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java
index 772e0189bc3..f8bb7b8dbe7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.metadata.view.BrokenViewException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
import java.util.ArrayList;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java
index cf8244a92a6..b62e1a23045 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
public class ConcatDeviceVisitor extends ReconstructVisitor<String> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java
similarity index 82%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java
index afd25304d54..1a573f856c2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import java.util.Collections;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java
similarity index 78%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java
index 92ebf363925..d786e48dd00 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java
index e9b2019bf0f..e31921d7c64 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java
index cc3c2851e92..59868395c39 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java
similarity index 64%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java
index 1a0bec9dc67..74537fb60b8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java
@@ -17,44 +17,44 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
-
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
+
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
/**
* 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/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java
index 7a15635b785..4eefc378cfa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
public class GetMeasurementExpressionVisitor extends ReconstructVisitor<Analysis> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java
index 759d0a14c59..a7b11f2cfd2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java
@@ -17,34 +17,34 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.node_commons.common.NodeRef;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.ConstantIntermediateLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.IntermediateLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.MultiInputLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.SingleInputMultiReferenceLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.SingleInputSingleReferenceLayer;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary.ArithmeticAdditionTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary.ArithmeticDivisionTransformer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java
index 64fe89d0d42..973388dba1e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java
index 1e159ed4887..94e20226375 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import java.util.ArrayList;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java
index b4d80f134d5..57b2b65a529 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import static org.apache.iotdb.commons.schema.SchemaConstant.ROOT;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java
index 96092383e6f..39fe3c637c9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.view.LogicalViewSchema;
import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor;
import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java
index 5d9c6428179..dd71fbca165 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.plan.analyze.GroupByLevelHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
import java.util.function.UnaryOperator;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java
index 9d52c0d3fa5..49702ff5528 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java
index 18358df5e0f..682ed410934 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.tsfile.write.schema.IMeasurementSchema;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java
index 75f2ee419eb..27befb28c90 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.commons.schema.view.viewExpression.binary.arithmetic.AdditionViewExpression;
@@ -45,33 +45,33 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.LikeViewExpress
import org.apache.iotdb.commons.schema.view.viewExpression.unary.LogicNotViewExpression;
import org.apache.iotdb.commons.schema.view.viewExpression.unary.NegationViewExpression;
import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import org.apache.tsfile.utils.Pair;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java
index 4ef553d02ad..a26863e5a4e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
@@ -26,12 +26,12 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CompleteMeasurementSchemaVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor;
import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor;
import org.apache.iotdb.db.utils.constant.SqlConstant;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java
index 49c16f76bdf..71691cd79e6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.tsfile.external.commons.lang3.Validate;
@@ -45,7 +45,7 @@ import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.carte
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
+import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions;
import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java
index 381ff5503d9..78a9b2ab974 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java
index 9bf57bf0274..00e71b6f08c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
@@ -25,11 +25,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.tsfile.external.commons.lang3.Validate;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
+import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions;
import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java
index a1a79b84622..79fdd754f27 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.tsfile.enums.TSDataType;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
+import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
public class ConcatDeviceAndBindSchemaForHavingVisitor
extends ConcatDeviceAndBindSchemaForExpressionVisitor {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java
index ed5776255a5..e263970ed80 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.tsfile.external.commons.lang3.Validate;
@@ -40,7 +40,7 @@ import java.util.List;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
+import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath;
public class ConcatDeviceAndBindSchemaForPredicateVisitor
extends CartesianProductVisitor<ConcatDeviceAndBindSchemaForPredicateVisitor.Context> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java
index 55509306645..391c66ad3c2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.tsfile.common.constant.TsFileConstant;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java
index dbbee1bb0fa..2eb0ec0b4e7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java
similarity index 73%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java
index 21654f57e58..d3369e2c9d0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor;
public abstract class LogicalAndVisitor<C> extends ExpressionAnalyzeVisitor<Boolean, C> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java
similarity index 73%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java
index 31fd5bdb62a..96c0077460e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor;
public abstract class LogicalOrVisitor<C> extends ExpressionAnalyzeVisitor<Boolean, C> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java
index e80d539593c..3a7c1ddbb37 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
public class PredicateCanPushDownToSourceChecker extends LogicalAndVisitor<Void> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java
similarity index 79%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java
index 5c7103a8b3f..a1d0992facc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
public class TimeFilterExistChecker extends LogicalOrVisitor<Void> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java
index 85586f180ff..1b14f058337 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java
@@ -17,30 +17,30 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import org.apache.iotdb.db.utils.DateTimeUtils;
import com.google.common.io.BaseEncoding;
@@ -65,7 +65,7 @@ import java.util.Map;
import java.util.Set;
import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression.flipType;
+import static org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression.flipType;
import static org.apache.tsfile.enums.TSDataType.DOUBLE;
import static org.apache.tsfile.enums.TSDataType.INT32;
import static org.apache.tsfile.enums.TSDataType.INT64;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java
index 6748103aec1..7982de7d015 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java
@@ -17,27 +17,27 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate;
-
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate;
+
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
import org.apache.tsfile.enums.TSDataType;
@@ -51,7 +51,7 @@ import java.util.Set;
import java.util.TimeZone;
import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression.flipType;
+import static org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression.flipType;
import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG;
public class ConvertPredicateToTimeFilterVisitor extends PredicateVisitor<Filter, Void> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java
similarity index 76%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java
index 1bf3a84a3ec..f692e27a858 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java
@@ -17,26 +17,26 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate;
-
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate;
+
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java
similarity index 81%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java
index 24d4383b622..be81a33587c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java
@@ -17,35 +17,35 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor;
import java.util.ArrayList;
import java.util.List;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue;
+import static org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue;
public class PredicateSimplifier extends ExpressionAnalyzeVisitor<Expression, Void> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java
similarity index 61%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java
index c3434c3150d..fe36b95fd04 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java
@@ -17,25 +17,25 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate;
-
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate;
+
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor;
/**
* 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/expression/expression/visitor/predicate/ReversePredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java
similarity index 71%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java
index d873d1abe8b..e9b5c715fb4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java
@@ -17,26 +17,25 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.plan.expression.expression.visitor.predicate;
-
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicateVisitor;
+package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate;
+
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
public class ReversePredicateVisitor extends PredicateVisitor<Expression, Void> {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java
index 415ab0e5554..6dac919560c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java
@@ -33,9 +33,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChi
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java
index cf0717a2c8e..42fbd67b39e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildP
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java
index 0bd88de4c05..b0f2c66be70 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java
@@ -33,8 +33,8 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils;
import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
index c759ec67fc5..113209f31af 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
@@ -71,37 +71,37 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.Inferenc
import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.TailInferenceWindow;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property;
@@ -308,7 +308,7 @@ import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter;
+import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter;
import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime;
import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter;
import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
index 0c7b1854400..4fc5e50a060 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java
@@ -30,13 +30,13 @@ import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser;
import org.apache.iotdb.db.qp.sql.SqlLexer;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.component.FromComponent;
import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java
index 13de7172861..81514efbffd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java
@@ -118,8 +118,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.Table
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryCountNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryScanNode;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
index c9b0923cb19..10365024d4e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
@@ -41,9 +41,9 @@ import org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
index 5a6fa3c1a7b..47695ce2683 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
@@ -26,8 +26,8 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TransformToViewExpressionVisitor;
+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.ExplainAnalyzeNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
index 1407bf79f1e..6407bf67631 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
@@ -172,12 +172,12 @@ import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils;
import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ColumnTransformerVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ColumnTransformerVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator;
import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode;
@@ -265,8 +265,8 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem;
import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext;
import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType;
import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator;
@@ -324,7 +324,7 @@ import static org.apache.iotdb.db.queryengine.execution.operator.process.join.me
import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID;
import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID;
import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING;
+import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING;
import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor.getAggregationTypeByFuncName;
import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL;
import static org.apache.iotdb.db.queryengine.plan.statement.component.Ordering.ASC;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java
index 73ac215bf75..128c998b4f7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java
@@ -25,9 +25,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocatio
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep;
import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java
index 944a0ad2929..0a7d3695658 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java
index 71dc7d115f7..5055f43aaf0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.distribution;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.tsfile.external.commons.lang3.Validate;
import org.apache.tsfile.read.filter.basic.Filter;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java
index f522c361c8f..d9005b42bec 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.PlanFragmentId;
import org.apache.iotdb.db.queryengine.plan.ClusterTopology;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.AbstractFragmentParallelPlanner;
import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance;
import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
index aeccd9b9e82..c7c4387c61e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
@@ -31,7 +31,7 @@ import org.apache.iotdb.commons.schema.table.Audit;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper;
-import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType;
+import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode;
@@ -39,9 +39,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ConcatDeviceVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.ConcatDeviceVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.BaseSourceRewriter;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode;
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 75d9bba5b2e..cd61a2f5737 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
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.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/TreeModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java
index a2ad33f1758..132077d801b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.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.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.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/node/PlanGraphPrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
index e1365ab5e50..5beb295214b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
@@ -49,7 +49,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNo
import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode;
import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode;
import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java
index 47ebfdb1d07..f5637e0c954 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java
index 33ec8c5f41f..c426aa85612 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java
index 9e6094df370..996cd48fd0f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java
index b94ccd5e871..8468770de5f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java
index c6b90976d50..f2443b7591f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
index 774db7567e3..0251dbdaa80 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
index dacad0bac38..88be2ddd980 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java
index b21341c003e..9d2acee670b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java
index d1ace2f44d3..f935bc2d6b7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
index e950d2ab646..2b0ae8a9e13 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source;
import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java
index 6b2f0b25d0b..e7553320728 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java
index 3f619520ca1..62136d5764e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java
index 8a2bb0c59bb..707ccc1c41a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.tsfile.utils.Accountable;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java
index f903a5909a2..415723ad1e7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import com.google.common.collect.ImmutableList;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java
index 1d27848cb67..40ad0aab985 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter;
import org.apache.iotdb.common.rpc.thrift.TAggregationType;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
index fac6a1be5e0..d986baf2faa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter;
import org.apache.iotdb.common.rpc.thrift.TAggregationType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java
index 8cd35ccbcaf..ec277b5aae1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter;
import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.tsfile.utils.ReadWriteIOUtils;
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 0a056eb14a7..004cad13460 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
@@ -22,10 +22,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind;
+import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
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 bdc23a3c667..eaf59bd02d3 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
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns;
@@ -272,7 +272,7 @@ import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES;
import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME;
import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName;
import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL;
import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER;
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 bd79521fcd4..cafb9b92411 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
@@ -76,7 +76,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter;
+import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java
index d3afbe87049..f761134be93 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java
@@ -62,7 +62,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter;
+import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference;
/**
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 1a39aa0e147..7ca39440de2 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
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction;
import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType;
+import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException;
import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java
index 7932f830162..9362de110d8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.metadata;
import org.apache.iotdb.commons.exception.IoTDBException;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType;
+import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType;
import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature;
import com.google.common.base.Joiner;
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 7ecac03a947..eeb92adf50c 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
@@ -32,13 +32,13 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunctio
import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer;
import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.MultiplicationResolver;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType;
+import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver;
+import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager;
import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager;
@@ -77,7 +77,7 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME;
import static org.apache.tsfile.read.common.type.BinaryType.TEXT;
import static org.apache.tsfile.read.common.type.BlobType.BLOB;
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/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java
index 48c0b0b8f57..5adec402229 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.InterpretedFunctionInvoker;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType;
+import org.apache.iotdb.db.node_commons.plan.relational.function.InterpretedFunctionInvoker;
+import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression;
@@ -49,7 +49,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor;
@@ -82,7 +82,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Arithmeti
import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature;
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.isEffectivelyLiteral;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction;
public class IrExpressionInterpreter {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java
index f816aa424b8..9e8fa898d27 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType;
+import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression;
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 99d035af37e..0fb65377d9a 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
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException;
+import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException;
import org.apache.tsfile.utils.Pair;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
index 721a99cc178..59a2d94ae7b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
@@ -36,8 +36,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments;
import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme;
@@ -144,7 +144,7 @@ import java.util.stream.IntStream;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE;
import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability;
import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL;
import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java
index 46c1494f5ec..e95e54bc013 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java
@@ -40,7 +40,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Compariso
import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND;
import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin;
public class GapFillStartAndEndTimeExtractVisitor
extends AstVisitor<Boolean, GapFillStartAndEndTimeExtractVisitor.Context> {
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 a3b8ec485dd..ed3f8c85e97 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
@@ -37,7 +37,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException;
+import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor;
import org.apache.tsfile.utils.Pair;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java
index 3843d16a4cf..5469f4d29c4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode;
import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java
index 93714a9a98f..b6ea2b034b3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java
index e4a790c36ac..b6f66f5afa6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
@@ -44,7 +44,7 @@ import java.util.Optional;
import static com.google.common.base.Verify.verify;
import static java.util.Objects.requireNonNull;
-import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE;
+import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE;
import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java
index 21e712beb88..8c7fc61a66d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java
@@ -56,7 +56,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patte
import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality;
import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME;
import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN;
import static org.apache.tsfile.read.common.type.LongType.INT64;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java
index 133cd1d8075..d41de1b3a0e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java
index 92ff9b9fcfb..2596d2e6d64 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java
index d04cf6925fa..997704f2429 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations;
import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind;
+import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId;
+import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability;
import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction;
import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java
index 45deb5b94fb..0cfe868f902 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java
@@ -39,8 +39,8 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics;
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java
index 2049b6d5dfa..ec45a90a4b8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component;
import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
public abstract class GroupByComponent extends StatementNode {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java
index 9d441c7c891..2e54f2b4a0d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
public class GroupByConditionComponent extends GroupByComponent {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java
index e6fcb88d989..34d7d272c63 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
/** This class maintains information of {@code HAVING} clause. */
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java
index 878b95515e6..00bd6f01b0a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java
index 4bee56ea220..236a939dc9a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
import java.util.ArrayList;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java
index f6daf263e0b..f9739133081 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
import java.util.Objects;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java
index 0e20be2b339..1bf41bd8abf 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
import java.util.ArrayList;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java
index c45c1f97e5d..6d6bb4ef30a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java
index d581a6df2cc..7352c1e96fc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.statement.component;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.StatementNode;
/** This class maintains information of {@code WHERE} clause. */
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java
index 92ad2c33ae8..d966903abd3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java
@@ -24,10 +24,10 @@ import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType;
import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.InferenceWindow;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CountTimeAggregationAmountVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.CountTimeAggregationAmountVisitor;
import org.apache.iotdb.db.queryengine.plan.statement.AuthorityInformationStatement;
import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java
index 716f062dd62..8bca6b8f5d1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.metadata.view;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.queryengine.plan.analyze.QueryType;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java
index dbb5461d612..e1a122b0816 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java
@@ -24,8 +24,8 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java
index 0f5814bc25a..f47ff93cf5e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoader;
import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager;
import org.apache.iotdb.commons.udf.service.UDFExecutableManager;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction;
+import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction;
import org.apache.iotdb.udf.api.UDF;
import org.apache.iotdb.udf.api.exception.UDFException;
import org.apache.iotdb.udf.api.exception.UDFManagementException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java
index b92a4c035a0..daf88dfb662 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java
@@ -21,12 +21,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.builder;
import org.apache.iotdb.db.node_commons.common.NodeRef;
import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.IntermediateLayerVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.IntermediateLayer;
+import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java
index 24f7963f7c6..7ac2f348d27 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column;
+package org.apache.iotdb.db.queryengine.transformation.dag.column;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java
index 5b23084ac13..6adfbe072e1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column;
+package org.apache.iotdb.db.queryengine.transformation.dag.column;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java
index c3137e9628f..50ba07fe496 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column;
+package org.apache.iotdb.db.queryengine.transformation.dag.column;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java
index 8ff4c7f5b03..41632d7be1a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column;
+package org.apache.iotdb.db.queryengine.transformation.dag.column;
import org.apache.iotdb.db.exception.sql.SemanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java
index d99bb54ffdf..637c4141746 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column;
+package org.apache.iotdb.db.queryengine.transformation.dag.column;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java
index 40f02fca424..c3704ced734 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column;
+package org.apache.iotdb.db.queryengine.transformation.dag.column;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java
index 2cbab868b84..f8036106e5c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
index 2c3f65842d8..08e21711473 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java
index d25e1417a37..c4f92be150a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java
index 1854fcd1655..854379cd876 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java
index 9223368d5cf..f2233509302 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java
index 06f7a9f0896..18f935ca0fd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java
index 722965c3423..75dcb6dc17e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
index 2fc5f47a20b..fb09941245b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java
index bd4b3f99f59..f777180e9f0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java
index effaea54d6d..1aba400614c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java
index cdd5092b03e..4f46f76bf3d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java
index 53964b6e8cc..0eede197be3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java
index ee0aea52074..09bd953be18 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java
index 5414fa9a6cd..9f0cd152ebe 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java
index ad4eacdc8ed..a3872608a32 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
public class HmacColumnTransformer extends BinaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java
index ea60f1159c5..6f8bd9764db 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java
index 4b93435024f..7a68e5fa030 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
index 5bf73f07ed4..595fa291c32 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.read.common.type.TypeEnum;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java
index fe4b6156ccf..064ad6974da 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java
index 2fe9d6527b5..9228c728eb2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy;
import com.google.common.hash.HashFunction;
import com.google.common.hash.Hashing;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java
index 237004e818f..01f83cce52b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies;
@FunctionalInterface
public interface HmacStrategy {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java
index 14207917ac3..0750e5dc9d1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java
index 5a7b27f5163..f4cc0667777 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java
index 4cfe57c571e..4e6d423b4b5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java
index 04add40c528..d6cc68ab3ca 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf;
import org.apache.tsfile.read.common.block.column.NullColumn;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java
index e20aa79652e..d8fe028bf09 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java
index a835c8d0a69..f92c5fa2811 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java
index 7557522e361..e81487bbac3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java
index 028322d3985..6cde29f4c84 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java
index 6d2e18117f7..6c283225c74 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java
index f72506711a9..1cfbde15758 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java
index 298f7d1b5b1..82efc732e45 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java
index 114346fe779..e09f0b6df4b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java
index d4d2bfea2e9..2dc19ec75e7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java
index bcd236b33d7..bc5bfc982f8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java
index 9d6dc10247f..223f6367339 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java
index 9dbe1ac39e6..9491a201ed1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java
index 6669fbe9817..f99bc791b39 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java
index 66b07138271..482214498b9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java
index e99a64e8fa2..310669c73cf 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java
index 65bcd925379..ad291426a1c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java
index c1a818dcd7e..aa3ec1397fb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java
index f389a433cb0..319b4225d85 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java
index f303b6d0a2e..551970f470a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java
index 4e46c78c9e2..26b64349fb4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java
index 0d402898352..7818d217d0a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java
index 9e3060ed318..0efaccb3786 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java
@@ -12,9 +12,9 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java
index 55bf38c4be1..321f03b186b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java
index 5814a0e8781..c90133e7cf5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.read.common.type.TypeEnum;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java
index 72f34436500..9164ec578ee 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java
index 67417bf6ac9..440585eed78 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java
index 4ddaf76dd4e..8045edc4a53 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.multi;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java
index 9fd0cb569bb..c0344b001fa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
index 2a2da54697c..26dabe9a7c5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java
index d61870d85e7..34000e227c6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
@@ -27,7 +27,7 @@ import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.common.regexp.LikePattern;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter;
+import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter;
import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType;
public class Like3ColumnTransformer extends TernaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java
index c9ef147a9cc..db4d17d75f1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils.BytePaddingUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java
index 134fe7e657f..ea05be1319a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils.BytePaddingUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java
index 98005aee171..3a9dccd8e8f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java
index b57307eb505..1e5f3ed20a8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils;
import org.apache.iotdb.db.exception.sql.SemanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java
index 163014031b3..47fd40ed73f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.udf;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.udf;
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer;
import org.apache.iotdb.udf.api.relational.ScalarFunction;
import org.apache.iotdb.udf.api.relational.access.Record;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java
index 4029e31ff5f..81819dddf81 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java
index 26fc7d817e1..17fc57a1b52 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java
index 24722260606..fa781f27057 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java
index f6de680e4d3..5930cc999e9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java
index 80d20ab35b5..8c0f9831211 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java
index 071f2017b8b..b22c1c64856 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java
index 6d521b67ddb..7b3294f3c1d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java
index 75e42784f88..294c02b3d2d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java
index bde7582a152..dfc7a233351 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java
index 567d952a761..c4d1cd8f317 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java
index 3a49b4761ed..9ed1bb33075 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.tsfile.block.column.Column;
@@ -38,7 +38,7 @@ import org.apache.tsfile.utils.DateUtils;
import java.time.ZoneId;
import java.time.format.DateTimeParseException;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG;
+import static org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG;
import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE;
public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java
index 6a83ce6dd22..08eb4769166 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java
index 533647dc6ac..1808e147fbd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java
index 6928059f6a2..8a73986f897 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java
index ca8b88828d3..8f86f838474 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java
index d636838a202..04ffea29c63 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java
index d0c7986cf01..87a928ef16b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java
index 8af9b52436a..3be14f412b3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java
index 3b50ab74027..57676824bb9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java
index 3daf805def1..8c42d788878 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java
index b69b51758a6..40651076dfc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java
index 20663508281..8649cdbdb6b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java
index d6746237a5b..d54ff7b1607 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java
index f7b6589d6da..e6be0927f46 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java
index e9745711e96..8d717c6c883 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java
index 5386f7ec960..402d38d40c8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java
index 93ff7b741e3..5042d83d4c0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java
index 7537eb6f6d9..5f77af2e87c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java
index 5b94895a9af..8ab1c754f28 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java
index 2658f178390..0d648b3e26e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java
index 85baad16988..bce18fb0597 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java
index a2f92613f59..e62fdfcbe23 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java
index 0ebd19280ae..15af6deed2d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
public class BytesToFloatColumnTransformer extends UnaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java
index dea22a1eec0..0e42a3a713a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
public class BytesToIntColumnTransformer extends UnaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java
index 7fc65f096b0..dcf0e4a0865 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
/** A transformer that converts byte array representations to long values */
public class BytesToLongColumnTransformer extends UnaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java
index 8dec0fe9072..d7e9dccb62a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java
index 3f30934fc4b..624eabadc62 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java
index a95dc3f772c..31cb8df7448 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java
index 9009ae40b2b..18c59344be8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatColumnTransformer.concat;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat;
public class Concat2ColumnTransformer extends BinaryColumnTransformer {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java
index 3ab02e6991c..47dd6866a33 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java
index 25a8f0a5a6c..ec053fe2ad9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java
index bc1fcf6feae..4d731965b68 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java
index f5a5c14d0bc..2079f1659c5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java
index 73db1eb447c..93ef9dff3a2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java
index 0bb1f1e7567..b1921aa1be4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java
index d79315a723e..0d316a6c400 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java
index b9627143665..ce6f7ebf8bf 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java
similarity index 84%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java
index 6bac4d89b43..7b9c06147a5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java
index 58e2f0530fa..c81d83fbda7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare;
public class EndsWith2ColumnTransformer extends BinaryColumnTransformer {
public EndsWith2ColumnTransformer(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java
index 7eaf34bfdda..afa1e4dff86 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare;
public class EndsWithColumnTransformer extends UnaryColumnTransformer {
private final byte[] suffix;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java
index 631942d453e..b804869867a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java
index 2159f3d641b..201b4bc099b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java
index afba004f32f..7d4d4795c72 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java
index 11281d82d84..9912df4dacd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java
index febab08b916..b47b46a636d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java
@@ -12,11 +12,11 @@
* limitations under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.tsfile.block.column.Column;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java
index 7c7b5785940..f387b8850e4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface.CodecStrategy;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue;
/**
* A generic, reusable column converter for handling all codec-based encoding/decoding functions. It
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java
similarity index 85%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java
index 722c684076e..daa5868b938 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java
index 8187aba714f..5c25a949c8f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java
index 6b38e558b31..4643c3a6ec4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrimColumnTransformer.ltrim;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim;
public class LTrim2ColumnTransformer extends BinaryColumnTransformer {
public LTrim2ColumnTransformer(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java
index 6104702e74e..aa67b782c07 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.isContain;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain;
public class LTrimColumnTransformer extends UnaryColumnTransformer {
private final byte[] character;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java
index ace8caa2b03..c94530c83d4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
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/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java
index 4c66df684e4..3bccb13eb6a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java
index f35c64c93f9..fa6c021ea55 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java
similarity index 83%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java
index fd2d0b21147..72c3a5b2404 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java
index 1c7111a05ef..d4c8fbad011 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java
index 4810bd15a2c..5d39c6f6af3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.utils.ObjectTypeUtils;
import org.apache.tsfile.read.common.type.Type;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java
index 0e918ec352c..2d04dce84e4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrimColumnTransformer.rtrim;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim;
public class RTrim2ColumnTransformer extends BinaryColumnTransformer {
public RTrim2ColumnTransformer(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java
index 2903344bca7..18c4311d524 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.isContain;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain;
public class RTrimColumnTransformer extends UnaryColumnTransformer {
private final byte[] character;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java
index d3c3d853765..b8d7cbab88f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java
index ab9c938ed9c..67c2c2624c5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java
index f3409481b9e..e85e1b97242 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java
index ccdbde2b1d3..5a44243206d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java
index cbd7ee7985c..c5133c5e390 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java
index e62ad0ce313..d2efd3483db 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java
index a503faec086..4e66aeb7b96 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java
index e8ae0229336..7817fcd1c7d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java
index f30dd1cc742..b2796eaad1f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java
index 073e6fddba4..f1f2a4da277 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java
index 8284d2d2cd3..c6faf22c838 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java
index ea9957a28b3..bcd6b97eb34 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java
index 07106142109..b181603ca44 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare;
public class StartsWith2ColumnTransformer extends BinaryColumnTransformer {
public StartsWith2ColumnTransformer(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java
index 2b7195ec9e7..cf44d3ec0fc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java
index 56b2df01048..c432738952d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java
index 9b08c9709c8..c9541fe1701 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java
index 5fff4a71db8..692f088a599 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java
index 78edf7ee3d3..cd4459bd333 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java
index b68a2c242f1..b085976c2ed 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java
index 28eb7ab4b8f..7a1dba3e08a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
@@ -29,7 +29,7 @@ import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.BytesUtils;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING;
public class SubString3ColumnTransformer extends TernaryColumnTransformer {
public SubString3ColumnTransformer(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java
similarity index 91%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java
index 761d28c9746..59cc8cb4369 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java
index 5a5497c1011..a4c07da38d3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java
similarity index 89%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java
index 655f3f3239b..b0d22716985 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java
similarity index 87%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java
index e65ae830de8..c6788c95b63 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.utils.Binary;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.trim;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim;
public class Trim2ColumnTransformer extends BinaryColumnTransformer {
public Trim2ColumnTransformer(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java
index 89dad44fb87..8e75c5e7007 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java
index 107eb430cc6..419d1bbabf3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java
similarity index 88%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java
index 161a4a08d8b..dee529093dd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java
index 941303d541d..546a8286d04 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface.CodecStrategy;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.HexUtils;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.SpookyHashV2Utils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.HexUtils;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils;
import com.google.common.hash.Hashing;
import com.google.common.io.BaseEncoding;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java
index 7996a650390..60d1e77f78b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory;
import org.apache.iotdb.db.exception.sql.SemanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java
index cc83fbda982..7c2fd4833a1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface;
import org.apache.iotdb.db.exception.sql.SemanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java
index 1545ea65161..15ed2b9d342 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util;
import org.apache.tsfile.common.conf.TSFileConfig;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java
similarity index 99%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java
index c734c70f8c8..e6ef386827e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java
index 9a3d0bc15e9..2ad8e6a29a8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util;
+package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util;
import org.apache.iotdb.db.exception.sql.SemanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java
index e0c8e0ebe52..14643a7b6ac 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.input;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.YieldableState;
import org.apache.iotdb.db.utils.CommonUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java
index ca960343c7c..72127aad5a5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.intermediate;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader;
import org.apache.iotdb.db.queryengine.transformation.dag.input.ConstantInputReader;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java
index f5843b87fef..149485ef3b5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.intermediate;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader;
import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java
index 21b3d0d7a32..78e0c7451b7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.intermediate;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader;
import org.apache.iotdb.db.queryengine.transformation.api.YieldableState;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java
index 41073a7e9c2..2bf5f2b3eb8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.intermediate;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader;
import org.apache.iotdb.db.queryengine.transformation.api.YieldableState;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java
index e9bcd2ba0dd..e7d67c36349 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.intermediate;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader;
import org.apache.iotdb.db.queryengine.transformation.api.YieldableState;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java
similarity index 86%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java
index 5f17a2e890d..0eb796b72aa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.memory;
+package org.apache.iotdb.db.queryengine.transformation.dag.memory;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import java.util.HashMap;
import java.util.Map;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java
index ee785aca5b3..195acb6de85 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java
index 8883d6861a6..3ea2cbbce2a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer;
import org.apache.tsfile.block.column.Column;
import org.apache.tsfile.block.column.ColumnBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java
index b0e5cd041dd..71312657ce4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java
@@ -30,7 +30,7 @@ import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.BytesUtils;
import org.apache.tsfile.write.UnSupportedDataTypeException;
-import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING;
public class SubStringFunctionTransformer extends UnaryTransformer {
private int beginPosition;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java
index 6676897a790..771ecbd9b96 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.transformation.dag.udf;
import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
import org.apache.iotdb.db.service.TemporaryQueryDataFileService;
import java.time.ZoneId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java
index e82d215e08d..97038b20e0e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.transformation.dag.dag.util;
+package org.apache.iotdb.db.queryengine.transformation.dag.util;
import org.apache.iotdb.db.exception.sql.SemanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java
index a9cbf7a75b5..015904399c2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.transformation.dag.util;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder;
import org.apache.iotdb.db.utils.CommonUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
index 3463cba1aee..9401e88a5c9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
@@ -70,8 +70,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.Table
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.metric.ISchemaRegionMetric;
import org.apache.iotdb.db.schemaengine.metric.SchemaRegionMemMetric;
import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java
index 8c7be23ef6b..b74c026cefd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java
@@ -31,8 +31,8 @@ import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ClusterSchemaFetcher;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CompleteMeasurementSchemaVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.ISchemaReader;
import org.apache.iotdb.db.schemaengine.schemaregion.utils.filter.FilterContainsVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
index e1d1d039785..73127f25c15 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.schemaengine.schemaregion.view;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException;
import org.apache.iotdb.db.exception.metadata.view.ViewContainsAggregationException;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectAggregationExpressionsVisitor;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectAggregationExpressionsVisitor;
import org.apache.tsfile.utils.Pair;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java
index 5aae306dfda..622a62b06c7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java
@@ -55,32 +55,32 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.NegationViewExp
import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression;
import org.apache.iotdb.commons.schema.view.viewExpression.unary.UnaryViewExpression;
import org.apache.iotdb.commons.schema.view.viewExpression.visitor.ViewExpressionVisitor;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression;
import org.apache.tsfile.utils.Pair;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java
index f13a712fc3e..aa2855f7b05 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java
@@ -23,13 +23,13 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper;
+import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.tsfile.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java
index 6851ccb0190..6476300ed34 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.common.schematree;
import org.apache.iotdb.db.node_commons.common.NodeRef;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand;
import org.apache.tsfile.enums.TSDataType;
import org.junit.Assert;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java
index ea18ca34ae1..39eaf7d6be3 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java
@@ -76,17 +76,17 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOpera
import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindowParameter;
import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer;
-import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer;
+import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer;
import com.google.common.collect.Sets;
import org.apache.tsfile.common.conf.TSFileDescriptor;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java
index 53810e08ff8..0fd29b76e53 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java
@@ -33,8 +33,8 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContex
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine;
import org.apache.iotdb.db.queryengine.execution.operator.process.TransformOperator;
import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
import org.apache.iotdb.db.queryengine.transformation.api.LayerReader;
import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer;
import org.apache.iotdb.db.queryengine.transformation.dag.input.TsBlockInputDataSet;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java
index 20c513b4959..3e8c75f943d 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.expression.predicate;
import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils;
-import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression;
+import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
@@ -36,22 +36,22 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.TimeZone;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.groupByTime;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lte;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.neq;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notBetween;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notIn;
-import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or;
... 1519 lines suppressed ...