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 cfa5b7dc3cb delete some methods
cfa5b7dc3cb is described below
commit cfa5b7dc3cb9e5c2812d29a53a3ee56d99cc4835
Author: shuwenwei <[email protected]>
AuthorDate: Thu Apr 16 18:56:54 2026 +0800
delete some methods
---
.../execution/relational/ColumnTransformerBuilder.java | 10 +---------
.../plan/planner/TableOperatorGenerator.java | 14 ++++++++------
.../plan/planner/DataNodeTableOperatorGenerator.java | 16 ++++++++++------
.../plan/relational/sql/ast/DeleteDevice.java | 4 ++--
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 8 ++++----
.../operator/sink/SinkOperatorDownStreamNodeIdTest.java | 5 ++---
6 files changed, 27 insertions(+), 30 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java
index af96c98faf8..3349bffd332 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java
@@ -194,13 +194,11 @@ import
org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim;
import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause;
import
org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager;
import
org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException;
-import
org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
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;
-
import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.common.regexp.LikePattern;
import org.apache.tsfile.enums.TSDataType;
@@ -216,8 +214,6 @@ import org.apache.tsfile.read.common.type.Type;
import org.apache.tsfile.read.common.type.TypeEnum;
import org.apache.tsfile.utils.Binary;
-import javax.annotation.Nullable;
-
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1947,8 +1943,6 @@ public class ColumnTransformerBuilder
private final Metadata metadata;
- private final Optional<FragmentInstanceContext> fragmentInstanceContext;
-
public Context(
SessionInfo sessionInfo,
List<LeafColumnTransformer> leafList,
@@ -1959,8 +1953,7 @@ public class ColumnTransformerBuilder
List<TSDataType> inputDataTypes,
int originSize,
TypeProvider typeProvider,
- Metadata metadata,
- @Nullable FragmentInstanceContext fragmentInstanceContext) {
+ Metadata metadata) {
this.sessionInfo = sessionInfo;
this.leafList = leafList;
this.inputLocations = inputLocations;
@@ -1971,7 +1964,6 @@ public class ColumnTransformerBuilder
this.originSize = originSize;
this.typeProvider = typeProvider;
this.metadata = metadata;
- this.fragmentInstanceContext =
Optional.ofNullable(fragmentInstanceContext);
}
public Type getType(SymbolReference symbolReference) {
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 62f664c88fb..0893351a327 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
@@ -236,7 +236,7 @@ import static
org.apache.tsfile.read.common.type.StringType.STRING;
import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP;
/** This Visitor is responsible for transferring Table PlanNode Tree to Table
Operator Tree. */
-public class TableOperatorGenerator
+public abstract class TableOperatorGenerator
implements ICoreQueryPlanVisitor<Operator, LocalExecutionPlanContext> {
protected final Metadata metadata;
@@ -333,8 +333,8 @@ public class TableOperatorGenerator
ImmutableList.of(),
0,
context.getTypeProvider(),
- metadata,
- fragmentInstanceContext);
+ metadata
+ );
return visitor.process(p, filterColumnTransformerContext);
})
@@ -361,8 +361,8 @@ public class TableOperatorGenerator
filterOutputDataTypes,
inputLocations.size(),
context.getTypeProvider(),
- metadata,
- fragmentInstanceContext);
+ metadata
+ );
for (Expression expression : projectExpressions) {
projectOutputTransformerList.add(
@@ -855,7 +855,7 @@ public class TableOperatorGenerator
context.getTypeProvider());
String filePrefix =
- IoTDBDescriptor.getInstance().getConfig().getSortTmpDir()
+ getSortTmpDir()
+ File.separator
+
operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId()
+ File.separator
@@ -876,6 +876,8 @@ public class TableOperatorGenerator
node.getOrderingScheme().getOrderingList(), sortItemIndexList,
sortItemDataTypeList));
}
+ protected abstract String getSortTmpDir();
+
@Override
public Operator visitTopK(TopKNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
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 22a25c948f2..5cd788833f3 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
@@ -14,6 +14,8 @@
package org.apache.iotdb.db.queryengine.plan.planner;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
@@ -34,6 +36,7 @@ import
org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBu
import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator;
import
org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer;
import
org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer;
+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.node.PlanNode;
import
org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation;
@@ -126,9 +129,6 @@ import
org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchem
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils;
import org.apache.iotdb.db.utils.TimestampPrecisionUtils;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
@@ -151,7 +151,6 @@ import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import javax.validation.constraints.NotNull;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -203,6 +202,11 @@ public class DataNodeTableOperatorGenerator extends
TableOperatorGenerator
super(metadata);
}
+ @Override
+ protected String getSortTmpDir() {
+ return IoTDBDescriptor.getInstance().getConfig().getSortTmpDir();
+ }
+
@Override
public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext
context) {
OperatorContext operatorContext =
@@ -1260,8 +1264,8 @@ public class DataNodeTableOperatorGenerator extends
TableOperatorGenerator
ImmutableList.of(),
0,
context.getTypeProvider(),
- metadata,
- fragmentInstanceContext)),
+ metadata
+ )),
columnSchemaList,
database,
table)
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 87657581d70..a942571f66b 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
@@ -233,8 +233,8 @@ public class DeleteDevice extends AbstractTraverseDevice {
ImmutableList.of(),
0,
mockTypeProvider,
- metadata,
- null))
+ metadata
+ ))
: null;
return new DeviceBlackListConstructor(
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 25d65f513a5..63b81714271 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
@@ -1573,8 +1573,8 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
ImmutableList.of(),
0,
mockTypeProvider,
- metadata,
- null))
+ metadata
+ ))
: null;
final List<TSDataType> filterOutputDataTypes =
@@ -1601,8 +1601,8 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
filterOutputDataTypes,
inputLocations.size(),
mockTypeProvider,
- metadata,
- null);
+ metadata
+ );
final List<String> attributeNames =
updateNode.getAssignments().stream()
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java
index aded96866ca..57fa76fb2d2 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java
@@ -22,7 +22,6 @@ package
org.apache.iotdb.db.queryengine.execution.operator.sink;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.db.calc_commons.execution.operator.Operator;
-import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator;
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.common.FragmentInstanceId;
@@ -33,6 +32,7 @@ import
org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext;
import
org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext;
import
org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine;
import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider;
+import
org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator;
import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext;
import org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode;
@@ -40,7 +40,6 @@ import
org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import
org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl;
import org.apache.iotdb.db.storageengine.dataregion.DataRegion;
import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -97,7 +96,7 @@ public class SinkOperatorDownStreamNodeIdTest {
LocalExecutionPlanContext context =
createLocalExecutionPlanContext(
new TypeProvider(), "query_name_sink_operator_downstream_id_1",
10001);
- TableOperatorGenerator tableOperatorGenerator = new
TableOperatorGenerator(metadata);
+ DataNodeTableOperatorGenerator tableOperatorGenerator = new
DataNodeTableOperatorGenerator(metadata);
Mockito.when(mockedPlanNode.accept(tableOperatorGenerator, context))
.thenReturn(Mockito.mock(Operator.class));
