This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.0 by this push:
new 6bd3236ce2 [To rel/1.0][IOTDB-5284] Fix some code smells (#8828)
6bd3236ce2 is described below
commit 6bd3236ce2e3828a158b22e62330fc1313775f52
Author: BUAAserein <[email protected]>
AuthorDate: Thu Jan 12 13:07:50 2023 +0800
[To rel/1.0][IOTDB-5284] Fix some code smells (#8828)
* fix some code smells
---
.../mpp/aggregation/FirstValueDescAccumulator.java | 6 ++++++
.../mpp/aggregation/LastValueDescAccumulator.java | 6 ++++++
.../slidingwindow/SlidingWindowAggregator.java | 2 +-
.../SlidingWindowAggregatorFactory.java | 11 ++++++----
.../iotdb/db/mpp/common/header/DatasetHeader.java | 2 +-
.../common/schematree/node/SchemaInternalNode.java | 1 +
.../db/mpp/common/schematree/node/SchemaNode.java | 2 +-
.../schematree/visitor/SchemaTreeVisitor.java | 2 +-
.../iotdb/db/mpp/execution/driver/Driver.java | 2 +-
.../fragment/FragmentInstanceContext.java | 1 +
.../operator/process/AbstractIntoOperator.java | 8 ++++---
.../process/SingleInputAggregationOperator.java | 2 +-
.../operator/process/TransformOperator.java | 6 +-----
.../process/join/RowBasedTimeJoinOperator.java | 2 +-
.../operator/process/join/TimeJoinOperator.java | 2 +-
.../process/join/VerticallyConcatOperator.java | 2 +-
.../last/AbstractUpdateLastCacheOperator.java | 2 +-
.../schema/SchemaQueryOrderByHeatOperator.java | 5 +----
.../AbstractSeriesAggregationScanOperator.java | 2 +-
.../execution/schedule/AbstractDriverThread.java | 11 +++++-----
.../db/mpp/execution/schedule/DriverScheduler.java | 2 +-
.../apache/iotdb/db/mpp/plan/TestRPCClient.java | 2 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 2 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 5 +----
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 6 +++---
.../db/mpp/plan/analyze/cache/PartitionCache.java | 6 +++---
.../analyze/cache/StorageGroupCacheResult.java | 2 +-
.../db/mpp/plan/execution/QueryExecution.java | 6 ++----
.../plan/expression/ternary/BetweenExpression.java | 1 +
.../visitor/ColumnTransformerVisitor.java | 25 +++++++++++-----------
.../db/mpp/plan/planner/SubPlanTypeExtractor.java | 5 +++++
.../SimpleFragmentParallelPlanner.java | 4 ++--
.../plan/planner/distribution/SourceRewriter.java | 2 +-
.../iotdb/db/mpp/plan/planner/plan/SubPlan.java | 2 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 13 ++++++-----
.../db/mpp/plan/planner/plan/node/PlanNode.java | 2 +-
.../metedata/read/AbstractSchemaMergeNode.java | 4 ++--
.../metedata/read/PathsUsingTemplateScanNode.java | 2 ++
.../node/metedata/read/SchemaFetchMergeNode.java | 1 +
.../node/metedata/read/SchemaQueryMergeNode.java | 1 +
.../write/CreateAlignedTimeSeriesNode.java | 1 +
.../metedata/write/CreateMultiTimeSeriesNode.java | 1 +
.../node/metedata/write/CreateTimeSeriesNode.java | 1 +
.../plan/node/process/MultiChildProcessNode.java | 4 ++--
.../planner/plan/node/process/ProcessNode.java | 2 +-
.../plan/node/process/SingleChildProcessNode.java | 4 ++--
.../node/process/last/LastQueryCollectNode.java | 1 +
.../plan/node/process/last/LastQueryMergeNode.java | 1 +
.../plan/node/process/last/LastQueryNode.java | 1 +
.../mpp/plan/planner/plan/node/sink/SinkNode.java | 2 +-
.../source/AlignedSeriesAggregationScanNode.java | 3 +++
.../node/source/SeriesAggregationScanNode.java | 3 +++
.../node/source/SeriesAggregationSourceNode.java | 2 +-
.../planner/plan/node/source/SeriesSourceNode.java | 2 +-
.../CrossSeriesAggregationDescriptor.java | 1 +
.../plan/planner/plan/parameter/OutputColumn.java | 2 +-
.../scheduler/AbstractFragInsStateTracker.java | 2 +-
.../scheduler/FixedRateFragInsStateTracker.java | 4 ++--
.../scheduler/load/LoadTsFileDispatcherImpl.java | 2 +-
.../plan/scheduler/load/LoadTsFileScheduler.java | 18 +++++++---------
.../plan/statement/component/IntoComponent.java | 8 +++----
.../crud/InsertMultiTabletsStatement.java | 1 +
.../plan/statement/crud/InsertRowStatement.java | 1 +
.../crud/InsertRowsOfOneDeviceStatement.java | 3 ++-
.../plan/statement/crud/InsertRowsStatement.java | 1 +
.../plan/statement/crud/InsertTabletStatement.java | 1 +
.../iotdb/db/mpp/statistics/StatisticsManager.java | 2 +-
.../dag/column/ColumnTransformer.java | 2 +-
.../binary/ArithmeticBinaryColumnTransformer.java | 2 +-
.../dag/column/binary/BinaryColumnTransformer.java | 2 +-
.../binary/CompareBinaryColumnTransformer.java | 2 +-
.../binary/LogicBinaryColumnTransformer.java | 2 +-
.../dag/column/leaf/LeafColumnTransformer.java | 2 +-
.../ternary/CompareTernaryColumnTransformer.java | 4 ++--
.../column/ternary/TernaryColumnTransformer.java | 2 +-
.../dag/column/unary/UnaryColumnTransformer.java | 2 +-
.../dag/transformer/unary/UnaryTransformer.java | 2 +-
77 files changed, 148 insertions(+), 118 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/FirstValueDescAccumulator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/FirstValueDescAccumulator.java
index d4d002828b..5717e7d175 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/FirstValueDescAccumulator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/FirstValueDescAccumulator.java
@@ -35,6 +35,7 @@ public class FirstValueDescAccumulator extends
FirstValueAccumulator {
}
// Don't break in advance
+ @Override
protected int addIntInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -54,6 +55,7 @@ public class FirstValueDescAccumulator extends
FirstValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addLongInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -73,6 +75,7 @@ public class FirstValueDescAccumulator extends
FirstValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addFloatInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -92,6 +95,7 @@ public class FirstValueDescAccumulator extends
FirstValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addDoubleInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -111,6 +115,7 @@ public class FirstValueDescAccumulator extends
FirstValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addBooleanInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -130,6 +135,7 @@ public class FirstValueDescAccumulator extends
FirstValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addBinaryInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/LastValueDescAccumulator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/LastValueDescAccumulator.java
index cdc19f5cb6..98b77c3030 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/LastValueDescAccumulator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/LastValueDescAccumulator.java
@@ -39,6 +39,7 @@ public class LastValueDescAccumulator extends
LastValueAccumulator {
super.reset();
}
+ @Override
protected int addIntInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -60,6 +61,7 @@ public class LastValueDescAccumulator extends
LastValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addLongInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -81,6 +83,7 @@ public class LastValueDescAccumulator extends
LastValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addFloatInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -102,6 +105,7 @@ public class LastValueDescAccumulator extends
LastValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addDoubleInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -123,6 +127,7 @@ public class LastValueDescAccumulator extends
LastValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addBooleanInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
@@ -144,6 +149,7 @@ public class LastValueDescAccumulator extends
LastValueAccumulator {
return curPositionCount;
}
+ @Override
protected int addBinaryInput(Column[] column, IWindow curWindow) {
int curPositionCount = column[0].getPositionCount();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregator.java
index 8d328d9cad..a707128acc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregator.java
@@ -47,7 +47,7 @@ public abstract class SlidingWindowAggregator extends
Aggregator {
protected TimeRange curTimeRange;
- public SlidingWindowAggregator(
+ protected SlidingWindowAggregator(
Accumulator accumulator, List<InputLocation[]> inputLocationList,
AggregationStep step) {
super(accumulator, step, inputLocationList);
this.deque = new LinkedList<>();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
index a6dc525717..e29de0ace8 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java
@@ -28,17 +28,20 @@ import
org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.block.column.Column;
import java.util.Comparator;
-import java.util.HashMap;
+import java.util.EnumMap;
import java.util.List;
import java.util.Map;
public class SlidingWindowAggregatorFactory {
/** comparators used for MonotonicQueueSlidingWindowAggregator */
- private static final Map<TSDataType, Comparator<Column>> maxComparators =
new HashMap<>();
+ private static final Map<TSDataType, Comparator<Column>> maxComparators =
+ new EnumMap<>(TSDataType.class);
- private static final Map<TSDataType, Comparator<Column>> minComparators =
new HashMap<>();
- private static final Map<TSDataType, Comparator<Column>> extremeComparators
= new HashMap<>();
+ private static final Map<TSDataType, Comparator<Column>> minComparators =
+ new EnumMap<>(TSDataType.class);
+ private static final Map<TSDataType, Comparator<Column>> extremeComparators =
+ new EnumMap<>(TSDataType.class);
static {
// return a value greater than 0 if o1 is numerically greater than o2
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java
b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java
index 23768dd4c3..ff15d466d2 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
/** The header of query result dataset. */
public class DatasetHeader {
- public static DatasetHeader EMPTY_HEADER = new DatasetHeader(new
ArrayList<>(), false);
+ public static final DatasetHeader EMPTY_HEADER = new DatasetHeader(new
ArrayList<>(), false);
// column names, data types and aliases of result dataset
private final List<ColumnHeader> columnHeaders;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaInternalNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaInternalNode.java
index 471dcd29df..2eecb0f2ba 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaInternalNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaInternalNode.java
@@ -41,6 +41,7 @@ public class SchemaInternalNode extends SchemaNode {
return children.get(name);
}
+ @Override
public void addChild(String name, SchemaNode child) {
children.put(name, child);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaNode.java
index be0c7721dd..71544ffbb1 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/node/SchemaNode.java
@@ -35,7 +35,7 @@ public abstract class SchemaNode implements ITreeNode {
protected final String name;
- public SchemaNode(String name) {
+ protected SchemaNode(String name) {
this.name = name;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/visitor/SchemaTreeVisitor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/visitor/SchemaTreeVisitor.java
index 848cacc213..557d9f8b37 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/visitor/SchemaTreeVisitor.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/visitor/SchemaTreeVisitor.java
@@ -30,7 +30,7 @@ import java.util.List;
public abstract class SchemaTreeVisitor<R>
extends AbstractTreeVisitorWithLimitOffset<SchemaNode, R> {
- public SchemaTreeVisitor(
+ protected SchemaTreeVisitor(
SchemaNode root, PartialPath pathPattern, int limit, int offset, boolean
isPrefixMatch) {
super(root, pathPattern, limit, offset, isPrefixMatch);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
index b743b90ef0..ed35fd36b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
@@ -64,7 +64,7 @@ public abstract class Driver implements IDriver {
DESTROYED
}
- public Driver(Operator root, ISinkHandle sinkHandle, DriverContext
driverContext) {
+ protected Driver(Operator root, ISinkHandle sinkHandle, DriverContext
driverContext) {
checkNotNull(root, "root Operator should not be null");
checkNotNull(sinkHandle, "SinkHandle should not be null");
this.root = root;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceContext.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceContext.java
index 5a4ede9538..5ddad69257 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceContext.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceContext.java
@@ -228,6 +228,7 @@ public class FragmentInstanceContext extends QueryContext {
return executionEndTime.get();
}
+ @Override
public long getStartTime() {
return executionStartTime.get();
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
index a975c9608d..d2a71a2739 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
@@ -78,7 +78,7 @@ public abstract class AbstractIntoOperator implements
ProcessOperator {
private final long maxRetainedSize;
private final long maxReturnSize;
- public AbstractIntoOperator(
+ protected AbstractIntoOperator(
OperatorContext operatorContext,
Operator child,
List<InsertTabletStatementGenerator> insertTabletStatementGenerators,
@@ -205,11 +205,13 @@ public abstract class AbstractIntoOperator implements
ProcessOperator {
Map<String, Boolean> targetDeviceToAlignedMap) {
List<InsertTabletStatementGenerator> insertTabletStatementGenerators =
new ArrayList<>(targetPathToSourceInputLocationMap.size());
- for (PartialPath targetDevice :
targetPathToSourceInputLocationMap.keySet()) {
+ for (Map.Entry<PartialPath, Map<String, InputLocation>> entry :
+ targetPathToSourceInputLocationMap.entrySet()) {
+ PartialPath targetDevice = entry.getKey();
InsertTabletStatementGenerator generator =
new InsertTabletStatementGenerator(
targetDevice,
- targetPathToSourceInputLocationMap.get(targetDevice),
+ entry.getValue(),
targetPathToDataTypeMap.get(targetDevice),
targetDeviceToAlignedMap.get(targetDevice.toString()));
insertTabletStatementGenerators.add(generator);
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/SingleInputAggregationOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/SingleInputAggregationOperator.java
index 16071aea1e..3561621d85 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/SingleInputAggregationOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/SingleInputAggregationOperator.java
@@ -50,7 +50,7 @@ public abstract class SingleInputAggregationOperator
implements ProcessOperator
protected final long maxRetainedSize;
protected final long maxReturnSize;
- public SingleInputAggregationOperator(
+ protected SingleInputAggregationOperator(
OperatorContext operatorContext,
List<Aggregator> aggregators,
Operator child,
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..1dcaaa884a 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
@@ -270,11 +270,7 @@ public class TransformOperator implements ProcessOperator {
return true;
}
- if (reader.isCurrentNull()) {
- return true;
- } else {
- return false;
- }
+ return reader.isCurrentNull();
}
protected YieldableState collectDataPoint(
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
index 56119832f5..da516899cc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/RowBasedTimeJoinOperator.java
@@ -87,7 +87,7 @@ public class RowBasedTimeJoinOperator extends
AbstractProcessOperator {
List<ColumnMerger> mergers,
TimeComparator comparator) {
checkArgument(
- children != null && children.size() > 0,
+ children != null && !children.isEmpty(),
"child size of TimeJoinOperator should be larger than 0");
this.operatorContext = operatorContext;
this.children = children;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/TimeJoinOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/TimeJoinOperator.java
index cbb60d3c9b..1bbddd3b1c 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/TimeJoinOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/TimeJoinOperator.java
@@ -87,7 +87,7 @@ public class TimeJoinOperator extends AbstractProcessOperator
{
List<ColumnMerger> mergers,
TimeComparator comparator) {
checkArgument(
- children != null && children.size() > 0,
+ children != null && !children.isEmpty(),
"child size of TimeJoinOperator should be larger than 0");
this.operatorContext = operatorContext;
this.children = children;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java
index 2a4ffd58c5..4a00c8e87a 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/join/VerticallyConcatOperator.java
@@ -61,7 +61,7 @@ public class VerticallyConcatOperator implements
ProcessOperator {
public VerticallyConcatOperator(
OperatorContext operatorContext, List<Operator> children,
List<TSDataType> dataTypes) {
checkArgument(
- children != null && children.size() > 0,
+ children != null && !children.isEmpty(),
"child size of VerticallyConcatOperator should be larger than 0");
this.operatorContext = operatorContext;
this.children = children;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/AbstractUpdateLastCacheOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/AbstractUpdateLastCacheOperator.java
index 4850fb45c4..b01515346b 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/AbstractUpdateLastCacheOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/AbstractUpdateLastCacheOperator.java
@@ -48,7 +48,7 @@ public abstract class AbstractUpdateLastCacheOperator
implements ProcessOperator
protected String databaseName;
- public AbstractUpdateLastCacheOperator(
+ protected AbstractUpdateLastCacheOperator(
OperatorContext operatorContext,
Operator child,
DataNodeSchemaCache dataNodeSchemaCache,
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
index 68419ec464..4c2e3f908e 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
@@ -132,10 +132,7 @@ public class SchemaQueryOrderByHeatOperator implements
ProcessOperator {
Object[] line = tsBlockRowIterator.next();
String timeseries = line[0].toString();
long time = timeseriesToLastTimestamp.getOrDefault(timeseries, 0L);
- if (!lastTimestampToTsSchema.containsKey(time)) {
- lastTimestampToTsSchema.put(time, new ArrayList<>());
- }
- lastTimestampToTsSchema.get(time).add(line);
+ lastTimestampToTsSchema.computeIfAbsent(time, key -> new
ArrayList<>()).add(line);
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
index 3566e1d834..de326eefae 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
@@ -67,7 +67,7 @@ public abstract class AbstractSeriesAggregationScanOperator
extends AbstractData
private final long cachedRawDataSize;
private final long maxReturnSize;
- public AbstractSeriesAggregationScanOperator(
+ protected AbstractSeriesAggregationScanOperator(
PlanNodeId sourceId,
OperatorContext context,
SeriesScanUtil seriesScanUtil,
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
index 1fae6e0115..40bec7d3d6 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/AbstractDriverThread.java
@@ -38,7 +38,7 @@ public abstract class AbstractDriverThread extends Thread
implements Closeable {
protected final ITaskScheduler scheduler;
private volatile boolean closed;
- public AbstractDriverThread(
+ protected AbstractDriverThread(
String workerId,
ThreadGroup tg,
IndexedBlockingQueue<DriverTask> queue,
@@ -59,7 +59,7 @@ public abstract class AbstractDriverThread extends Thread
implements Closeable {
try {
next = queue.poll();
} catch (InterruptedException e) {
- logger.warn("Executor " + this.getName() + " failed to poll driver
task from queue");
+ logger.warn("Executor {} failed to poll driver task from queue",
this.getName());
Thread.currentThread().interrupt();
break;
}
@@ -87,12 +87,11 @@ public abstract class AbstractDriverThread extends Thread
implements Closeable {
// unless we have been closed, we need to replace this thread
if (!closed) {
logger.warn(
- "Executor "
- + this.getName()
- + " exits because it's interrupted, and we will produce
another thread to replace.");
+ "Executor {} exits because it's interrupted, and we will produce
another thread to replace.",
+ this.getName());
producer.produce(getName(), getThreadGroup(), queue, producer);
} else {
- logger.info("Executor " + this.getName() + " exits because it is
closed.");
+ logger.info("Executor {} exits because it is closed.", this.getName());
}
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
index a93f3ec69c..dac98a07ee 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
@@ -386,7 +386,7 @@ public class DriverScheduler implements IDriverScheduler,
IService {
}
logger.warn(
"The task {} is aborted. All other tasks in the same query will
be cancelled",
- task.getId().toString());
+ task.getId());
clearDriverTask(task);
} finally {
task.unlock();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/TestRPCClient.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/TestRPCClient.java
index a0569e390a..006b6d36f0 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/TestRPCClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/TestRPCClient.java
@@ -57,7 +57,7 @@ public class TestRPCClient {
new IoTConsensusConfig.Builder().build()));
}
- public static void main(String args[]) {
+ public static void main(String[] args) {
TestRPCClient client = new TestRPCClient();
// client.removeRegionPeer();
client.addPeer();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 81910ef650..e060e05a5f 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -160,7 +160,7 @@ import static
org.apache.iotdb.db.mpp.plan.analyze.SelectIntoUtils.constructTarg
/** This visitor is used to analyze each type of Statement and returns the
{@link Analysis}. */
public class AnalyzeVisitor extends StatementVisitor<Analysis,
MPPQueryContext> {
- private static final Logger logger = LoggerFactory.getLogger(Analyzer.class);
+ private static final Logger logger =
LoggerFactory.getLogger(AnalyzeVisitor.class);
private static final IoTDBConfig CONFIG =
IoTDBDescriptor.getInstance().getConfig();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
index e3e937d04d..029c878114 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
@@ -306,10 +306,7 @@ public class ClusterPartitionFetcher implements
IPartitionFetcher {
String devicePath = dataPartitionQueryParam.getDevicePath();
if (deviceToStorageGroupMap.containsKey(devicePath)) {
String storageGroup = deviceToStorageGroupMap.get(devicePath);
- if (!result.containsKey(storageGroup)) {
- result.put(storageGroup, new ArrayList<>());
- }
- result.get(storageGroup).add(dataPartitionQueryParam);
+ result.computeIfAbsent(storageGroup, key -> new
ArrayList<>()).add(dataPartitionQueryParam);
}
}
return result;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionAnalyzer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionAnalyzer.java
index d0be42611a..d6766fcbfe 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionAnalyzer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ExpressionAnalyzer.java
@@ -557,7 +557,7 @@ public class ExpressionAnalyzer {
List<PartialPath> noStarPaths = new ArrayList<>();
for (PartialPath concatPath : concatPaths) {
List<MeasurementPath> actualPaths =
schemaTree.searchMeasurementPaths(concatPath).left;
- if (actualPaths.size() == 0) {
+ if (actualPaths.isEmpty()) {
return Collections.singletonList(new NullOperand());
}
noStarPaths.addAll(actualPaths);
@@ -661,7 +661,7 @@ public class ExpressionAnalyzer {
for (Expression suffixExpression : expression.getExpressions()) {
List<Expression> concatedExpression =
concatDeviceAndRemoveWildcard(suffixExpression, devicePath,
schemaTree);
- if (concatedExpression != null && concatedExpression.size() != 0) {
+ if (concatedExpression != null && !concatedExpression.isEmpty()) {
extendedExpressions.add(concatedExpression);
}
}
@@ -754,7 +754,7 @@ public class ExpressionAnalyzer {
PartialPath concatPath = devicePath.concatPath(measurement);
List<MeasurementPath> noStarPaths =
schemaTree.searchMeasurementPaths(concatPath).left;
- if (noStarPaths.size() == 0) {
+ if (noStarPaths.isEmpty()) {
return Collections.singletonList(new NullOperand());
}
return reconstructTimeSeriesOperands(noStarPaths);
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
index 249be0db20..ea23bc4fca 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
@@ -605,7 +605,7 @@ public class PartitionCache {
for (Map.Entry<String, List<DataPartitionQueryParam>> entry :
storageGroupToQueryParamsMap.entrySet()) {
if (null == entry.getValue()
- || 0 == entry.getValue().size()
+ || entry.getValue().isEmpty()
|| !getStorageGroupDataPartition(dataPartitionMap, entry.getKey(),
entry.getValue())) {
CacheMetricsRecorder.record(false, DATA_PARTITION_CACHE_NAME);
return null;
@@ -688,7 +688,7 @@ public class PartitionCache {
Map<TTimePartitionSlot, List<TRegionReplicaSet>> timePartitionSlotListMap =
seriesSlotToTimePartitionMap.computeIfAbsent(seriesPartitionSlot, k ->
new HashMap<>());
// Notice: when query all time partition, then miss
- if (0 == dataPartitionQueryParam.getTimePartitionSlotList().size()) {
+ if (dataPartitionQueryParam.getTimePartitionSlotList().isEmpty()) {
return false;
}
// check cache for each time partition
@@ -716,7 +716,7 @@ public class PartitionCache {
Map<TTimePartitionSlot, List<TConsensusGroupId>>
cachedTimePartitionSlot) {
List<TConsensusGroupId> cacheConsensusGroupId =
cachedTimePartitionSlot.get(timePartitionSlot);
if (null == cacheConsensusGroupId
- || 0 == cacheConsensusGroupId.size()
+ || cacheConsensusGroupId.isEmpty()
|| null == timePartitionSlot) {
logger.debug(
"[{} Cache] miss when search time partition {}",
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/StorageGroupCacheResult.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/StorageGroupCacheResult.java
index 29c811d1e0..2c95d5919d 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/StorageGroupCacheResult.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/StorageGroupCacheResult.java
@@ -29,7 +29,7 @@ public abstract class StorageGroupCacheResult<V> {
/** the list of devices that miss */
private List<String> missedDevices = new ArrayList<>();
/** result map, Notice: this map will be empty when failed */
- protected Map<String, V> map = new HashMap<>();;
+ protected Map<String, V> map = new HashMap<>();
public boolean isSuccess() {
return success;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index 4c2cf760e5..e7107c06df 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@ -319,10 +319,8 @@ public class QueryExecution implements IQueryExecution {
// Stop the workers for this query
public void stop() {
// only stop once
- if (stopped.compareAndSet(false, true)) {
- if (this.scheduler != null) {
- this.scheduler.stop();
- }
+ if (stopped.compareAndSet(false, true) && this.scheduler != null) {
+ this.scheduler.stop();
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/BetweenExpression.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/BetweenExpression.java
index 62e91a9348..46463a2097 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/BetweenExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ternary/BetweenExpression.java
@@ -72,6 +72,7 @@ public class BetweenExpression extends TernaryExpression {
return ExpressionType.BETWEEN;
}
+ @Override
protected void serialize(ByteBuffer byteBuffer) {
super.serialize(byteBuffer);
ReadWriteIOUtils.write(isNotBetween, byteBuffer);
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..b2d3add5fa 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
@@ -72,6 +72,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import static org.apache.iotdb.db.mpp.plan.expression.ExpressionType.BETWEEN;
+
/** Responsible for constructing {@link ColumnTransformer} through Expression.
*/
public class ColumnTransformerVisitor
extends ExpressionVisitor<
@@ -409,18 +411,17 @@ public class ColumnTransformerVisitor
ColumnTransformer secondColumnTransformer,
ColumnTransformer thirdColumnTransformer,
Type returnType) {
- switch (expression.getExpressionType()) {
- case BETWEEN:
- BetweenExpression betweenExpression = (BetweenExpression) expression;
- return new BetweenColumnTransformer(
- returnType,
- firstColumnTransformer,
- secondColumnTransformer,
- thirdColumnTransformer,
- betweenExpression.isNotBetween());
- default:
- throw new UnsupportedOperationException(
- "Unsupported Expression Type: " + expression.getExpressionType());
+ if (expression.getExpressionType() == BETWEEN) {
+ BetweenExpression betweenExpression = (BetweenExpression) expression;
+ return new BetweenColumnTransformer(
+ returnType,
+ firstColumnTransformer,
+ secondColumnTransformer,
+ thirdColumnTransformer,
+ betweenExpression.isNotBetween());
+ } else {
+ throw new UnsupportedOperationException(
+ "Unsupported Expression Type: " + expression.getExpressionType());
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/SubPlanTypeExtractor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/SubPlanTypeExtractor.java
index 38d46ad5e9..af88b10cf7 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/SubPlanTypeExtractor.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/SubPlanTypeExtractor.java
@@ -112,22 +112,27 @@ public class SubPlanTypeExtractor {
// region PlanNode of last query
// No need to deal with type of last query
+ @Override
public Void visitLastQueryScan(LastQueryScanNode node, Void context) {
return null;
}
+ @Override
public Void visitAlignedLastQueryScan(AlignedLastQueryScanNode node, Void
context) {
return null;
}
+ @Override
public Void visitLastQuery(LastQueryNode node, Void context) {
return null;
}
+ @Override
public Void visitLastQueryMerge(LastQueryMergeNode node, Void context) {
return null;
}
+ @Override
public Void visitLastQueryCollect(LastQueryCollectNode node, Void context)
{
return null;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
index cc2cfa2337..f6d11f28c3 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
@@ -138,7 +138,7 @@ public class SimpleFragmentParallelPlanner implements
IFragmentParallelPlaner {
private TDataNodeLocation selectTargetDataNode(TRegionReplicaSet
regionReplicaSet) {
if (regionReplicaSet == null
|| regionReplicaSet.getDataNodeLocations() == null
- || regionReplicaSet.getDataNodeLocations().size() == 0) {
+ || regionReplicaSet.getDataNodeLocations().isEmpty()) {
throw new IllegalArgumentException(
String.format("regionReplicaSet is invalid: %s", regionReplicaSet));
}
@@ -152,7 +152,7 @@ public class SimpleFragmentParallelPlanner implements
IFragmentParallelPlaner {
// black list won't be considered because it may have connection issue now.
List<TDataNodeLocation> availableDataNodes =
filterAvailableTDataNode(regionReplicaSet.getDataNodeLocations());
- if (availableDataNodes.size() == 0) {
+ if (availableDataNodes.isEmpty()) {
String errorMsg =
String.format(
"all replicas for region[%s] are not available in these
DataNodes[%s]",
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
index 9cb276384e..799b311551 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
@@ -899,7 +899,7 @@ public class SourceRewriter extends
SimplePlanNodeRewriter<DistributionPlanConte
}
}
}
- if (descriptorExpressions.size() == 0) {
+ if (descriptorExpressions.isEmpty()) {
continue;
}
CrossSeriesAggregationDescriptor descriptor =
originalDescriptor.deepClone();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/SubPlan.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/SubPlan.java
index 7b177618e6..54d84df66f 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/SubPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/SubPlan.java
@@ -43,7 +43,7 @@ public class SubPlan {
StringBuilder result = new StringBuilder();
result.append(
String.format(
- "SubPlan-%s. RootNodeId: %s\n",
+ "SubPlan-%s. RootNodeId: %s%n",
planFragment.getId(),
planFragment.getPlanNodeTree().getPlanNodeId()));
children.forEach(result::append);
return result.toString();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanGraphPrinter.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanGraphPrinter.java
index 1ea9a94440..467afb7091 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanGraphPrinter.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanGraphPrinter.java
@@ -325,12 +325,11 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
DeviceViewIntoPathDescriptor descriptor =
node.getDeviceViewIntoPathDescriptor();
Map<String, List<Pair<String, PartialPath>>>
deviceToSourceTargetPathPairListMap =
descriptor.getDeviceToSourceTargetPathPairListMap();
- for (String deviceName : deviceToSourceTargetPathPairListMap.keySet()) {
+ for (Map.Entry<String, List<Pair<String, PartialPath>>> entry :
+ deviceToSourceTargetPathPairListMap.entrySet()) {
+ String deviceName = entry.getKey();
boxValue.add(String.format("Device [%s]:", deviceName));
- drawSourceTargetPath(
- boxValue,
- deviceToSourceTargetPathPairListMap.get(deviceName),
- descriptor.getTargetDeviceToAlignedMap());
+ drawSourceTargetPath(boxValue, entry.getValue(),
descriptor.getTargetDeviceToAlignedMap());
}
return render(node, boxValue, context);
}
@@ -444,7 +443,7 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
}
box.lines.add(printBoxEdge(box, false));
- if (children.size() == 0) {
+ if (children.isEmpty()) {
return box.lines;
}
@@ -598,7 +597,7 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
public void calculateBoxParams(List<List<String>> childBoxStrings) {
int childrenWidth = 0;
for (List<String> childBoxString : childBoxStrings) {
- Validate.isTrue(childBoxString.size() > 0, "Lines of box string should
be greater than 0");
+ Validate.isTrue(!childBoxString.isEmpty(), "Lines of box string should
be greater than 0");
childrenWidth += childBoxString.get(0).length();
}
childrenWidth += childBoxStrings.size() > 1 ? (childBoxStrings.size() -
1) * BOX_MARGIN : 0;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNode.java
index 2f33e002ca..80ec99d1f3 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNode.java
@@ -45,7 +45,7 @@ public abstract class PlanNode implements IConsensusRequest {
private PlanNodeId id;
- public PlanNode(PlanNodeId id) {
+ protected PlanNode(PlanNodeId id) {
requireNonNull(id, "id is null");
this.id = id;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/AbstractSchemaMergeNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/AbstractSchemaMergeNode.java
index f2b0245e0e..88ac438f74 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/AbstractSchemaMergeNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/AbstractSchemaMergeNode.java
@@ -31,7 +31,7 @@ public abstract class AbstractSchemaMergeNode extends
ProcessNode {
private final List<PlanNode> children;
- public AbstractSchemaMergeNode(PlanNodeId id) {
+ protected AbstractSchemaMergeNode(PlanNodeId id) {
super(id);
children = new ArrayList<>();
}
@@ -53,7 +53,7 @@ public abstract class AbstractSchemaMergeNode extends
ProcessNode {
@Override
public List<String> getOutputColumnNames() {
- if (children.size() > 0) {
+ if (!children.isEmpty()) {
return children.get(0).getOutputColumnNames();
}
return Collections.emptyList();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/PathsUsingTemplateScanNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/PathsUsingTemplateScanNode.java
index eceff3fd87..716694c734 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/PathsUsingTemplateScanNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/PathsUsingTemplateScanNode.java
@@ -48,10 +48,12 @@ public class PathsUsingTemplateScanNode extends
SchemaQueryScanNode {
this.templateId = templateId;
}
+ @Override
public List<PartialPath> getPathPatternList() {
return pathPatternList;
}
+ @Override
public void setPathPatternList(List<PartialPath> pathPatternList) {
this.pathPatternList = pathPatternList;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
index be235cf920..437bf6e8dc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
@@ -83,6 +83,7 @@ public class SchemaFetchMergeNode extends
AbstractSchemaMergeNode {
return visitor.visitSchemaFetchMerge(this, context);
}
+ @Override
public String toString() {
return String.format("SchemaFetchMergeNode-%s", getPlanNodeId());
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
index f4e681494c..51d598e236 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
@@ -69,6 +69,7 @@ public class SchemaQueryMergeNode extends
AbstractSchemaMergeNode {
return visitor.visitSchemaQueryMerge(this, context);
}
+ @Override
public String toString() {
return String.format("SchemaQueryMergeNode-%s", getPlanNodeId());
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java
index 7e129fba26..a55b9ad0fd 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java
@@ -426,6 +426,7 @@ public class CreateAlignedTimeSeriesNode extends
WritePlanNode
}
}
+ @Override
public int hashCode() {
return Objects.hash(
this.getPlanNodeId(),
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
index ec2cc3fc89..a739020e30 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
@@ -206,6 +206,7 @@ public class CreateMultiTimeSeriesNode extends
WritePlanNode {
}
}
+ @Override
public int hashCode() {
return Objects.hash(this.getPlanNodeId(), measurementGroupMap);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
index 8903308d75..dc0ca8a7c1 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
@@ -345,6 +345,7 @@ public class CreateTimeSeriesNode extends WritePlanNode
implements ICreateTimeSe
return visitor.visitCreateTimeSeries(this, schemaRegion);
}
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/MultiChildProcessNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/MultiChildProcessNode.java
index e23a86d0c1..cc90a40325 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/MultiChildProcessNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/MultiChildProcessNode.java
@@ -30,12 +30,12 @@ public abstract class MultiChildProcessNode extends
ProcessNode {
protected List<PlanNode> children;
- public MultiChildProcessNode(PlanNodeId id, List<PlanNode> children) {
+ protected MultiChildProcessNode(PlanNodeId id, List<PlanNode> children) {
super(id);
this.children = children;
}
- public MultiChildProcessNode(PlanNodeId id) {
+ protected MultiChildProcessNode(PlanNodeId id) {
super(id);
this.children = new ArrayList<>();
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ProcessNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ProcessNode.java
index 9913a4e93c..bfbcf516cc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ProcessNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/ProcessNode.java
@@ -23,7 +23,7 @@ import
org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
public abstract class ProcessNode extends PlanNode {
- public ProcessNode(PlanNodeId id) {
+ protected ProcessNode(PlanNodeId id) {
super(id);
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/SingleChildProcessNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/SingleChildProcessNode.java
index bd183cf3ee..99e48d3464 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/SingleChildProcessNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/SingleChildProcessNode.java
@@ -31,11 +31,11 @@ public abstract class SingleChildProcessNode extends
ProcessNode {
protected PlanNode child;
- public SingleChildProcessNode(PlanNodeId id) {
+ protected SingleChildProcessNode(PlanNodeId id) {
super(id);
}
- public SingleChildProcessNode(PlanNodeId id, PlanNode child) {
+ protected SingleChildProcessNode(PlanNodeId id, PlanNode child) {
super(id);
this.child = child;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryCollectNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryCollectNode.java
index 5f38f64a0a..af1615b017 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryCollectNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryCollectNode.java
@@ -102,6 +102,7 @@ public class LastQueryCollectNode extends
MultiChildProcessNode {
return new LastQueryCollectNode(planNodeId);
}
+ @Override
public void setChildren(List<PlanNode> children) {
this.children = children;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryMergeNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryMergeNode.java
index accb4dcbd7..08829e3c92 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryMergeNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryMergeNode.java
@@ -124,6 +124,7 @@ public class LastQueryMergeNode extends
MultiChildProcessNode {
return new LastQueryMergeNode(planNodeId, mergeOrderParameter);
}
+ @Override
public void setChildren(List<PlanNode> children) {
this.children = children;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryNode.java
index cdfde9c974..16a2eab96c 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/last/LastQueryNode.java
@@ -152,6 +152,7 @@ public class LastQueryNode extends MultiChildProcessNode {
return new LastQueryNode(planNodeId, timeFilter, mergeOrderParameter);
}
+ @Override
public void setChildren(List<PlanNode> children) {
this.children = children;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/SinkNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/SinkNode.java
index dd22451db5..4783ea8dfc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/SinkNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/SinkNode.java
@@ -23,7 +23,7 @@ import
org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
public abstract class SinkNode extends PlanNode implements AutoCloseable {
- public SinkNode(PlanNodeId id) {
+ protected SinkNode(PlanNodeId id) {
super(id);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
index d0c2b30e5f..319390f6c0 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java
@@ -94,10 +94,12 @@ public class AlignedSeriesAggregationScanNode extends
SeriesAggregationSourceNod
return alignedPath;
}
+ @Override
public Ordering getScanOrder() {
return scanOrder;
}
+ @Override
@Nullable
public Filter getTimeFilter() {
return timeFilter;
@@ -107,6 +109,7 @@ public class AlignedSeriesAggregationScanNode extends
SeriesAggregationSourceNod
this.timeFilter = timeFilter;
}
+ @Override
@Nullable
public GroupByTimeParameter getGroupByTimeParameter() {
return groupByTimeParameter;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
index f1955eab2d..2ea730b747 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationScanNode.java
@@ -102,10 +102,12 @@ public class SeriesAggregationScanNode extends
SeriesAggregationSourceNode {
this.regionReplicaSet = dataRegionReplicaSet;
}
+ @Override
public Ordering getScanOrder() {
return scanOrder;
}
+ @Override
@Nullable
public Filter getTimeFilter() {
return timeFilter;
@@ -115,6 +117,7 @@ public class SeriesAggregationScanNode extends
SeriesAggregationSourceNode {
this.timeFilter = timeFilter;
}
+ @Override
@Nullable
public GroupByTimeParameter getGroupByTimeParameter() {
return groupByTimeParameter;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
index 863f597832..183c44cdc9 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
@@ -47,7 +47,7 @@ public abstract class SeriesAggregationSourceNode extends
SeriesSourceNode {
// Its value will be null if there is no `group by time` clause,
@Nullable protected GroupByTimeParameter groupByTimeParameter;
- public SeriesAggregationSourceNode(
+ protected SeriesAggregationSourceNode(
PlanNodeId id, List<AggregationDescriptor> aggregationDescriptorList) {
super(id);
this.aggregationDescriptorList = aggregationDescriptorList;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesSourceNode.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesSourceNode.java
index e363604c51..8b0a707b3e 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesSourceNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/SeriesSourceNode.java
@@ -24,7 +24,7 @@ import
org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
public abstract class SeriesSourceNode extends SourceNode {
- public SeriesSourceNode(PlanNodeId id) {
+ protected SeriesSourceNode(PlanNodeId id) {
super(id);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
index d40df1f33e..e9eb082169 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java
@@ -66,6 +66,7 @@ public class CrossSeriesAggregationDescriptor extends
AggregationDescriptor {
return inputColumnNameToExpressionMap;
}
+ @Override
public CrossSeriesAggregationDescriptor deepClone() {
return new CrossSeriesAggregationDescriptor(
this.getAggregationFuncName(),
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/OutputColumn.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/OutputColumn.java
index e6e71c3f24..7c13b331ae 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/OutputColumn.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/OutputColumn.java
@@ -47,7 +47,7 @@ public class OutputColumn {
public OutputColumn(List<InputLocation> sourceLocations, boolean overlapped)
{
checkArgument(
- sourceLocations != null && sourceLocations.size() > 0,
+ sourceLocations != null && !sourceLocations.isEmpty(),
"size of sourceLocations should be larger than 0");
this.sourceLocations = sourceLocations;
this.overlapped = overlapped;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
index bebb38f2b6..92d289ee60 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
@@ -52,7 +52,7 @@ public abstract class AbstractFragInsStateTracker implements
IFragInstanceStateT
private final IClientManager<TEndPoint, SyncDataNodeInternalServiceClient>
internalServiceClientManager;
- public AbstractFragInsStateTracker(
+ protected AbstractFragInsStateTracker(
QueryStateMachine stateMachine,
ScheduledExecutorService scheduledExecutor,
List<FragmentInstance> instances,
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FixedRateFragInsStateTracker.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FixedRateFragInsStateTracker.java
index 80b90b9a21..8ad594abcc 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FixedRateFragInsStateTracker.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FixedRateFragInsStateTracker.java
@@ -48,7 +48,7 @@ public class FixedRateFragInsStateTracker extends
AbstractFragInsStateTracker {
private static final Logger logger =
LoggerFactory.getLogger(FixedRateFragInsStateTracker.class);
- private static final long SAME_STATE_PRINT_RATE_IN_MS = 10 * 60 * 1000;
+ private static final long SAME_STATE_PRINT_RATE_IN_MS = 10L * 60 * 1000;
// TODO: (xingtanzjr) consider how much Interval is OK for state tracker
private static final long STATE_FETCH_INTERVAL_IN_MS = 500;
@@ -141,7 +141,7 @@ public class FixedRateFragInsStateTracker extends
AbstractFragInsStateTracker {
private void updateQueryState(FragmentInstanceId instanceId,
FragmentInstanceInfo instanceInfo) {
if (instanceInfo.getState().isFailed()) {
if (instanceInfo.getFailureInfoList() == null
- || instanceInfo.getFailureInfoList().size() == 0) {
+ || instanceInfo.getFailureInfoList().isEmpty()) {
stateMachine.transitionToFailed(
new RuntimeException(String.format("FragmentInstance[%s] is
failed.", instanceId)));
} else {
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
index 0323f45ba3..2fb089eaa9 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
@@ -145,7 +145,7 @@ public class LoadTsFileDispatcherImpl implements
IFragInstanceDispatcher {
}
public void dispatchLocally(FragmentInstance instance) throws
FragmentInstanceDispatchException {
- logger.info(String.format("Receive load node from uuid %s.", uuid));
+ logger.info("Receive load node from uuid {}.", uuid);
ConsensusGroupId groupId =
ConsensusGroupId.Factory.createFromTConsensusGroupId(
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
index ada2fab6ae..64784bee4c 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
@@ -194,9 +194,9 @@ public class LoadTsFileScheduler implements IScheduler {
if (result.getFailureStatus().getSubStatus() != null) {
for (TSStatus status : result.getFailureStatus().getSubStatus()) {
logger.warn(
- String.format(
- "Sub status code %s. Sub status message %s.",
- TSStatusCode.representOf(status.getCode()).name(),
status.getMessage()));
+ "Sub status code {}. Sub status message {}.",
+ TSStatusCode.representOf(status.getCode()).name(),
+ status.getMessage());
}
}
TSStatus status = result.getFailureStatus();
@@ -224,7 +224,7 @@ public class LoadTsFileScheduler implements IScheduler {
}
private boolean secondPhase(boolean isFirstPhaseSuccess, String uuid, File
tsFile) {
- logger.info(String.format("Start dispatching Load command for uuid %s",
uuid));
+ logger.info("Start dispatching Load command for uuid {}", uuid);
TLoadCommandReq loadCommandReq =
new TLoadCommandReq(
(isFirstPhaseSuccess ? LoadCommand.EXECUTE :
LoadCommand.ROLLBACK).ordinal(), uuid);
@@ -261,9 +261,7 @@ public class LoadTsFileScheduler implements IScheduler {
}
private boolean loadLocally(LoadSingleTsFileNode node) {
- logger.info(
- String.format(
- "Start load TsFile %s locally.",
node.getTsFileResource().getTsFile().getPath()));
+ logger.info("Start load TsFile {} locally.",
node.getTsFileResource().getTsFile().getPath());
try {
FragmentInstance instance =
new FragmentInstance(
@@ -393,9 +391,9 @@ public class LoadTsFileScheduler implements IScheduler {
for (Map.Entry<TRegionReplicaSet, LoadTsFilePieceNode> entry :
replicaSet2Piece.entrySet()) {
if (!scheduler.dispatchOnePieceNode(entry.getValue(), entry.getKey()))
{
logger.warn(
- String.format(
- "Dispatch piece node %s of TsFile %s error.",
- entry.getValue(),
singleTsFileNode.getTsFileResource().getTsFile()));
+ "Dispatch piece node {} of TsFile {} error.",
+ entry.getValue(),
+ singleTsFileNode.getTsFileResource().getTsFile());
return false;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/IntoComponent.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/IntoComponent.java
index c61684062e..02b2c344c8 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/IntoComponent.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/IntoComponent.java
@@ -142,10 +142,8 @@ public class IntoComponent extends StatementNode {
public void validate(List<PartialPath> sourceDevices, List<Expression>
sourceColumns) {
boolean isAllRawSeriesQuery = checkIsAllRawSeriesQuery(sourceColumns);
- if (!isAllRawSeriesQuery) {
- if (isMeasurementsExistPlaceholder()) {
- throw new SemanticException(FORBID_PLACEHOLDER_ERROR_MSG);
- }
+ if (!isAllRawSeriesQuery && isMeasurementsExistPlaceholder()) {
+ throw new SemanticException(FORBID_PLACEHOLDER_ERROR_MSG);
}
if (isDeviceExistPlaceholder()) {
@@ -213,7 +211,7 @@ public class IntoComponent extends StatementNode {
protected int deviceIndex;
protected int measurementIndex;
- public AbstractIntoIterator(
+ protected AbstractIntoIterator(
List<IntoItem> intoItems,
boolean isDeviceExistPlaceholder,
boolean isMeasurementsExistPlaceholder) {
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
index 146d153330..3134f06d03 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
@@ -86,6 +86,7 @@ public class InsertMultiTabletsStatement extends
InsertBaseStatement {
return insertTabletStatementList.isEmpty();
}
+ @Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
return visitor.visitInsertMultiTablets(this, context);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
index 2f3e20853e..a57a3ad1c7 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
@@ -139,6 +139,7 @@ public class InsertRowStatement extends InsertBaseStatement
{
regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
+ @Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
return visitor.visitInsertRow(this, context);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
index 834717aaa7..7b23a107af 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
@@ -55,7 +55,7 @@ public class InsertRowsOfOneDeviceStatement extends
InsertBaseStatement {
this.insertRowStatementList = insertRowStatementList;
// set device path, measurements, and data types
- if (insertRowStatementList == null || insertRowStatementList.size() == 0) {
+ if (insertRowStatementList == null || insertRowStatementList.isEmpty()) {
return;
}
devicePath = insertRowStatementList.get(0).getDevicePath();
@@ -89,6 +89,7 @@ public class InsertRowsOfOneDeviceStatement extends
InsertBaseStatement {
.collectRedirectInfo(dataPartition);
}
+ @Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
return visitor.visitInsertRowsOfOneDevice(this, context);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
index 2af88eb9ad..b24814d8a9 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
@@ -86,6 +86,7 @@ public class InsertRowsStatement extends InsertBaseStatement {
return insertRowStatementList.isEmpty();
}
+ @Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
return visitor.visitInsertRows(this, context);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
index 314fdf2d61..3e3767e481 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
@@ -116,6 +116,7 @@ public class InsertTabletStatement extends
InsertBaseStatement {
regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
+ @Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
return visitor.visitInsertTablet(this, context);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/statistics/StatisticsManager.java
b/server/src/main/java/org/apache/iotdb/db/mpp/statistics/StatisticsManager.java
index 44d5fc1c66..225a36504a 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/statistics/StatisticsManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/statistics/StatisticsManager.java
@@ -30,7 +30,7 @@ public class StatisticsManager {
private final Map<PartialPath, TimeseriesStats> seriesToStatsMap =
Maps.newConcurrentMap();
public long getMaxBinarySizeInBytes(PartialPath path) {
- return 512 * Byte.BYTES;
+ return 512L * Byte.BYTES;
}
public static StatisticsManager getInstance() {
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ColumnTransformer.java
index 93b37217b2..c45405a71a 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ColumnTransformer.java
@@ -32,7 +32,7 @@ public abstract class ColumnTransformer {
protected int referenceCount;
- public ColumnTransformer(Type returnType) {
+ protected ColumnTransformer(Type returnType) {
this.returnType = returnType;
this.columnCache = new ColumnCache();
referenceCount = 0;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
index cdcd7ec8b0..b8dc5eda5b 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java
@@ -25,7 +25,7 @@ import
org.apache.iotdb.tsfile.read.common.block.column.ColumnBuilder;
import org.apache.iotdb.tsfile.read.common.type.Type;
public abstract class ArithmeticBinaryColumnTransformer extends
BinaryColumnTransformer {
- public ArithmeticBinaryColumnTransformer(
+ protected ArithmeticBinaryColumnTransformer(
Type returnType, ColumnTransformer leftTransformer, ColumnTransformer
rightTransformer) {
super(returnType, leftTransformer, rightTransformer);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/BinaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/BinaryColumnTransformer.java
index 76810d6311..e63eca920d 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/BinaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/BinaryColumnTransformer.java
@@ -30,7 +30,7 @@ public abstract class BinaryColumnTransformer extends
ColumnTransformer {
protected final ColumnTransformer rightTransformer;
- public BinaryColumnTransformer(
+ protected BinaryColumnTransformer(
Type returnType, ColumnTransformer leftTransformer, ColumnTransformer
rightTransformer) {
super(returnType);
this.leftTransformer = leftTransformer;
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
index 0efc6b2ab3..5e60bcd0b2 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/CompareBinaryColumnTransformer.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.tsfile.read.common.type.TypeEnum;
public abstract class CompareBinaryColumnTransformer extends
BinaryColumnTransformer {
- public CompareBinaryColumnTransformer(
+ protected CompareBinaryColumnTransformer(
Type returnType, ColumnTransformer leftTransformer, ColumnTransformer
rightTransformer) {
super(returnType, leftTransformer, rightTransformer);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
index c8263616ca..42c5d0d200 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/binary/LogicBinaryColumnTransformer.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.tsfile.read.common.type.Type;
import org.apache.iotdb.tsfile.read.common.type.TypeEnum;
public abstract class LogicBinaryColumnTransformer extends
BinaryColumnTransformer {
- public LogicBinaryColumnTransformer(
+ protected LogicBinaryColumnTransformer(
Type returnType, ColumnTransformer leftTransformer, ColumnTransformer
rightTransformer) {
super(returnType, leftTransformer, rightTransformer);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/leaf/LeafColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/leaf/LeafColumnTransformer.java
index 1b7cece4a0..06883439cd 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/leaf/LeafColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/leaf/LeafColumnTransformer.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.tsfile.read.common.block.TsBlock;
import org.apache.iotdb.tsfile.read.common.type.Type;
public abstract class LeafColumnTransformer extends ColumnTransformer {
- public LeafColumnTransformer(Type returnType) {
+ protected LeafColumnTransformer(Type returnType) {
super(returnType);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
index 9b09e77ac9..2abd0b3850 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.tsfile.read.common.type.Type;
import org.apache.iotdb.tsfile.read.common.type.TypeEnum;
public abstract class CompareTernaryColumnTransformer extends
TernaryColumnTransformer {
- public CompareTernaryColumnTransformer(
+ protected CompareTernaryColumnTransformer(
Type returnType,
ColumnTransformer firstColumnTransformer,
ColumnTransformer secondColumnTransformer,
@@ -61,7 +61,7 @@ public abstract class CompareTernaryColumnTransformer extends
TernaryColumnTrans
}
throw new UnsupportedOperationException(
- String.format("The Type of three subExpression should be all Numeric
or Text"));
+ "The Type of three subExpression should be all Numeric or Text");
}
protected abstract void doTransform(
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/TernaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/TernaryColumnTransformer.java
index 096cef4d5e..8b52c07b6e 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/TernaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/ternary/TernaryColumnTransformer.java
@@ -30,7 +30,7 @@ public abstract class TernaryColumnTransformer extends
ColumnTransformer {
protected ColumnTransformer thirdColumnTransformer;
- public TernaryColumnTransformer(
+ protected TernaryColumnTransformer(
Type returnType,
ColumnTransformer firstColumnTransformer,
ColumnTransformer secondColumnTransformer,
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/UnaryColumnTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/UnaryColumnTransformer.java
index c0682169b8..c7a686a0ad 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/UnaryColumnTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/column/unary/UnaryColumnTransformer.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.tsfile.read.common.type.Type;
public abstract class UnaryColumnTransformer extends ColumnTransformer {
protected ColumnTransformer childColumnTransformer;
- public UnaryColumnTransformer(Type returnType, ColumnTransformer
childColumnTransformer) {
+ protected UnaryColumnTransformer(Type returnType, ColumnTransformer
childColumnTransformer) {
super(returnType);
this.childColumnTransformer = childColumnTransformer;
checkType();
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/unary/UnaryTransformer.java
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/unary/UnaryTransformer.java
index 9cee90078a..65d6a52776 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/unary/UnaryTransformer.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/dag/transformer/unary/UnaryTransformer.java
@@ -33,7 +33,7 @@ public abstract class UnaryTransformer extends Transformer {
protected final TSDataType layerPointReaderDataType;
protected final boolean isLayerPointReaderConstant;
- public UnaryTransformer(LayerPointReader layerPointReader) {
+ protected UnaryTransformer(LayerPointReader layerPointReader) {
this.layerPointReader = layerPointReader;
layerPointReaderDataType = layerPointReader.getDataType();
isLayerPointReaderConstant = layerPointReader.isConstantPointReader();
