This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch IOTDB-5195 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 03eda0ec96c94bdf387122460a67c97f95bdce45 Author: Steve Yurong Su <[email protected]> AuthorDate: Tue Dec 13 18:37:51 2022 +0800 rename udf package to udf.base package --- .../iotdb/db/mpp/execution/operator/process/TransformOperator.java | 2 +- .../org/apache/iotdb/db/mpp/plan/analyze/ExpressionTypeAnalyzer.java | 2 +- .../main/java/org/apache/iotdb/db/mpp/plan/expression/Expression.java | 2 +- .../apache/iotdb/db/mpp/plan/expression/binary/BinaryExpression.java | 2 +- .../org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java | 2 +- .../apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java | 4 ++-- .../iotdb/db/mpp/plan/expression/ternary/TernaryExpression.java | 2 +- .../apache/iotdb/db/mpp/plan/expression/unary/UnaryExpression.java | 2 +- .../db/mpp/plan/expression/visitor/ColumnTransformerVisitor.java | 4 ++-- .../db/mpp/plan/expression/visitor/IntermediateLayerVisitor.java | 4 ++-- .../db/mpp/plan/expression/visitor/OldIntermediateLayerVisitor.java | 4 ++-- .../org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java | 2 +- .../iotdb/db/mpp/transformation/dag/builder/EvaluationDAGBuilder.java | 2 +- .../transformation/dag/column/multi/MappableUDFColumnTransformer.java | 2 +- .../dag/transformer/multi/MappableUDFQueryRowTransformer.java | 2 +- .../transformation/dag/transformer/multi/UDFQueryRowTransformer.java | 2 +- .../dag/transformer/multi/UDFQueryRowWindowTransformer.java | 2 +- .../mpp/transformation/dag/transformer/multi/UDFQueryTransformer.java | 2 +- .../dag/transformer/multi/UniversalUDFQueryTransformer.java | 2 +- .../iotdb/db/mpp/transformation/dag/udf/{ => base}/UDTFContext.java | 2 +- .../iotdb/db/mpp/transformation/dag/udf/{ => base}/UDTFExecutor.java | 4 ++-- .../transformation/dag/udf/{ => base}/UDTFInformationInferrer.java | 2 +- .../src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java index 4346ed231e..20d456e9a8 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java @@ -33,7 +33,7 @@ import org.apache.iotdb.db.mpp.transformation.api.YieldableState; import org.apache.iotdb.db.mpp.transformation.dag.builder.EvaluationDAGBuilder; import org.apache.iotdb.db.mpp.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.mpp.transformation.dag.input.TsBlockInputDataSet; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; import org.apache.iotdb.db.utils.datastructure.TimeSelector; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionTypeAnalyzer.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionTypeAnalyzer.java index 83f61afd46..21d12566c8 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionTypeAnalyzer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionTypeAnalyzer.java @@ -38,7 +38,7 @@ import org.apache.iotdb.db.mpp.plan.expression.unary.LogicNotExpression; import org.apache.iotdb.db.mpp.plan.expression.unary.NegationExpression; import org.apache.iotdb.db.mpp.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.mpp.plan.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFInformationInferrer; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFInformationInferrer; import org.apache.iotdb.db.utils.TypeInferenceUtils; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/Expression.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/Expression.java index 60c8d6364a..9e5458a0af 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/Expression.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/Expression.java @@ -51,7 +51,7 @@ import org.apache.iotdb.db.mpp.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.mpp.plan.statement.StatementNode; import org.apache.iotdb.db.mpp.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/binary/BinaryExpression.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/binary/BinaryExpression.java index 58722f7da5..cc24028624 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/binary/BinaryExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/binary/BinaryExpression.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.mpp.plan.expression.Expression; import org.apache.iotdb.db.mpp.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.mpp.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java index c614c9fb9e..c0589e1bd2 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/leaf/LeafOperand.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.plan.expression.leaf; import org.apache.iotdb.db.mpp.common.NodeRef; import org.apache.iotdb.db.mpp.plan.expression.Expression; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import java.time.ZoneId; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java index 33694b6d95..c1872b8459 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java @@ -30,8 +30,8 @@ import org.apache.iotdb.db.mpp.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.mpp.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.mpp.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFInformationInferrer; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFInformationInferrer; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.db.qp.strategy.optimizer.ConcatPathOptimizer; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/TernaryExpression.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/TernaryExpression.java index b37ad2520c..c15f573611 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/TernaryExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/TernaryExpression.java @@ -28,7 +28,7 @@ import org.apache.iotdb.db.mpp.plan.expression.Expression; import org.apache.iotdb.db.mpp.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.mpp.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/unary/UnaryExpression.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/unary/UnaryExpression.java index f006a32350..4253d724d4 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/unary/UnaryExpression.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/unary/UnaryExpression.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.mpp.plan.expression.Expression; import org.apache.iotdb.db.mpp.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.mpp.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.db.qp.physical.crud.UDTFPlan; import org.apache.iotdb.db.qp.utils.WildcardsRemover; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/ColumnTransformerVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/ColumnTransformerVisitor.java index d559ef1840..f9a7d67c9e 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/ColumnTransformerVisitor.java @@ -61,8 +61,8 @@ import org.apache.iotdb.db.mpp.transformation.dag.column.unary.InColumnTransform import org.apache.iotdb.db.mpp.transformation.dag.column.unary.IsNullColumnTransformer; import org.apache.iotdb.db.mpp.transformation.dag.column.unary.LogicNotColumnTransformer; import org.apache.iotdb.db.mpp.transformation.dag.column.unary.RegularColumnTransformer; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.db.mpp.transformation.dag.util.TransformUtils; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.type.Type; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/IntermediateLayerVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/IntermediateLayerVisitor.java index 71d6a1ddf6..b981f5c21d 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/IntermediateLayerVisitor.java @@ -67,8 +67,8 @@ import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.IsNullTransf import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.LogicNotTransformer; import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.RegularTransformer; import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.TransparentTransformer; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/OldIntermediateLayerVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/OldIntermediateLayerVisitor.java index a136c71af4..c993f3b02d 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/OldIntermediateLayerVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/OldIntermediateLayerVisitor.java @@ -66,8 +66,8 @@ import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.IsNullTransf import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.LogicNotTransformer; import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.RegularTransformer; import org.apache.iotdb.db.mpp.transformation.dag.transformer.unary.TransparentTransformer; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java index 484a342715..94162eb91b 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java @@ -172,7 +172,7 @@ import org.apache.iotdb.db.mpp.plan.statement.component.SortKey; import org.apache.iotdb.db.mpp.plan.statement.literal.Literal; import org.apache.iotdb.db.mpp.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.mpp.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; import org.apache.iotdb.db.utils.datastructure.TimeSelector; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.TimeValuePair; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/builder/EvaluationDAGBuilder.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/builder/EvaluationDAGBuilder.java index 920487fabc..80f59b3809 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/builder/EvaluationDAGBuilder.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/builder/EvaluationDAGBuilder.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.mpp.transformation.api.LayerPointReader; import org.apache.iotdb.db.mpp.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.mpp.transformation.dag.intermediate.IntermediateLayer; import org.apache.iotdb.db.mpp.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import java.util.HashMap; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/multi/MappableUDFColumnTransformer.java index 8ce746493b..d85db1efcc 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/multi/MappableUDFColumnTransformer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/multi/MappableUDFColumnTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.mpp.transformation.dag.column.multi; import org.apache.iotdb.db.mpp.transformation.dag.adapter.ElasticSerializableRowRecordListBackedMultiColumnRow; import org.apache.iotdb.db.mpp.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.block.column.Column; import org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java index c783d32294..45986261d7 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.mpp.transformation.dag.transformer.multi; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.transformation.api.LayerRowReader; import org.apache.iotdb.db.mpp.transformation.api.YieldableState; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.udf.api.access.Row; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowTransformer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowTransformer.java index 9128d9a1c6..d28ba7e68d 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowTransformer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowTransformer.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.mpp.transformation.dag.transformer.multi; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.transformation.api.LayerRowReader; import org.apache.iotdb.db.mpp.transformation.api.YieldableState; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import java.io.IOException; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java index 9776390953..d8b067aa50 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.mpp.transformation.dag.transformer.multi; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.mpp.transformation.api.YieldableState; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import java.io.IOException; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryTransformer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryTransformer.java index f5e96e0ef3..d5e71bc8b0 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryTransformer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UDFQueryTransformer.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.mpp.transformation.dag.transformer.multi; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.transformation.dag.transformer.Transformer; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; public abstract class UDFQueryTransformer extends Transformer { diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java index d19f0d2740..2927006b40 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.mpp.transformation.dag.transformer.multi; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.transformation.api.LayerPointReader; import org.apache.iotdb.db.mpp.transformation.api.YieldableState; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFExecutor; import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException; import java.io.IOException; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFContext.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFContext.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFContext.java rename to server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFContext.java index e1ea0ced1f..059a018f3a 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFContext.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFContext.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.mpp.transformation.dag.udf; +package org.apache.iotdb.db.mpp.transformation.dag.udf.base; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.mpp.plan.expression.Expression; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFExecutor.java similarity index 97% rename from server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFExecutor.java rename to server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFExecutor.java index ea8a64bcd5..cb5c477030 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFExecutor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.mpp.transformation.dag.udf; +package org.apache.iotdb.db.mpp.transformation.dag.udf.base; import org.apache.iotdb.commons.udf.service.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; @@ -40,7 +40,7 @@ import java.util.Map; public class UDTFExecutor { - private static final Logger LOGGER = LoggerFactory.getLogger(UDTFExecutor.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(UDTFExecutor.class); protected final String functionName; protected final UDTFConfigurations configurations; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFInformationInferrer.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFInformationInferrer.java similarity index 98% rename from server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFInformationInferrer.java rename to server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFInformationInferrer.java index 321d83d44a..5a92c788d8 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/UDTFInformationInferrer.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/udf/base/UDTFInformationInferrer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.mpp.transformation.dag.udf; +package org.apache.iotdb.db.mpp.transformation.dag.udf.base; import org.apache.iotdb.commons.udf.service.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java index 3edd4144bf..cfc95d48b7 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.mpp.plan.expression.ResultColumn; import org.apache.iotdb.db.mpp.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.mpp.transformation.dag.udf.UDTFContext; +import org.apache.iotdb.db.mpp.transformation.dag.udf.base.UDTFContext; import org.apache.iotdb.db.qp.logical.Operator; import org.apache.iotdb.db.qp.strategy.PhysicalGenerator; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
