You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2023/06/19 14:01:42 UTC
[iotdb] 01/01: fix sonar
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/fixSonar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2f72b43d4a28d8b121fe27783b0ca43847489137
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Mon Jun 19 22:00:58 2023 +0800
fix sonar
---
.../iotdb/db/mpp/plan/analyze/SelectIntoUtils.java | 4 ++++
.../config/metadata/DatabaseSchemaTask.java | 4 ++--
.../apache/iotdb/db/mpp/plan/parser/ASTVisitor.java | 2 +-
.../iotdb/db/mpp/plan/statement/Statement.java | 2 +-
.../mpp/plan/statement/component/FillComponent.java | 4 +++-
.../mpp/plan/statement/component/FromComponent.java | 4 +++-
.../plan/statement/component/GroupByComponent.java | 8 ++++----
.../statement/component/GroupByTimeComponent.java | 4 +++-
.../mpp/plan/statement/component/IntoComponent.java | 12 ++++++------
.../plan/statement/component/OrderByComponent.java | 3 +++
.../db/mpp/plan/statement/component/OrderByKey.java | 4 ++++
.../mpp/plan/statement/crud/DeleteDataStatement.java | 2 +-
.../mpp/plan/statement/crud/InsertBaseStatement.java | 11 ++++++-----
.../statement/crud/InsertMultiTabletsStatement.java | 3 ++-
.../mpp/plan/statement/crud/InsertRowStatement.java | 11 ++++-------
.../mpp/plan/statement/crud/InsertRowsStatement.java | 3 ++-
.../plan/statement/crud/InsertTabletStatement.java | 17 +++++++----------
.../db/mpp/plan/statement/crud/QueryStatement.java | 9 ++++++---
.../db/mpp/plan/statement/literal/LongLiteral.java | 6 +++---
.../db/mpp/plan/statement/literal/NullLiteral.java | 5 +----
.../metadata/CreateContinuousQueryStatement.java | 1 -
.../statement/metadata/DatabaseSchemaStatement.java | 12 ++++++------
.../statement/metadata/MigrateRegionStatement.java | 20 ++++++++++----------
.../metadata/model/CreateModelStatement.java | 4 +++-
.../metadata/model/ShowModelsStatement.java | 4 +++-
.../template/AlterSchemaTemplateStatement.java | 3 ++-
.../template/BatchActivateTemplateStatement.java | 2 +-
.../template/CreateSchemaTemplateStatement.java | 6 ++----
.../template/DeactivateTemplateStatement.java | 2 +-
.../metadata/view/CreateLogicalViewStatement.java | 9 +++++----
.../mpp/plan/statement/sys/ShowQueriesStatement.java | 4 +++-
.../mpp/plan/statement/sys/ShowVersionStatement.java | 4 +++-
.../statement/sys/quota/ShowSpaceQuotaStatement.java | 2 +-
33 files changed, 106 insertions(+), 85 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SelectIntoUtils.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SelectIntoUtils.java
index 58d16c446c0..218d30bd157 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SelectIntoUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/SelectIntoUtils.java
@@ -43,6 +43,10 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.LEVELED_PATH_TEMPLATE_
public class SelectIntoUtils {
+ private SelectIntoUtils() {
+ // forbidding instantiation
+ }
+
public static PartialPath constructTargetPath(
PartialPath sourcePath, PartialPath deviceTemplate, String measurementTemplate) {
PartialPath targetDevice = constructTargetDevice(sourcePath.getDevicePath(), deviceTemplate);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java
index 10eb7b24bbb..59ed0e3babb 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/DatabaseSchemaTask.java
@@ -53,8 +53,8 @@ public class DatabaseSchemaTask implements IConfigTask {
DatabaseSchemaStatement databaseSchemaStatement) {
TDatabaseSchema databaseSchema = new TDatabaseSchema();
databaseSchema.setName(databaseSchemaStatement.getDatabasePath().getFullPath());
- if (databaseSchemaStatement.getTTL() != null) {
- databaseSchema.setTTL(databaseSchemaStatement.getTTL());
+ if (databaseSchemaStatement.getTtl() != null) {
+ databaseSchema.setTTL(databaseSchemaStatement.getTtl());
}
if (databaseSchemaStatement.getSchemaReplicationFactor() != null) {
databaseSchema.setSchemaReplicationFactor(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
index 79d6fbe187b..f84065183e8 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -2391,7 +2391,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
IoTDBSqlParser.DatabaseAttributeKeyContext attributeKey = attribute.databaseAttributeKey();
if (attributeKey.TTL() != null) {
long ttl = Long.parseLong(attribute.INTEGER_LITERAL().getText());
- databaseSchemaStatement.setTTL(ttl);
+ databaseSchemaStatement.setTtl(ttl);
} else if (attributeKey.SCHEMA_REPLICATION_FACTOR() != null) {
int schemaReplicationFactor = Integer.parseInt(attribute.INTEGER_LITERAL().getText());
databaseSchemaStatement.setSchemaReplicationFactor(schemaReplicationFactor);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/Statement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/Statement.java
index 3962bae22b1..eca7ecbd704 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/Statement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/Statement.java
@@ -62,5 +62,5 @@ public abstract class Statement extends StatementNode {
return true;
}
- public abstract List<? extends PartialPath> getPaths();
+ public abstract List<PartialPath> getPaths();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FillComponent.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FillComponent.java
index 74d3567e49c..832dbd7b881 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FillComponent.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FillComponent.java
@@ -28,7 +28,9 @@ public class FillComponent extends StatementNode {
private FillPolicy fillPolicy;
private Literal fillValue;
- public FillComponent() {}
+ public FillComponent() {
+ // do nothing
+ }
public FillPolicy getFillPolicy() {
return fillPolicy;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FromComponent.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FromComponent.java
index 1bfd1b4df26..8324188a6ad 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FromComponent.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FromComponent.java
@@ -30,7 +30,9 @@ public class FromComponent extends StatementNode {
private final List<PartialPath> prefixPaths = new ArrayList<>();
- public FromComponent() {}
+ public FromComponent() {
+ // do nothing
+ }
public void addPrefixPath(PartialPath prefixPath) {
prefixPaths.add(prefixPath);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByComponent.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByComponent.java
index fa7c7c241c3..2b3c96a9136 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByComponent.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByComponent.java
@@ -25,13 +25,13 @@ import org.apache.iotdb.db.mpp.plan.statement.StatementNode;
public abstract class GroupByComponent extends StatementNode {
- protected Expression ControlColumnExpression;
+ protected Expression controlColumnExpression;
private boolean ignoringNull;
private final WindowType windowType;
- public GroupByComponent(WindowType windowType) {
+ protected GroupByComponent(WindowType windowType) {
this.windowType = windowType;
}
@@ -40,11 +40,11 @@ public abstract class GroupByComponent extends StatementNode {
}
public void setControlColumnExpression(Expression controlColumnExpression) {
- ControlColumnExpression = controlColumnExpression;
+ this.controlColumnExpression = controlColumnExpression;
}
public Expression getControlColumnExpression() {
- return ControlColumnExpression;
+ return controlColumnExpression;
}
public void setIgnoringNull(boolean ignoringNull) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByTimeComponent.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByTimeComponent.java
index fc5d8a5fdc9..40ba99f79d6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByTimeComponent.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/GroupByTimeComponent.java
@@ -41,7 +41,9 @@ public class GroupByTimeComponent extends StatementNode {
// if it is left close and right open interval
private boolean leftCRightO = true;
- public GroupByTimeComponent() {}
+ public GroupByTimeComponent() {
+ // do nothing
+ }
public boolean isLeftCRightO() {
return leftCRightO;
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 02b2c344c8c..ab1d0b4a428 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
@@ -31,17 +31,17 @@ import static org.apache.iotdb.db.mpp.plan.analyze.SelectIntoUtils.checkIsAllRaw
/** This class maintains information of {@code INTO} clause. */
public class IntoComponent extends StatementNode {
- public static String PLACEHOLDER_MISMATCH_ERROR_MSG =
+ public static final String PLACEHOLDER_MISMATCH_ERROR_MSG =
"select into: the correspondence between the placeholder and the raw time series could not be established.";
- public static String FORBID_PLACEHOLDER_ERROR_MSG =
+ public static final String FORBID_PLACEHOLDER_ERROR_MSG =
"select into: placeholders can only be used in raw time series data queries.";
- public static String DEVICE_NUM_MISMATCH_ERROR_MSG =
+ public static final String DEVICE_NUM_MISMATCH_ERROR_MSG =
"select into: the number of source devices and the number of target devices should be the same.";
- public static String PATH_NUM_MISMATCH_ERROR_MSG =
+ public static final String PATH_NUM_MISMATCH_ERROR_MSG =
"select into: the number of source columns and the number of target paths should be the same.";
- public static String DUPLICATE_TARGET_PATH_ERROR_MSG =
+ public static final String DUPLICATE_TARGET_PATH_ERROR_MSG =
"select into: target paths in into clause should be different.";
- public static String DEVICE_ALIGNMENT_INCONSISTENT_ERROR_MSG =
+ public static final String DEVICE_ALIGNMENT_INCONSISTENT_ERROR_MSG =
"select into: alignment property must be the same for the same device.";
private final List<IntoItem> intoItems;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByComponent.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByComponent.java
index cd5b4a59cb9..193b6cee205 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByComponent.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByComponent.java
@@ -62,6 +62,9 @@ public class OrderByComponent extends StatementNode {
orderByDevice = true;
deviceOrderPriority = sortItemList.size() - 1;
break;
+ default:
+ throw new IllegalArgumentException(
+ String.format("Unknown sort key %s", sortItem.getSortKey()));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByKey.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByKey.java
index 4c1e3ae5b8c..4cccb49d319 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByKey.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/OrderByKey.java
@@ -27,4 +27,8 @@ public class OrderByKey {
public static final String DATANODEID = "DATANODEID";
public static final String ELAPSEDTIME = "ELAPSEDTIME";
public static final String STATEMENT = "STATEMENT";
+
+ private OrderByKey() {
+ // forbidding instantiation
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/DeleteDataStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/DeleteDataStatement.java
index 9e7dfb4b663..1be1fee5c0b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/DeleteDataStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/DeleteDataStatement.java
@@ -40,7 +40,7 @@ public class DeleteDataStatement extends Statement {
@Override
public List<? extends PartialPath> getPaths() {
- return pathList;
+ return getPathList();
}
public List<PartialPath> getPathList() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertBaseStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertBaseStatement.java
index 181a072bedb..a189087f3b4 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertBaseStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertBaseStatement.java
@@ -25,6 +25,7 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException;
import org.apache.iotdb.db.exception.metadata.DuplicateInsertException;
import org.apache.iotdb.db.exception.metadata.PathNotExistException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -293,22 +294,22 @@ public abstract class InsertBaseStatement extends Statement {
Map<PartialPath, List<Pair<String, Integer>>> mapFromDeviceToMeasurementAndIndex =
new HashMap<>();
for (int i = 0; i < this.measurements.length; i++) {
- PartialPath devicePath;
+ PartialPath targetDevicePath;
String measurementName;
if (isLogicalView[i]) {
int viewIndex = indexMapToLogicalViewList[i];
- devicePath =
+ targetDevicePath =
this.logicalViewSchemaList.get(viewIndex).getSourcePathIfWritable().getDevicePath();
measurementName =
this.logicalViewSchemaList.get(viewIndex).getSourcePathIfWritable().getMeasurement();
} else {
- devicePath = this.devicePath;
+ targetDevicePath = this.devicePath;
measurementName = this.measurements[i];
}
int index = i;
final String finalMeasurementName = measurementName;
mapFromDeviceToMeasurementAndIndex.compute(
- devicePath,
+ targetDevicePath,
(k, v) -> {
if (v == null) {
List<Pair<String, Integer>> valueList = new ArrayList<>();
@@ -340,7 +341,7 @@ public abstract class InsertBaseStatement extends Statement {
boolean measurementNotExists = measurementSet.add(thisPair.left);
if (!measurementNotExists) {
PartialPath devicePath = entry.getKey();
- throw new RuntimeException(
+ throw new SemanticException(
new DuplicateInsertException(devicePath.getFullPath(), thisPair.left));
}
}
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 3d9b4f2bb14..d7c7cebad25 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
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.mpp.plan.statement.crud;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.metadata.DuplicateInsertException;
+import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation;
import org.apache.iotdb.db.mpp.plan.statement.StatementType;
import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
@@ -167,7 +168,7 @@ public class InsertMultiTabletsStatement extends InsertBaseStatement {
for (String measurement : insertTablet.measurements) {
boolean notExist = measurementSet.add(measurement);
if (!notExist) {
- throw new RuntimeException(new DuplicateInsertException(device, measurement));
+ throw new SemanticException(new DuplicateInsertException(device, measurement));
}
}
mapFromDeviceToMeasurements.put(device, measurementSet);
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 902ca3d9ac3..f51be4bddde 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
@@ -256,10 +256,7 @@ public class InsertRowStatement extends InsertBaseStatement implements ISchemaVa
}
public boolean isNeedSplit() {
- if (this.indexOfSourcePathsOfLogicalViews == null) {
- return false;
- }
- return !this.indexOfSourcePathsOfLogicalViews.isEmpty();
+ return hasLogicalViewNeedProcess();
}
public List<InsertRowStatement> getSplitList() {
@@ -278,13 +275,13 @@ public class InsertRowStatement extends InsertBaseStatement implements ISchemaVa
statement.setNeedInferType(this.isNeedInferType);
statement.setDevicePath(entry.getKey());
statement.setAligned(this.isAligned);
- Object[] values = new Object[pairList.size()];
+ Object[] copiedValues = new Object[pairList.size()];
String[] measurements = new String[pairList.size()];
MeasurementSchema[] measurementSchemas = new MeasurementSchema[pairList.size()];
TSDataType[] dataTypes = new TSDataType[pairList.size()];
for (int i = 0; i < pairList.size(); i++) {
int realIndex = pairList.get(i).right;
- values[i] = this.values[realIndex];
+ copiedValues[i] = this.values[realIndex];
measurements[i] = pairList.get(i).left;
measurementSchemas[i] = this.measurementSchemas[realIndex];
dataTypes[i] = this.dataTypes[realIndex];
@@ -292,7 +289,7 @@ public class InsertRowStatement extends InsertBaseStatement implements ISchemaVa
statement.setAligned(this.measurementIsAligned[realIndex]);
}
}
- statement.setValues(values);
+ statement.setValues(copiedValues);
statement.setMeasurements(measurements);
statement.setMeasurementSchemas(measurementSchemas);
statement.setDataTypes(dataTypes);
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 f639c95455e..50d31b2c43a 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
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.mpp.plan.statement.crud;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.metadata.DuplicateInsertException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation;
import org.apache.iotdb.db.mpp.plan.statement.StatementType;
import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
@@ -178,7 +179,7 @@ public class InsertRowsStatement extends InsertBaseStatement {
for (String measurement : insertRow.measurements) {
boolean notExist = measurementSet.add(measurement);
if (!notExist) {
- throw new RuntimeException(new DuplicateInsertException(device, measurement));
+ throw new SemanticException(new DuplicateInsertException(device, measurement));
}
}
mapFromDeviceToMeasurements.put(device, measurementSet);
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 8223b3e8641..c9919cf2783 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
@@ -199,10 +199,7 @@ public class InsertTabletStatement extends InsertBaseStatement implements ISchem
}
public boolean isNeedSplit() {
- if (this.indexOfSourcePathsOfLogicalViews == null) {
- return false;
- }
- return !this.indexOfSourcePathsOfLogicalViews.isEmpty();
+ return hasLogicalViewNeedProcess();
}
public List<InsertTabletStatement> getSplitList() {
@@ -221,30 +218,30 @@ public class InsertTabletStatement extends InsertBaseStatement implements ISchem
statement.setDevicePath(entry.getKey());
statement.setRowCount(this.rowCount);
statement.setAligned(this.isAligned);
- Object[] columns = new Object[pairList.size()];
+ Object[] copiedColumns = new Object[pairList.size()];
String[] measurements = new String[pairList.size()];
- BitMap[] bitMaps = new BitMap[pairList.size()];
+ BitMap[] copiedBitMaps = new BitMap[pairList.size()];
MeasurementSchema[] measurementSchemas = new MeasurementSchema[pairList.size()];
TSDataType[] dataTypes = new TSDataType[pairList.size()];
for (int i = 0; i < pairList.size(); i++) {
int realIndex = pairList.get(i).right;
- columns[i] = this.columns[realIndex];
+ copiedColumns[i] = this.columns[realIndex];
measurements[i] = pairList.get(i).left;
measurementSchemas[i] = this.measurementSchemas[realIndex];
dataTypes[i] = this.dataTypes[realIndex];
if (this.bitMaps != null) {
- bitMaps[i] = this.bitMaps[realIndex];
+ copiedBitMaps[i] = this.bitMaps[realIndex];
}
if (this.measurementIsAligned != null) {
statement.setAligned(this.measurementIsAligned[realIndex]);
}
}
- statement.setColumns(columns);
+ statement.setColumns(copiedColumns);
statement.setMeasurements(measurements);
statement.setMeasurementSchemas(measurementSchemas);
statement.setDataTypes(dataTypes);
if (this.bitMaps != null) {
- statement.setBitMaps(bitMaps);
+ statement.setBitMaps(copiedBitMaps);
}
statement.setFailedMeasurementIndex2Info(failedMeasurementIndex2Info);
insertTabletStatementList.add(statement);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java
index 2f22bff1549..93a9732c776 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java
@@ -469,6 +469,9 @@ public class QueryStatement extends Statement {
return useWildcard;
}
+ private static final String RAW_AGGREGATION_HYBRID_QUERY_ERROR_MSG =
+ "Raw data and aggregation hybrid query is not supported.";
+
public void semanticCheck() {
if (isAggregationQuery()) {
if (disableAlign()) {
@@ -486,7 +489,7 @@ public class QueryStatement extends Statement {
Set<String> outputColumn = new HashSet<>();
for (ResultColumn resultColumn : selectComponent.getResultColumns()) {
if (resultColumn.getColumnType() != ResultColumn.ColumnType.AGGREGATION) {
- throw new SemanticException("Raw data and aggregation hybrid query is not supported.");
+ throw new SemanticException(RAW_AGGREGATION_HYBRID_QUERY_ERROR_MSG);
}
outputColumn.add(
resultColumn.getAlias() != null
@@ -495,7 +498,7 @@ public class QueryStatement extends Statement {
}
for (Expression expression : getExpressionSortItemList()) {
if (!hasAggregationFunction(expression)) {
- throw new SemanticException("Raw data and aggregation hybrid query is not supported.");
+ throw new SemanticException(RAW_AGGREGATION_HYBRID_QUERY_ERROR_MSG);
}
}
if (isGroupByTag()) {
@@ -527,7 +530,7 @@ public class QueryStatement extends Statement {
}
for (Expression expression : getExpressionSortItemList()) {
if (hasAggregationFunction(expression)) {
- throw new SemanticException("Raw data and aggregation hybrid query is not supported.");
+ throw new SemanticException(RAW_AGGREGATION_HYBRID_QUERY_ERROR_MSG);
}
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/LongLiteral.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/LongLiteral.java
index 182a075a204..8f1f7ed9471 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/LongLiteral.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/LongLiteral.java
@@ -83,17 +83,17 @@ public class LongLiteral extends Literal {
@Override
public long getLong() {
- return value;
+ return getValue();
}
@Override
public float getFloat() {
- return value;
+ return getValue();
}
@Override
public double getDouble() {
- return value;
+ return getValue();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/NullLiteral.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/NullLiteral.java
index ce2d4e05643..4ba15cbdef7 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/NullLiteral.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/literal/NullLiteral.java
@@ -59,10 +59,7 @@ public class NullLiteral extends Literal {
if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- return true;
+ return o != null && getClass() == o.getClass();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
index 97d40e9fd26..bf4b4cc780c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
@@ -140,7 +140,6 @@ public class CreateContinuousQueryStatement extends Statement implements IConfig
sqlBuilder.append("RESAMPLE\n");
sqlBuilder.append('\t').append("EVERY ").append(everyInterval).append("ms\n");
sqlBuilder.append('\t').append("BOUNDARY ").append(boundaryTime).append("\n");
- ;
sqlBuilder.append('\t').append("RANGE ").append(startTimeOffset).append("ms");
if (endTimeOffset != 0) {
sqlBuilder.append(", ").append(endTimeOffset).append("ms\n");
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java
index 930c2956be9..8a08e735e7a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/DatabaseSchemaStatement.java
@@ -34,7 +34,7 @@ public class DatabaseSchemaStatement extends Statement implements IConfigStateme
private final DatabaseSchemaStatementType subType;
private PartialPath databasePath;
- private Long TTL = null;
+ private Long ttl = null;
private Integer schemaReplicationFactor = null;
private Integer dataReplicationFactor = null;
private Long timePartitionInterval = null;
@@ -59,12 +59,12 @@ public class DatabaseSchemaStatement extends Statement implements IConfigStateme
this.databasePath = databasePath;
}
- public Long getTTL() {
- return TTL;
+ public Long getTtl() {
+ return ttl;
}
- public void setTTL(Long TTL) {
- this.TTL = TTL;
+ public void setTtl(Long ttl) {
+ this.ttl = ttl;
}
public Integer getSchemaReplicationFactor() {
@@ -134,7 +134,7 @@ public class DatabaseSchemaStatement extends Statement implements IConfigStateme
+ "storageGroupPath="
+ databasePath
+ ", ttl="
- + TTL
+ + ttl
+ ", schemaReplicationFactor="
+ schemaReplicationFactor
+ ", dataReplicationFactor="
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/MigrateRegionStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/MigrateRegionStatement.java
index c993747ddf6..c85f11a9b90 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/MigrateRegionStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/MigrateRegionStatement.java
@@ -38,29 +38,29 @@ import java.util.List;
// TODO: Whether to support more complex migration, such as, migrate all region from 1, 2 to 5, 6
public class MigrateRegionStatement extends Statement implements IConfigStatement {
- private final int RegionId;
+ private final int regionId;
- private final int FromId;
+ private final int fromId;
- private final int ToId;
+ private final int toId;
- public MigrateRegionStatement(int RegionId, int FromId, int ToId) {
+ public MigrateRegionStatement(int regionId, int fromId, int toId) {
super();
- this.RegionId = RegionId;
- this.FromId = FromId;
- this.ToId = ToId;
+ this.regionId = regionId;
+ this.fromId = fromId;
+ this.toId = toId;
}
public int getRegionId() {
- return RegionId;
+ return regionId;
}
public int getFromId() {
- return FromId;
+ return fromId;
}
public int getToId() {
- return ToId;
+ return toId;
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/CreateModelStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/CreateModelStatement.java
index 47372902aa5..888cf38cdec 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/CreateModelStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/CreateModelStatement.java
@@ -39,7 +39,9 @@ public class CreateModelStatement extends Statement implements IConfigStatement
private Map<String, String> attributes;
private QueryStatement queryStatement;
- public CreateModelStatement() {}
+ public CreateModelStatement() {
+ // do nothing
+ }
public String getModelId() {
return modelId;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/ShowModelsStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/ShowModelsStatement.java
index 88f075889ca..0cb1c44ed80 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/ShowModelsStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/model/ShowModelsStatement.java
@@ -30,7 +30,9 @@ import java.util.List;
public class ShowModelsStatement extends Statement implements IConfigStatement {
- public ShowModelsStatement() {}
+ public ShowModelsStatement() {
+ // do nothing
+ }
@Override
public List<? extends PartialPath> getPaths() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/AlterSchemaTemplateStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/AlterSchemaTemplateStatement.java
index 9a501ee621e..d436398d203 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/AlterSchemaTemplateStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/AlterSchemaTemplateStatement.java
@@ -32,6 +32,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+import java.util.Collections;
import java.util.List;
public class AlterSchemaTemplateStatement extends Statement implements IConfigStatement {
@@ -75,7 +76,7 @@ public class AlterSchemaTemplateStatement extends Statement implements IConfigSt
@Override
public List<? extends PartialPath> getPaths() {
- return null;
+ return Collections.emptyList();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/BatchActivateTemplateStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/BatchActivateTemplateStatement.java
index 08dd879eec6..6f8fa7374a5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/BatchActivateTemplateStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/BatchActivateTemplateStatement.java
@@ -38,7 +38,7 @@ public class BatchActivateTemplateStatement extends Statement {
@Override
public List<? extends PartialPath> getPaths() {
- return devicePathList;
+ return getDevicePathList();
}
public List<PartialPath> getDevicePathList() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/CreateSchemaTemplateStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/CreateSchemaTemplateStatement.java
index a5c2ed3ef3e..9c3dee54d66 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/CreateSchemaTemplateStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/CreateSchemaTemplateStatement.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,9 +42,6 @@ public class CreateSchemaTemplateStatement extends Statement implements IConfigS
List<CompressionType> compressors;
boolean isAligned;
- // constant to help resolve serialized sequence
- private static final int NEW_PLAN = -1;
-
public CreateSchemaTemplateStatement() {
super();
statementType = StatementType.CREATE_TEMPLATE;
@@ -75,7 +73,7 @@ public class CreateSchemaTemplateStatement extends Statement implements IConfigS
@Override
public List<? extends PartialPath> getPaths() {
- return null;
+ return Collections.emptyList();
}
public String getName() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/DeactivateTemplateStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/DeactivateTemplateStatement.java
index 11b124b9df5..380897d69f9 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/DeactivateTemplateStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/template/DeactivateTemplateStatement.java
@@ -49,7 +49,7 @@ public class DeactivateTemplateStatement extends Statement implements IConfigSta
@Override
public List<? extends PartialPath> getPaths() {
- return pathPatternList;
+ return getPathPatternList();
}
public String getTemplateName() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/view/CreateLogicalViewStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/view/CreateLogicalViewStatement.java
index bd6a20d96ae..1e7ea51fee3 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/view/CreateLogicalViewStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/view/CreateLogicalViewStatement.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.mpp.plan.statement.metadata.view;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException;
+import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.metadata.view.ViewPathType;
import org.apache.iotdb.db.metadata.view.ViewPaths;
import org.apache.iotdb.db.mpp.plan.analyze.SelectIntoUtils;
@@ -130,7 +131,7 @@ public class CreateLogicalViewStatement extends Statement {
// check expressions, make sure no aggregation function expression
Pair<Boolean, UnsupportedViewException> checkResult =
ViewPaths.checkExpressionList(expressionList);
- if (checkResult.left) {
+ if (Boolean.TRUE.equals(checkResult.left)) {
this.sourcePaths.setExpressionsList(expressionList);
} else {
throw checkResult.right;
@@ -180,7 +181,7 @@ public class CreateLogicalViewStatement extends Statement {
targetPathsList.add(
SelectIntoUtils.constructTargetPath(sourcePath, deviceTemplate, measurementTemplate));
} else {
- throw new RuntimeException(
+ throw new SemanticException(
new UnsupportedViewException(
"Cannot create views using data sources with calculated expressions while using into item."));
}
@@ -232,9 +233,9 @@ public class CreateLogicalViewStatement extends Statement {
*/
public Pair<Boolean, String> checkAllPaths() {
Pair<Boolean, String> result = this.checkTargetPaths();
- if (result.left == false) return result;
+ if (Boolean.FALSE.equals(result.left)) return result;
result = this.checkSourcePathsIfNotUsingQueryStatement();
- if (result.left == false) return result;
+ if (Boolean.FALSE.equals(result.left)) return result;
return new Pair<>(true, null);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowQueriesStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowQueriesStatement.java
index ce8ad3a9de7..79b1e612cff 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowQueriesStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowQueriesStatement.java
@@ -42,7 +42,9 @@ public class ShowQueriesStatement extends ShowStatement {
private ZoneId zoneId;
- public ShowQueriesStatement() {}
+ public ShowQueriesStatement() {
+ // do nothing
+ }
@Override
public boolean isQuery() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowVersionStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowVersionStatement.java
index 2e4ee20cfb5..4a081705449 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowVersionStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/ShowVersionStatement.java
@@ -24,7 +24,9 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStatement;
public class ShowVersionStatement extends ShowStatement {
- public ShowVersionStatement() {}
+ public ShowVersionStatement() {
+ // do nothing
+ }
@Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/quota/ShowSpaceQuotaStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/quota/ShowSpaceQuotaStatement.java
index 35669ec7e80..d95e57bf787 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/quota/ShowSpaceQuotaStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/sys/quota/ShowSpaceQuotaStatement.java
@@ -52,7 +52,7 @@ public class ShowSpaceQuotaStatement extends Statement implements IConfigStateme
@Override
public List<PartialPath> getPaths() {
- return databases;
+ return getDatabases();
}
@Override