This is an automated email from the ASF dual-hosted git repository. xiangweiwei pushed a commit to branch controlThreadNum in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b76351a2fcf50d15420cf0af4c34d2efa2f1dd2c Author: Alima777 <[email protected]> AuthorDate: Wed Dec 29 11:32:18 2021 +0800 remove isQuery from constructor --- .../java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java | 13 +++---------- .../iotdb/db/qp/physical/crud/DeletePartitionPlan.java | 2 +- .../org/apache/iotdb/db/qp/physical/crud/DeletePlan.java | 6 +++--- .../org/apache/iotdb/db/qp/physical/crud/InsertPlan.java | 2 +- .../org/apache/iotdb/db/qp/physical/crud/QueryPlan.java | 14 +++++++------- .../apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java | 5 ----- .../apache/iotdb/db/qp/physical/crud/SelectIntoPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/ActivateTemplatePlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/AppendTemplatePlan.java | 6 +++--- .../org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java | 4 ++-- .../db/qp/physical/sys/AutoCreateDeviceMNodePlan.java | 8 ++------ .../apache/iotdb/db/qp/physical/sys/ChangeAliasPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/ChangeTagOffsetPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/ClearCachePlan.java | 2 +- .../db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java | 4 ++-- .../db/qp/physical/sys/CreateContinuousQueryPlan.java | 7 ++++--- .../iotdb/db/qp/physical/sys/CreateFunctionPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/CreateIndexPlan.java | 4 ++-- .../db/qp/physical/sys/CreateMultiTimeSeriesPlan.java | 2 +- .../iotdb/db/qp/physical/sys/CreateSnapshotPlan.java | 2 +- .../iotdb/db/qp/physical/sys/CreateTemplatePlan.java | 6 +++--- .../iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/CreateTriggerPlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/DropContinuousQueryPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/DropFunctionPlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/DropIndexPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/DropTriggerPlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/FlushPlan.java | 6 +++--- .../org/apache/iotdb/db/qp/physical/sys/KillQueryPlan.java | 2 +- .../iotdb/db/qp/physical/sys/LoadConfigurationPlan.java | 6 +++--- .../org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java | 2 +- .../java/org/apache/iotdb/db/qp/physical/sys/LogPlan.java | 6 +----- .../org/apache/iotdb/db/qp/physical/sys/MNodePlan.java | 12 ++++++------ .../iotdb/db/qp/physical/sys/MeasurementMNodePlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/MergePlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/OperateFilePlan.java | 6 +++--- .../apache/iotdb/db/qp/physical/sys/PruneTemplatePlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/SetStorageGroupPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/SetSystemModePlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/SetTemplatePlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/SettlePlan.java | 4 ++-- .../java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/StartTriggerPlan.java | 4 ++-- .../apache/iotdb/db/qp/physical/sys/StopTriggerPlan.java | 4 ++-- .../iotdb/db/qp/physical/sys/StorageGroupMNodePlan.java | 4 ++-- .../org/apache/iotdb/db/qp/physical/sys/TracingPlan.java | 2 +- .../apache/iotdb/db/qp/physical/sys/UnsetTemplatePlan.java | 4 ++-- 52 files changed, 111 insertions(+), 130 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java index f77021a..52244ba 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java @@ -90,7 +90,7 @@ public abstract class PhysicalPlan { private static final String SERIALIZATION_UNIMPLEMENTED = "serialization unimplemented"; - private boolean isQuery; + private boolean isQuery = false; private Operator.OperatorType operatorType; private static final int NULL_VALUE_LEN = -1; @@ -110,19 +110,12 @@ public abstract class PhysicalPlan { return canBeSplit; } - protected PhysicalPlan(boolean isQuery) { - this.isQuery = isQuery; - } + protected PhysicalPlan() {} - protected PhysicalPlan(boolean isQuery, Operator.OperatorType operatorType) { - this.isQuery = isQuery; + protected PhysicalPlan(Operator.OperatorType operatorType) { this.operatorType = operatorType; } - public String printQueryPlan() { - return "abstract plan"; - } - public abstract List<? extends PartialPath> getPaths(); public void setPaths(List<PartialPath> paths) {} diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java index 55d2832..14107d1 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java @@ -33,7 +33,7 @@ public class DeletePartitionPlan extends PhysicalPlan { private Set<Long> partitionId; public DeletePartitionPlan(PartialPath storageGroupName, Set<Long> partitionId) { - super(false, OperatorType.DELETE_PARTITION); + super(OperatorType.DELETE_PARTITION); this.storageGroupName = storageGroupName; this.partitionId = partitionId; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java index 046e86f..8b86f15 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java @@ -44,7 +44,7 @@ public class DeletePlan extends PhysicalPlan { private TimePartitionFilter partitionFilter; public DeletePlan() { - super(false, Operator.OperatorType.DELETE); + super(Operator.OperatorType.DELETE); } /** @@ -55,7 +55,7 @@ public class DeletePlan extends PhysicalPlan { * @param path time series path */ public DeletePlan(long startTime, long endTime, PartialPath path) { - super(false, Operator.OperatorType.DELETE); + super(Operator.OperatorType.DELETE); this.deleteStartTime = startTime; this.deleteEndTime = endTime; this.paths.add(path); @@ -69,7 +69,7 @@ public class DeletePlan extends PhysicalPlan { * @param paths time series paths in List structure */ public DeletePlan(long startTime, long endTime, List<PartialPath> paths) { - super(false, Operator.OperatorType.DELETE); + super(Operator.OperatorType.DELETE); this.deleteStartTime = startTime; this.deleteEndTime = endTime; this.paths = paths; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java index 1d0f5af..34e9c0a 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java @@ -46,7 +46,7 @@ public abstract class InsertPlan extends PhysicalPlan { List<Integer> failedIndices; public InsertPlan(Operator.OperatorType operatorType) { - super(false, operatorType); + super(operatorType); super.canBeSplit = false; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java index d8dd931..6427137 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java @@ -35,7 +35,11 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import com.google.common.primitives.Bytes; import org.apache.thrift.TException; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public abstract class QueryPlan extends PhysicalPlan { @@ -61,12 +65,8 @@ public abstract class QueryPlan extends PhysicalPlan { private boolean withoutAllNull; public QueryPlan() { - super(true); - setOperatorType(Operator.OperatorType.QUERY); - } - - public QueryPlan(boolean isQuery, Operator.OperatorType operatorType) { - super(isQuery, operatorType); + super(Operator.OperatorType.QUERY); + setQuery(true); } public abstract void deduplicate(PhysicalGenerator physicalGenerator) throws MetadataException; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java index 0f63271..2d1aa1d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java @@ -22,7 +22,6 @@ import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.metadata.path.AlignedPath; import org.apache.iotdb.db.metadata.path.PartialPath; -import org.apache.iotdb.db.qp.logical.Operator; import org.apache.iotdb.db.qp.strategy.PhysicalGenerator; import org.apache.iotdb.db.utils.SchemaUtils; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -53,10 +52,6 @@ public class RawDataQueryPlan extends QueryPlan { super(); } - public RawDataQueryPlan(boolean isQuery, Operator.OperatorType operatorType) { - super(isQuery, operatorType); - } - @Override public void deduplicate(PhysicalGenerator physicalGenerator) throws MetadataException { // sort paths by device, to accelerate the metadata read process diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SelectIntoPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SelectIntoPlan.java index 2530e97..2221e6c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SelectIntoPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/SelectIntoPlan.java @@ -38,11 +38,11 @@ public class SelectIntoPlan extends PhysicalPlan { private List<PartialPath> intoPaths; public SelectIntoPlan() { - super(false, OperatorType.SELECT_INTO); + super(OperatorType.SELECT_INTO); } public SelectIntoPlan(QueryPlan queryPlan, PartialPath fromPath, List<PartialPath> intoPaths) { - super(false, OperatorType.SELECT_INTO); + super(OperatorType.SELECT_INTO); this.queryPlan = queryPlan; this.fromPath = fromPath; this.intoPaths = intoPaths; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplatePlan.java index 89bba22..92878f2 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplatePlan.java @@ -39,11 +39,11 @@ public class ActivateTemplatePlan extends PhysicalPlan { PartialPath prefixPath; public ActivateTemplatePlan() { - super(false, OperatorType.ACTIVATE_TEMPLATE); + super(OperatorType.ACTIVATE_TEMPLATE); } public ActivateTemplatePlan(PartialPath prefixPath) { - super(false, OperatorType.ACTIVATE_TEMPLATE); + super(OperatorType.ACTIVATE_TEMPLATE); this.prefixPath = prefixPath; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java index 66cc2bb..5580d95 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AlterTimeSeriesPlan.java @@ -62,7 +62,7 @@ public class AlterTimeSeriesPlan extends PhysicalPlan { /** used only for deserialize */ public AlterTimeSeriesPlan() { - super(false, OperatorType.ALTER_TIMESERIES); + super(OperatorType.ALTER_TIMESERIES); } public AlterTimeSeriesPlan( @@ -72,7 +72,7 @@ public class AlterTimeSeriesPlan extends PhysicalPlan { String alias, Map<String, String> tagsMap, Map<String, String> attributesMap) { - super(false, Operator.OperatorType.ALTER_TIMESERIES); + super(Operator.OperatorType.ALTER_TIMESERIES); this.path = path; this.alterType = alterType; this.alterMap = alterMap; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AppendTemplatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AppendTemplatePlan.java index aa6bf80..5e9287d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AppendTemplatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AppendTemplatePlan.java @@ -43,7 +43,7 @@ public class AppendTemplatePlan extends PhysicalPlan { CompressionType[] compressors; public AppendTemplatePlan() { - super(false, OperatorType.APPEND_TEMPLATE); + super(OperatorType.APPEND_TEMPLATE); } public AppendTemplatePlan( @@ -53,7 +53,7 @@ public class AppendTemplatePlan extends PhysicalPlan { List<TSDataType> dataTypes, List<TSEncoding> encodings, List<CompressionType> compressors) { - super(false, OperatorType.APPEND_TEMPLATE); + super(OperatorType.APPEND_TEMPLATE); this.name = name; this.isAligned = isAligned; this.measurements = measurements.toArray(new String[0]); @@ -69,7 +69,7 @@ public class AppendTemplatePlan extends PhysicalPlan { TSDataType[] dataTypes, TSEncoding[] encodings, CompressionType[] compressors) { - super(false, OperatorType.APPEND_TEMPLATE); + super(OperatorType.APPEND_TEMPLATE); this.name = name; this.isAligned = isAligned; this.measurements = measurements; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java index e70ae88..4d22d4e 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java @@ -68,7 +68,7 @@ public class AuthorPlan extends PhysicalPlan { String[] authorizationList, PartialPath nodeName) throws AuthException { - super(false, Operator.OperatorType.AUTHOR); + super(Operator.OperatorType.AUTHOR); this.authorType = authorType; this.userName = userName; this.roleName = roleName; @@ -139,7 +139,7 @@ public class AuthorPlan extends PhysicalPlan { } public AuthorPlan(OperatorType operatorType) throws IOException { - super(false, operatorType); + super(operatorType); setAuthorType(transformOperatorTypeToAuthorType(operatorType)); } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AutoCreateDeviceMNodePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AutoCreateDeviceMNodePlan.java index 8b434c9..24d0724 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AutoCreateDeviceMNodePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AutoCreateDeviceMNodePlan.java @@ -39,18 +39,14 @@ public class AutoCreateDeviceMNodePlan extends PhysicalPlan { protected PartialPath path; public AutoCreateDeviceMNodePlan() { - super(false, Operator.OperatorType.AUTO_CREATE_DEVICE_MNODE); + super(Operator.OperatorType.AUTO_CREATE_DEVICE_MNODE); } public AutoCreateDeviceMNodePlan(PartialPath path) { - super(false, Operator.OperatorType.AUTO_CREATE_DEVICE_MNODE); + super(Operator.OperatorType.AUTO_CREATE_DEVICE_MNODE); this.path = path; } - public AutoCreateDeviceMNodePlan(boolean isQuery, Operator.OperatorType operatorType) { - super(isQuery, operatorType); - } - @Override public List<PartialPath> getPaths() { return Collections.singletonList(path); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeAliasPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeAliasPlan.java index 426131e..8cfdb02 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeAliasPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeAliasPlan.java @@ -36,11 +36,11 @@ public class ChangeAliasPlan extends PhysicalPlan { private String alias; public ChangeAliasPlan() { - super(false, Operator.OperatorType.CHANGE_ALIAS); + super(Operator.OperatorType.CHANGE_ALIAS); } public ChangeAliasPlan(PartialPath path, String alias) { - super(false, Operator.OperatorType.CHANGE_ALIAS); + super(Operator.OperatorType.CHANGE_ALIAS); this.path = path; this.alias = alias; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeTagOffsetPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeTagOffsetPlan.java index f00743a..a0c1872 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeTagOffsetPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ChangeTagOffsetPlan.java @@ -36,11 +36,11 @@ public class ChangeTagOffsetPlan extends PhysicalPlan { private long offset; public ChangeTagOffsetPlan() { - super(false, Operator.OperatorType.CHANGE_TAG_OFFSET); + super(Operator.OperatorType.CHANGE_TAG_OFFSET); } public ChangeTagOffsetPlan(PartialPath partialPath, long offset) { - super(false, Operator.OperatorType.CHANGE_TAG_OFFSET); + super(Operator.OperatorType.CHANGE_TAG_OFFSET); path = partialPath; this.offset = offset; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java index 9cfa70c..b9d018d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ClearCachePlan.java @@ -32,7 +32,7 @@ import java.util.List; public class ClearCachePlan extends PhysicalPlan { public ClearCachePlan() { - super(false, OperatorType.CLEAR_CACHE); + super(OperatorType.CLEAR_CACHE); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java index 238abd9..b02a98e 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java @@ -50,7 +50,7 @@ public class CreateAlignedTimeSeriesPlan extends PhysicalPlan { private List<String> aliasList; public CreateAlignedTimeSeriesPlan() { - super(false, Operator.OperatorType.CREATE_ALIGNED_TIMESERIES); + super(Operator.OperatorType.CREATE_ALIGNED_TIMESERIES); canBeSplit = false; } @@ -61,7 +61,7 @@ public class CreateAlignedTimeSeriesPlan extends PhysicalPlan { List<TSEncoding> encodings, List<CompressionType> compressors, List<String> aliasList) { - super(false, Operator.OperatorType.CREATE_ALIGNED_TIMESERIES); + super(Operator.OperatorType.CREATE_ALIGNED_TIMESERIES); this.prefixPath = prefixPath; this.measurements = measurements; this.dataTypes = dataTypes; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateContinuousQueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateContinuousQueryPlan.java index 2a30b2e..42dcc9e 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateContinuousQueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateContinuousQueryPlan.java @@ -28,7 +28,8 @@ import org.apache.iotdb.db.qp.utils.DatetimeUtils; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Collections; +import java.util.List; public class CreateContinuousQueryPlan extends PhysicalPlan { @@ -41,7 +42,7 @@ public class CreateContinuousQueryPlan extends PhysicalPlan { private long creationTimestamp; public CreateContinuousQueryPlan() { - super(false, Operator.OperatorType.CREATE_CONTINUOUS_QUERY); + super(Operator.OperatorType.CREATE_CONTINUOUS_QUERY); } public CreateContinuousQueryPlan( @@ -51,7 +52,7 @@ public class CreateContinuousQueryPlan extends PhysicalPlan { long everyInterval, long forInterval, QueryOperator queryOperator) { - super(false, Operator.OperatorType.CREATE_CONTINUOUS_QUERY); + super(Operator.OperatorType.CREATE_CONTINUOUS_QUERY); this.querySql = querySql; this.continuousQueryName = continuousQueryName; this.targetPath = targetPath; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateFunctionPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateFunctionPlan.java index dadb89e..0a0cd6a 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateFunctionPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateFunctionPlan.java @@ -36,11 +36,11 @@ public class CreateFunctionPlan extends PhysicalPlan { private String className; public CreateFunctionPlan() { - super(false, OperatorType.CREATE_FUNCTION); + super(OperatorType.CREATE_FUNCTION); } public CreateFunctionPlan(String udfName, String className) { - super(false, OperatorType.CREATE_FUNCTION); + super(OperatorType.CREATE_FUNCTION); this.udfName = udfName; this.className = className; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateIndexPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateIndexPlan.java index 0e6beab..4d60934 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateIndexPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateIndexPlan.java @@ -41,13 +41,13 @@ public class CreateIndexPlan extends PhysicalPlan { private IndexType indexType; public CreateIndexPlan() { - super(false, OperatorType.CREATE_INDEX); + super(OperatorType.CREATE_INDEX); canBeSplit = false; } public CreateIndexPlan( List<PartialPath> paths, Map<String, String> props, long startTime, IndexType indexType) { - super(false, OperatorType.CREATE_INDEX); + super(OperatorType.CREATE_INDEX); this.paths = paths; this.props = props; time = startTime; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java index 1c734d8..38c323c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java @@ -65,7 +65,7 @@ public class CreateMultiTimeSeriesPlan extends PhysicalPlan implements BatchPlan private List<Integer> indexes; public CreateMultiTimeSeriesPlan() { - super(false, Operator.OperatorType.CREATE_MULTI_TIMESERIES); + super(Operator.OperatorType.CREATE_MULTI_TIMESERIES); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java index b2e51ca..5e950be 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateSnapshotPlan.java @@ -33,7 +33,7 @@ import java.util.List; public class CreateSnapshotPlan extends PhysicalPlan { public CreateSnapshotPlan() { - super(false, OperatorType.CREATE_SCHEMA_SNAPSHOT); + super(OperatorType.CREATE_SCHEMA_SNAPSHOT); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTemplatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTemplatePlan.java index 49804e8..b05030b 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTemplatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTemplatePlan.java @@ -55,7 +55,7 @@ public class CreateTemplatePlan extends PhysicalPlan { private static final int NEW_PLAN = -1; public CreateTemplatePlan() { - super(false, OperatorType.CREATE_TEMPLATE); + super(OperatorType.CREATE_TEMPLATE); } public CreateTemplatePlan( @@ -66,7 +66,7 @@ public class CreateTemplatePlan extends PhysicalPlan { List<List<CompressionType>> compressors) { // New constructor for tree-structured template where aligned measurements get individual // compressors - super(false, OperatorType.CREATE_TEMPLATE); + super(OperatorType.CREATE_TEMPLATE); this.name = name; schemaNames = null; @@ -134,7 +134,7 @@ public class CreateTemplatePlan extends PhysicalPlan { TSDataType[][] dataTypes, TSEncoding[][] encodings, CompressionType[][] compressors) { - super(false, OperatorType.CREATE_TEMPLATE); + super(OperatorType.CREATE_TEMPLATE); this.name = name; this.schemaNames = null; this.measurements = measurements; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java index 8bfd44e..aceae26 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTimeSeriesPlan.java @@ -49,7 +49,7 @@ public class CreateTimeSeriesPlan extends PhysicalPlan { private long tagOffset = -1; public CreateTimeSeriesPlan() { - super(false, Operator.OperatorType.CREATE_TIMESERIES); + super(Operator.OperatorType.CREATE_TIMESERIES); canBeSplit = false; } @@ -62,7 +62,7 @@ public class CreateTimeSeriesPlan extends PhysicalPlan { Map<String, String> tags, Map<String, String> attributes, String alias) { - super(false, Operator.OperatorType.CREATE_TIMESERIES); + super(Operator.OperatorType.CREATE_TIMESERIES); this.path = path; this.dataType = dataType; this.encoding = encoding; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTriggerPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTriggerPlan.java index 8cc5bf2..2b34d85 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTriggerPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateTriggerPlan.java @@ -55,7 +55,7 @@ public class CreateTriggerPlan extends PhysicalPlan { private boolean isStopped = false; public CreateTriggerPlan() { - super(false, OperatorType.CREATE_TRIGGER); + super(OperatorType.CREATE_TRIGGER); canBeSplit = false; } @@ -65,7 +65,7 @@ public class CreateTriggerPlan extends PhysicalPlan { PartialPath fullPath, String className, Map<String, String> attributes) { - super(false, OperatorType.CREATE_TRIGGER); + super(OperatorType.CREATE_TRIGGER); this.triggerName = triggerName; this.event = event; this.fullPath = fullPath; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java index 0e0d474..8f1cc93 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java @@ -34,11 +34,11 @@ public class DataAuthPlan extends PhysicalPlan { private List<String> users; public DataAuthPlan(OperatorType operatorType) { - super(false, operatorType); + super(operatorType); } public DataAuthPlan(OperatorType operatorType, List<String> users) { - super(false, operatorType); + super(operatorType); this.users = users; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java index 4ba3a3f..f6ac296 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteStorageGroupPlan.java @@ -34,12 +34,12 @@ public class DeleteStorageGroupPlan extends PhysicalPlan { private List<PartialPath> deletePathList; public DeleteStorageGroupPlan(List<PartialPath> deletePathList) { - super(false, Operator.OperatorType.DELETE_STORAGE_GROUP); + super(Operator.OperatorType.DELETE_STORAGE_GROUP); this.deletePathList = deletePathList; } public DeleteStorageGroupPlan() { - super(false, Operator.OperatorType.DELETE_STORAGE_GROUP); + super(Operator.OperatorType.DELETE_STORAGE_GROUP); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java index 1ef49ac..59d7a84 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DeleteTimeSeriesPlan.java @@ -46,12 +46,12 @@ public class DeleteTimeSeriesPlan extends PhysicalPlan { private TimePartitionFilter partitionFilter; public DeleteTimeSeriesPlan(List<PartialPath> deletePathList) { - super(false, Operator.OperatorType.DELETE_TIMESERIES); + super(Operator.OperatorType.DELETE_TIMESERIES); this.deletePathList = deletePathList; } public DeleteTimeSeriesPlan() { - super(false, Operator.OperatorType.DELETE_TIMESERIES); + super(Operator.OperatorType.DELETE_TIMESERIES); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropContinuousQueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropContinuousQueryPlan.java index 7d60f26..463b03c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropContinuousQueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropContinuousQueryPlan.java @@ -33,11 +33,11 @@ public class DropContinuousQueryPlan extends PhysicalPlan { private String continuousQueryName; public DropContinuousQueryPlan() { - super(false, Operator.OperatorType.DROP_CONTINUOUS_QUERY); + super(Operator.OperatorType.DROP_CONTINUOUS_QUERY); } public DropContinuousQueryPlan(String continuousQueryName) { - super(false, Operator.OperatorType.DROP_CONTINUOUS_QUERY); + super(Operator.OperatorType.DROP_CONTINUOUS_QUERY); this.continuousQueryName = continuousQueryName; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropFunctionPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropFunctionPlan.java index 436b7e7..8a60fb5 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropFunctionPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropFunctionPlan.java @@ -35,11 +35,11 @@ public class DropFunctionPlan extends PhysicalPlan { private String udfName; public DropFunctionPlan() { - super(false, OperatorType.DROP_FUNCTION); + super(OperatorType.DROP_FUNCTION); } public DropFunctionPlan(String udfName) { - super(false, OperatorType.DROP_FUNCTION); + super(OperatorType.DROP_FUNCTION); this.udfName = udfName; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropIndexPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropIndexPlan.java index d49ec29..a40697d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropIndexPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropIndexPlan.java @@ -38,11 +38,11 @@ public class DropIndexPlan extends PhysicalPlan { private IndexType indexType; public DropIndexPlan() { - super(false, Operator.OperatorType.DROP_INDEX); + super(Operator.OperatorType.DROP_INDEX); } public DropIndexPlan(List<PartialPath> paths, IndexType indexType) { - super(false, OperatorType.DROP_INDEX); + super(OperatorType.DROP_INDEX); this.paths = paths; this.indexType = indexType; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropTriggerPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropTriggerPlan.java index f4cc22a..8f19a36 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropTriggerPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DropTriggerPlan.java @@ -35,12 +35,12 @@ public class DropTriggerPlan extends PhysicalPlan { private String triggerName; public DropTriggerPlan() { - super(false, OperatorType.DROP_TRIGGER); + super(OperatorType.DROP_TRIGGER); canBeSplit = false; } public DropTriggerPlan(String triggerName) { - super(false, OperatorType.DROP_TRIGGER); + super(OperatorType.DROP_TRIGGER); this.triggerName = triggerName; canBeSplit = false; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java index acd9354..12f8e14 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/FlushPlan.java @@ -57,11 +57,11 @@ public class FlushPlan extends PhysicalPlan { /** only for deserialize */ public FlushPlan() { - super(false, OperatorType.FLUSH); + super(OperatorType.FLUSH); } public FlushPlan(Boolean isSeq, List<PartialPath> storageGroups) { - super(false, OperatorType.FLUSH); + super(OperatorType.FLUSH); if (storageGroups == null) { this.storageGroupPartitionIds = null; } else { @@ -78,7 +78,7 @@ public class FlushPlan extends PhysicalPlan { Boolean isSeq, boolean isSync, Map<PartialPath, List<Pair<Long, Boolean>>> storageGroupPartitionIds) { - super(false, OperatorType.FLUSH); + super(OperatorType.FLUSH); this.storageGroupPartitionIds = storageGroupPartitionIds; this.isSeq = isSeq; this.isSync = isSync; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/KillQueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/KillQueryPlan.java index 583c96a..b9f2f2a 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/KillQueryPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/KillQueryPlan.java @@ -30,7 +30,7 @@ public class KillQueryPlan extends PhysicalPlan { private long queryId = -1; public KillQueryPlan(long queryId) { - super(false, OperatorType.KILL); + super(OperatorType.KILL); this.queryId = queryId; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java index 2ebcba0..c6f6c8b 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadConfigurationPlan.java @@ -45,7 +45,7 @@ public class LoadConfigurationPlan extends PhysicalPlan { public LoadConfigurationPlan( LoadConfigurationPlanType loadConfigurationPlanType, Properties[] propertiesArray) throws QueryProcessException { - super(false, OperatorType.LOAD_CONFIGURATION); + super(OperatorType.LOAD_CONFIGURATION); if (loadConfigurationPlanType != LoadConfigurationPlanType.GLOBAL) { throw new QueryProcessException( "The constructor with 2 parameters is for load global configuration"); @@ -59,7 +59,7 @@ public class LoadConfigurationPlan extends PhysicalPlan { public LoadConfigurationPlan(LoadConfigurationPlanType loadConfigurationPlanType) throws QueryProcessException { - super(false, OperatorType.LOAD_CONFIGURATION); + super(OperatorType.LOAD_CONFIGURATION); if (loadConfigurationPlanType != LoadConfigurationPlanType.LOCAL) { throw new QueryProcessException( "The constructor with 1 parameters is for load local configuration"); @@ -69,7 +69,7 @@ public class LoadConfigurationPlan extends PhysicalPlan { // only for deserialize public LoadConfigurationPlan() { - super(false, OperatorType.LOAD_CONFIGURATION); + super(OperatorType.LOAD_CONFIGURATION); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java index 8300804..8b9d293 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java @@ -33,7 +33,7 @@ public class LoadDataPlan extends PhysicalPlan { /** Constructor of LoadDataPlan. */ public LoadDataPlan(String inputFilePath, String measureType) { - super(false, Operator.OperatorType.LOAD_DATA); + super(Operator.OperatorType.LOAD_DATA); this.inputFilePath = inputFilePath; this.measureType = measureType; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LogPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LogPlan.java index 55d9368..e6912ed 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LogPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LogPlan.java @@ -34,17 +34,13 @@ public class LogPlan extends PhysicalPlan { private ByteBuffer log; - public LogPlan() { - super(false); - } + public LogPlan() {} public LogPlan(ByteBuffer log) { - super(false); this.log = log; } public LogPlan(LogPlan plan) { - super(false); this.log = IOUtils.clone(plan.log); } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MNodePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MNodePlan.java index 6425b79..2bba63c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MNodePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MNodePlan.java @@ -35,19 +35,19 @@ public class MNodePlan extends PhysicalPlan { protected int childSize; public MNodePlan() { - super(false, Operator.OperatorType.MNODE); + super(Operator.OperatorType.MNODE); + } + + public MNodePlan(Operator.OperatorType operatorType) { + super(operatorType); } public MNodePlan(String name, int childSize) { - super(false, Operator.OperatorType.MNODE); + super(Operator.OperatorType.MNODE); this.name = name; this.childSize = childSize; } - public MNodePlan(boolean isQuery, Operator.OperatorType operatorType) { - super(isQuery, operatorType); - } - @Override public List<PartialPath> getPaths() { return new ArrayList<>(); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java index efa98de..0671926 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java @@ -37,12 +37,12 @@ public class MeasurementMNodePlan extends MNodePlan { private long offset; public MeasurementMNodePlan() { - super(false, Operator.OperatorType.MEASUREMENT_MNODE); + super(Operator.OperatorType.MEASUREMENT_MNODE); } public MeasurementMNodePlan( String name, String alias, long offset, int childSize, IMeasurementSchema schema) { - super(false, Operator.OperatorType.MEASUREMENT_MNODE); + super(Operator.OperatorType.MEASUREMENT_MNODE); this.name = name; this.alias = alias; this.offset = offset; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java index b219209..07a5b49 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MergePlan.java @@ -32,11 +32,11 @@ import java.util.List; public class MergePlan extends PhysicalPlan { public MergePlan(OperatorType operatorType) { - super(false, operatorType); + super(operatorType); } public MergePlan() { - super(false, OperatorType.MERGE); + super(OperatorType.MERGE); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java index 100aef1..aff6be9 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/OperateFilePlan.java @@ -35,7 +35,7 @@ public class OperateFilePlan extends PhysicalPlan { private boolean verifyMetadata; public OperateFilePlan(File file, OperatorType operatorType) { - super(false, operatorType); + super(operatorType); this.file = file; } @@ -54,7 +54,7 @@ public class OperateFilePlan extends PhysicalPlan { boolean autoCreateSchema, int sgLevel, boolean verifyMetadata) { - super(false, operatorType); + super(operatorType); this.file = file; this.autoCreateSchema = autoCreateSchema; this.sgLevel = sgLevel; @@ -62,7 +62,7 @@ public class OperateFilePlan extends PhysicalPlan { } public OperateFilePlan(File file, File targetDir, OperatorType operatorType) { - super(false, operatorType); + super(operatorType); this.file = file; this.targetDir = targetDir; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PruneTemplatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PruneTemplatePlan.java index 1902908..ea6b878 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PruneTemplatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PruneTemplatePlan.java @@ -36,11 +36,11 @@ public class PruneTemplatePlan extends PhysicalPlan { String[] prunedMeasurements; public PruneTemplatePlan() { - super(false, OperatorType.PRUNE_TEMPLATE); + super(OperatorType.PRUNE_TEMPLATE); } public PruneTemplatePlan(String name, List<String> prunedMeasurements) { - super(false, OperatorType.PRUNE_TEMPLATE); + super(OperatorType.PRUNE_TEMPLATE); this.name = name; this.prunedMeasurements = prunedMeasurements.toArray(new String[0]); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java index 5f6f24c..a9e85d3 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetStorageGroupPlan.java @@ -35,11 +35,11 @@ public class SetStorageGroupPlan extends PhysicalPlan { private PartialPath path; public SetStorageGroupPlan() { - super(false, Operator.OperatorType.SET_STORAGE_GROUP); + super(Operator.OperatorType.SET_STORAGE_GROUP); } public SetStorageGroupPlan(PartialPath path) { - super(false, Operator.OperatorType.SET_STORAGE_GROUP); + super(Operator.OperatorType.SET_STORAGE_GROUP); this.path = path; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetSystemModePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetSystemModePlan.java index c435b6f..e8fecaa 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetSystemModePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetSystemModePlan.java @@ -36,11 +36,11 @@ public class SetSystemModePlan extends PhysicalPlan { private boolean isReadOnly; public SetSystemModePlan() { - super(false, OperatorType.SET_SYSTEM_MODE); + super(OperatorType.SET_SYSTEM_MODE); } public SetSystemModePlan(boolean isReadOnly) { - super(false, OperatorType.SET_SYSTEM_MODE); + super(OperatorType.SET_SYSTEM_MODE); this.isReadOnly = isReadOnly; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java index 4c09325..5247a73 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTTLPlan.java @@ -36,12 +36,12 @@ public class SetTTLPlan extends PhysicalPlan { private long dataTTL; public SetTTLPlan() { - super(false, OperatorType.TTL); + super(OperatorType.TTL); } public SetTTLPlan(PartialPath storageGroup, long dataTTL) { // set TTL - super(false, OperatorType.TTL); + super(OperatorType.TTL); this.storageGroup = storageGroup; this.dataTTL = dataTTL; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTemplatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTemplatePlan.java index c1db1fe..2026b0d 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTemplatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SetTemplatePlan.java @@ -34,11 +34,11 @@ public class SetTemplatePlan extends PhysicalPlan { String prefixPath; public SetTemplatePlan() { - super(false, OperatorType.SET_TEMPLATE); + super(OperatorType.SET_TEMPLATE); } public SetTemplatePlan(String templateName, String prefixPath) { - super(false, OperatorType.SET_TEMPLATE); + super(OperatorType.SET_TEMPLATE); this.templateName = templateName; this.prefixPath = prefixPath; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SettlePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SettlePlan.java index 99ccf78..52c9e74 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SettlePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/SettlePlan.java @@ -31,13 +31,13 @@ public class SettlePlan extends PhysicalPlan { boolean isSgPath; public SettlePlan(PartialPath sgPath) { - super(false, OperatorType.SETTLE); + super(OperatorType.SETTLE); this.sgPath = sgPath; setIsSgPath(true); } public SettlePlan(String tsFilePath) { - super(false, OperatorType.SETTLE); + super(OperatorType.SETTLE); this.tsFilePath = tsFilePath; setIsSgPath(false); } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java index 72abda1..9ee494f 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java @@ -35,9 +35,9 @@ public class ShowPlan extends PhysicalPlan { private boolean hasLimit; public ShowPlan(ShowContentType showContentType) { - super(true); + super(OperatorType.SHOW); + setQuery(true); this.showContentType = showContentType; - setOperatorType(OperatorType.SHOW); } public ShowPlan(ShowContentType showContentType, PartialPath path) { diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StartTriggerPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StartTriggerPlan.java index bf6ecf6..5a16b88 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StartTriggerPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StartTriggerPlan.java @@ -35,12 +35,12 @@ public class StartTriggerPlan extends PhysicalPlan { private String triggerName; public StartTriggerPlan() { - super(false, OperatorType.START_TRIGGER); + super(OperatorType.START_TRIGGER); canBeSplit = false; } public StartTriggerPlan(String triggerName) { - super(false, OperatorType.START_TRIGGER); + super(OperatorType.START_TRIGGER); this.triggerName = triggerName; canBeSplit = false; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StopTriggerPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StopTriggerPlan.java index 78b44e9..f6008ca 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StopTriggerPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StopTriggerPlan.java @@ -35,12 +35,12 @@ public class StopTriggerPlan extends PhysicalPlan { private String triggerName; public StopTriggerPlan() { - super(false, OperatorType.STOP_TRIGGER); + super(OperatorType.STOP_TRIGGER); canBeSplit = false; } public StopTriggerPlan(String triggerName) { - super(false, OperatorType.STOP_TRIGGER); + super(OperatorType.STOP_TRIGGER); this.triggerName = triggerName; canBeSplit = false; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StorageGroupMNodePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StorageGroupMNodePlan.java index 95a138c..03dde8c 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StorageGroupMNodePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/StorageGroupMNodePlan.java @@ -35,11 +35,11 @@ public class StorageGroupMNodePlan extends MNodePlan { private int alignedTimeseriesIndex; public StorageGroupMNodePlan() { - super(false, Operator.OperatorType.STORAGE_GROUP_MNODE); + super(Operator.OperatorType.STORAGE_GROUP_MNODE); } public StorageGroupMNodePlan(String name, long dataTTL, int childSize) { - super(false, Operator.OperatorType.STORAGE_GROUP_MNODE); + super(Operator.OperatorType.STORAGE_GROUP_MNODE); this.name = name; this.dataTTL = dataTTL; this.childSize = childSize; diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java index 485f235..0e0f9fc 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/TracingPlan.java @@ -30,7 +30,7 @@ public class TracingPlan extends PhysicalPlan { private boolean isTracingOn; public TracingPlan(boolean isTracingOn) { - super(false, OperatorType.TRACING); + super(OperatorType.TRACING); this.isTracingOn = isTracingOn; } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/UnsetTemplatePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/UnsetTemplatePlan.java index ca77ced..10ef156 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/UnsetTemplatePlan.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/UnsetTemplatePlan.java @@ -36,11 +36,11 @@ public class UnsetTemplatePlan extends PhysicalPlan { String templateName; public UnsetTemplatePlan() { - super(false, Operator.OperatorType.UNSET_TEMPLATE); + super(Operator.OperatorType.UNSET_TEMPLATE); } public UnsetTemplatePlan(String prefixPath, String templateName) { - super(false, Operator.OperatorType.UNSET_TEMPLATE); + super(Operator.OperatorType.UNSET_TEMPLATE); this.prefixPath = prefixPath; this.templateName = templateName; }
