You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 14:55:17 UTC
[iotdb] branch master updated: Join declaration assignments (#2099)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 9bced7b Join declaration assignments (#2099)
9bced7b is described below
commit 9bced7b65726cd3ffcefef7529bfd85f9c1c42f8
Author: Benedict Jin <as...@apache.org>
AuthorDate: Sun Nov 22 22:54:59 2020 +0800
Join declaration assignments (#2099)
---
.../java/org/apache/iotdb/cli/AbstractCli.java | 3 +-
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 7 +-
cli/src/main/java/org/apache/iotdb/cli/WinCli.java | 7 +-
.../main/java/org/apache/iotdb/SessionExample.java | 11 +-
.../apache/iotdb/flink/util/TsFileWriteUtil.java | 384 ++++++++++-----------
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 3 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 3 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 3 +-
.../db/engine/storagegroup/TsFileProcessor.java | 12 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 3 +-
.../iotdb/db/qp/logical/crud/InOperator.java | 3 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 3 +-
.../db/query/control/QueryResourceManager.java | 3 +-
.../io/LocalTextModificationAccessorTest.java | 5 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 3 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 3 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 3 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 8 +-
.../iotdb/db/monitor/collector/FileSizeTest.java | 6 +-
.../db/sync/sender/manage/SyncFileManagerTest.java | 14 +-
.../spark/tsfile/qp/common/BasicOperator.java | 3 +-
.../file/metadata/MetadataIndexConstructor.java | 3 +-
.../org/apache/iotdb/tsfile/utils/BytesUtils.java | 3 +-
.../iotdb/tsfile/utils/RamUsageEstimator.java | 9 +-
.../v1/file/metadata/statistics/StatisticsV1.java | 39 +--
.../read/query/timegenerator/ReadWriteTest.java | 3 +-
.../iotdb/tsfile/utils/ReadWriteIOUtilsTest.java | 6 +-
...SameMeasurementsWithDifferentDataTypesTest.java | 9 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 5 +-
30 files changed, 262 insertions(+), 308 deletions(-)
diff --git a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
index e413f53..b2970d7 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
@@ -656,8 +656,7 @@ public abstract class AbstractCli {
} else {
while (j < maxPrintRowCount && !isReachEnd) {
for (int i = 1; i <= columnCount; i++) {
- String tmp;
- tmp = resultSet.getString(i);
+ String tmp = resultSet.getString(i);
if (tmp == null) {
tmp = NULL;
}
diff --git a/cli/src/main/java/org/apache/iotdb/cli/Cli.java b/cli/src/main/java/org/apache/iotdb/cli/Cli.java
index dbeae4b..4227092 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/Cli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/Cli.java
@@ -53,9 +53,6 @@ public class Cli extends AbstractCli {
hf.setWidth(MAX_HELP_CONSOLE_WIDTH);
commandLine = null;
- String[] newArgs;
- String[] newArgs2;
-
if (args == null || args.length == 0) {
println(
"Require more params input, eg. ./start-cli.sh(start-cli.bat if Windows) "
@@ -65,8 +62,8 @@ public class Cli extends AbstractCli {
return;
}
init();
- newArgs = removePasswordArgs(args);
- newArgs2 = processExecuteArgs(newArgs);
+ String[] newArgs = removePasswordArgs(args);
+ String[] newArgs2 = processExecuteArgs(newArgs);
boolean continues = parseCommandLine(options, newArgs2, hf);
if (!continues) {
return;
diff --git a/cli/src/main/java/org/apache/iotdb/cli/WinCli.java b/cli/src/main/java/org/apache/iotdb/cli/WinCli.java
index 4cd27d7..02a5d0b 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/WinCli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/WinCli.java
@@ -52,9 +52,6 @@ public class WinCli extends AbstractCli {
hf.setWidth(MAX_HELP_CONSOLE_WIDTH);
commandLine = null;
- String[] newArgs;
- String[] newArgs2;
-
if (args == null || args.length == 0) {
println("Require more params input, please check the following hint.");
hf.printHelp(IOTDB_CLI_PREFIX, options, true);
@@ -62,8 +59,8 @@ public class WinCli extends AbstractCli {
}
init();
- newArgs = removePasswordArgs(args);
- newArgs2 = processExecuteArgs(newArgs);
+ String[] newArgs = removePasswordArgs(args);
+ String[] newArgs2 = processExecuteArgs(newArgs);
boolean continues = parseCommandLine(options, newArgs2, hf);
if (!continues) {
return;
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index dc68fe2..02fdb2d 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -404,8 +404,7 @@ public class SessionExample {
}
private static void query() throws IoTDBConnectionException, StatementExecutionException {
- SessionDataSet dataSet;
- dataSet = session.executeQueryStatement("select * from root.sg1.d1");
+ SessionDataSet dataSet = session.executeQueryStatement("select * from root.sg1.d1");
System.out.println(dataSet.getColumnNames());
dataSet.setFetchSize(1024); // default is 10000
while (dataSet.hasNext()) {
@@ -423,8 +422,7 @@ public class SessionExample {
long startTime = 10L;
long endTime = 200L;
- SessionDataSet dataSet;
- dataSet = session.executeRawDataQuery(paths, startTime, endTime);
+ SessionDataSet dataSet = session.executeRawDataQuery(paths, startTime, endTime);
System.out.println(dataSet.getColumnNames());
dataSet.setFetchSize(1024);
while (dataSet.hasNext()) {
@@ -435,8 +433,7 @@ public class SessionExample {
private static void queryByIterator()
throws IoTDBConnectionException, StatementExecutionException {
- SessionDataSet dataSet;
- dataSet = session.executeQueryStatement("select * from root.sg1.d1");
+ SessionDataSet dataSet = session.executeQueryStatement("select * from root.sg1.d1");
DataIterator iterator = dataSet.iterator();
System.out.println(dataSet.getColumnNames());
dataSet.setFetchSize(1024); // default is 10000
@@ -481,4 +478,4 @@ public class SessionExample {
private static void nonQuery() throws IoTDBConnectionException, StatementExecutionException {
session.executeNonQueryStatement("insert into root.sg1.d1(timestamp,s1) values(200, 1);");
}
-}
\ No newline at end of file
+}
diff --git a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
index 7c3b8e8..e475f7d 100644
--- a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
+++ b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
@@ -35,196 +35,194 @@ import org.apache.iotdb.tsfile.write.schema.Schema;
*/
public class TsFileWriteUtil {
- public static final String TMP_DIR = "target";
- public static final String DEFAULT_TEMPLATE = "template";
-
- public static void create1(String tsfilePath) throws Exception {
- File f = new File(tsfilePath);
- if (f.exists()) {
- f.delete();
- }
- Schema schema = new Schema();
- schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
- schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
- schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
-
- TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
-
- // construct TSRecord
- TSRecord tsRecord = new TSRecord(1, "device_1");
- DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- DataPoint dPoint2 = new IntDataPoint("sensor_2", 20);
- DataPoint dPoint3;
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
-
- // write a TSRecord to TsFile
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(2, "device_1");
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 50);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(3, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 1.4f);
- dPoint2 = new IntDataPoint("sensor_2", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(4, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 51);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(6, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 7.2f);
- dPoint2 = new IntDataPoint("sensor_2", 10);
- dPoint3 = new IntDataPoint("sensor_3", 11);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(7, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 6.2f);
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(8, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 9.2f);
- dPoint2 = new IntDataPoint("sensor_2", 30);
- dPoint3 = new IntDataPoint("sensor_3", 31);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(1, "device_2");
- dPoint1 = new FloatDataPoint("sensor_1", 2.3f);
- dPoint2 = new IntDataPoint("sensor_2", 11);
- dPoint3 = new IntDataPoint("sensor_3", 19);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(2, "device_2");
- dPoint1 = new FloatDataPoint("sensor_1", 25.4f);
- dPoint2 = new IntDataPoint("sensor_2", 10);
- dPoint3 = new IntDataPoint("sensor_3", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- // close TsFile
- tsFileWriter.close();
- }
-
- public static void create2(String tsfilePath) throws Exception {
- File f = new File(tsfilePath);
- if (f.exists()) {
- f.delete();
- }
- Schema schema = new Schema();
- schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
- schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
- schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
-
- TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
-
- // construct TSRecord
- TSRecord tsRecord = new TSRecord(9, "device_1");
- DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- DataPoint dPoint2 = new IntDataPoint("sensor_2", 20);
- DataPoint dPoint3;
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
-
- // write a TSRecord to TsFile
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(10, "device_1");
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 50);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(11, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 1.4f);
- dPoint2 = new IntDataPoint("sensor_2", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(12, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 51);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(14, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 7.2f);
- dPoint2 = new IntDataPoint("sensor_2", 10);
- dPoint3 = new IntDataPoint("sensor_3", 11);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(15, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 6.2f);
- dPoint2 = new IntDataPoint("sensor_2", 20);
- dPoint3 = new IntDataPoint("sensor_3", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(16, "device_1");
- dPoint1 = new FloatDataPoint("sensor_1", 9.2f);
- dPoint2 = new IntDataPoint("sensor_2", 30);
- dPoint3 = new IntDataPoint("sensor_3", 31);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(9, "device_2");
- dPoint1 = new FloatDataPoint("sensor_1", 2.3f);
- dPoint2 = new IntDataPoint("sensor_2", 11);
- dPoint3 = new IntDataPoint("sensor_3", 19);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- tsRecord = new TSRecord(10, "device_2");
- dPoint1 = new FloatDataPoint("sensor_1", 25.4f);
- dPoint2 = new IntDataPoint("sensor_2", 10);
- dPoint3 = new IntDataPoint("sensor_3", 21);
- tsRecord.addTuple(dPoint1);
- tsRecord.addTuple(dPoint2);
- tsRecord.addTuple(dPoint3);
- tsFileWriter.write(tsRecord);
-
- // close TsFile
- tsFileWriter.close();
- }
-}
\ No newline at end of file
+ public static final String TMP_DIR = "target";
+ public static final String DEFAULT_TEMPLATE = "template";
+
+ public static void create1(String tsfilePath) throws Exception {
+ File f = new File(tsfilePath);
+ if (f.exists()) {
+ f.delete();
+ }
+ Schema schema = new Schema();
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+
+ TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
+
+ // construct TSRecord
+ TSRecord tsRecord = new TSRecord(1, "device_1");
+ DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
+ DataPoint dPoint2 = new IntDataPoint("sensor_2", 20);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+
+ // write a TSRecord to TsFile
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(2, "device_1");
+ dPoint2 = new IntDataPoint("sensor_2", 20);
+ DataPoint dPoint3 = new IntDataPoint("sensor_3", 50);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(3, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 1.4f);
+ dPoint2 = new IntDataPoint("sensor_2", 21);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(4, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 20);
+ dPoint3 = new IntDataPoint("sensor_3", 51);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(6, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 7.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 10);
+ dPoint3 = new IntDataPoint("sensor_3", 11);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(7, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 6.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 20);
+ dPoint3 = new IntDataPoint("sensor_3", 21);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(8, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 9.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 30);
+ dPoint3 = new IntDataPoint("sensor_3", 31);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(1, "device_2");
+ dPoint1 = new FloatDataPoint("sensor_1", 2.3f);
+ dPoint2 = new IntDataPoint("sensor_2", 11);
+ dPoint3 = new IntDataPoint("sensor_3", 19);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(2, "device_2");
+ dPoint1 = new FloatDataPoint("sensor_1", 25.4f);
+ dPoint2 = new IntDataPoint("sensor_2", 10);
+ dPoint3 = new IntDataPoint("sensor_3", 21);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ // close TsFile
+ tsFileWriter.close();
+ }
+
+ public static void create2(String tsfilePath) throws Exception {
+ File f = new File(tsfilePath);
+ if (f.exists()) {
+ f.delete();
+ }
+ Schema schema = new Schema();
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ schema.extendTemplate(DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+
+ TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
+
+ // construct TSRecord
+ TSRecord tsRecord = new TSRecord(9, "device_1");
+ DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
+ DataPoint dPoint2 = new IntDataPoint("sensor_2", 20);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+
+ // write a TSRecord to TsFile
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(10, "device_1");
+ dPoint2 = new IntDataPoint("sensor_2", 20);
+ DataPoint dPoint3 = new IntDataPoint("sensor_3", 50);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(11, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 1.4f);
+ dPoint2 = new IntDataPoint("sensor_2", 21);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(12, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 20);
+ dPoint3 = new IntDataPoint("sensor_3", 51);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(14, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 7.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 10);
+ dPoint3 = new IntDataPoint("sensor_3", 11);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(15, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 6.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 20);
+ dPoint3 = new IntDataPoint("sensor_3", 21);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(16, "device_1");
+ dPoint1 = new FloatDataPoint("sensor_1", 9.2f);
+ dPoint2 = new IntDataPoint("sensor_2", 30);
+ dPoint3 = new IntDataPoint("sensor_3", 31);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(9, "device_2");
+ dPoint1 = new FloatDataPoint("sensor_1", 2.3f);
+ dPoint2 = new IntDataPoint("sensor_2", 11);
+ dPoint3 = new IntDataPoint("sensor_3", 19);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ tsRecord = new TSRecord(10, "device_2");
+ dPoint1 = new FloatDataPoint("sensor_1", 25.4f);
+ dPoint2 = new IntDataPoint("sensor_2", 10);
+ dPoint3 = new IntDataPoint("sensor_3", 21);
+ tsRecord.addTuple(dPoint1);
+ tsRecord.addTuple(dPoint2);
+ tsRecord.addTuple(dPoint3);
+ tsFileWriter.write(tsRecord);
+
+ // close TsFile
+ tsFileWriter.close();
+ }
+}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
index 9408905..519d971 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
@@ -1017,8 +1017,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData {
private String getMetadataInJsonFunc() throws TException, IoTDBSQLException {
TSFetchMetadataReq req = new TSFetchMetadataReq(sessionId, "METADATA_IN_JSON");
- TSFetchMetadataResp resp;
- resp = client.fetchMetadata(req);
+ TSFetchMetadataResp resp = client.fetchMetadata(req);
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (StatementExecutionException e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 20a13ba..fa5515d 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -321,8 +321,7 @@ public class StorageEngine implements IService {
try {
StorageGroupMNode storageGroupMNode = IoTDB.metaManager.getStorageGroupNodeByPath(path);
storageGroupPath = storageGroupMNode.getPartialPath();
- StorageGroupProcessor processor;
- processor = processorMap.get(storageGroupPath);
+ StorageGroupProcessor processor = processorMap.get(storageGroupPath);
if (processor == null) {
// if finish recover
if (isAllSgReady.get()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
index 5d47170..ae58cf7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
@@ -146,8 +146,7 @@ public class MergeMultiChunkTask {
private void mergePaths() throws IOException {
mergeLogger.logTSStart(currMergingPaths);
- IPointReader[] unseqReaders;
- unseqReaders = resource.getUnseqReaders(currMergingPaths);
+ IPointReader[] unseqReaders = resource.getUnseqReaders(currMergingPaths);
currTimeValuePairs = new TimeValuePair[currMergingPaths.size()];
for (int i = 0; i < currMergingPaths.size(); i++) {
if (unseqReaders[i].hasNextTimeValuePair()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index 1007948..35421d1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -258,7 +258,7 @@ public class TsFileProcessor {
long textDataIncrement = 0L;
long chunkMetadataIncrement = 0L;
String deviceId = insertRowPlan.getDeviceId().getFullPath();
- long unsealedResourceIncrement =
+ long unsealedResourceIncrement =
tsFileResource.estimateRamIncrement(deviceId);
for (int i = 0; i < insertRowPlan.getDataTypes().length; i++) {
// skip failed Measurements
@@ -522,8 +522,8 @@ public class TsFileProcessor {
// we have to add the memtable into flushingList first and then set the shouldClose tag.
// see https://issues.apache.org/jira/browse/IOTDB-510
- IMemTable tmpMemTable = workMemTable == null || workMemTable.memSize() == 0
- ? new NotifyFlushMemTable()
+ IMemTable tmpMemTable = workMemTable == null || workMemTable.memSize() == 0
+ ? new NotifyFlushMemTable()
: workMemTable;
try {
@@ -710,15 +710,13 @@ public class TsFileProcessor {
*/
@SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
public void flushOneMemTable() {
- IMemTable memTableToFlush;
- memTableToFlush = flushingMemTables.getFirst();
+ IMemTable memTableToFlush = flushingMemTables.getFirst();
// signal memtable only may appear when calling asyncClose()
if (!memTableToFlush.isSignalMemTable()) {
try {
- MemTableFlushTask flushTask;
writer.mark();
- flushTask = new MemTableFlushTask(memTableToFlush, writer, storageGroupName);
+ MemTableFlushTask flushTask = new MemTableFlushTask(memTableToFlush, writer, storageGroupName);
flushTask.syncFlushMemTable();
} catch (Exception e) {
logger.error("{}: {} meet error when flushing a memtable, change system mode to read-only",
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 5e6a2bc..01cd295 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -1146,8 +1146,7 @@ public class MTree implements Serializable {
}
}
} else if (idx == length) {
- String nodeName;
- nodeName = node.getName();
+ String nodeName = node.getName();
res.add(parent + nodeName);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index ffcd877..3023027 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -771,8 +771,7 @@ public class PlanExecutor implements IPlanExecutor {
Set<PartialPath> registeredSeries = new HashSet<>();
for (ChunkGroupMetadata chunkGroupMetadata : chunkGroupMetadataList) {
String device = chunkGroupMetadata.getDevice();
- MNode node = null;
- node = IoTDB.metaManager
+ MNode node = IoTDB.metaManager
.getDeviceNodeWithAutoCreate(new PartialPath(device), true, sgLevel);
for (ChunkMetadata chunkMetadata : chunkGroupMetadata.getChunkMetadataList()) {
PartialPath series = new PartialPath(
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InOperator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InOperator.java
index 069cef8..0594f22 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InOperator.java
@@ -152,8 +152,7 @@ public class InOperator extends FunctionOperator {
@Override
public InOperator copy() {
- InOperator ret;
- ret = new InOperator(this.tokenIntType, new PartialPath(singlePath.getNodes().clone()), not, new HashSet<>(values));
+ InOperator ret = new InOperator(this.tokenIntType, new PartialPath(singlePath.getNodes().clone()), not, new HashSet<>(values));
ret.tokenSymbol = tokenSymbol;
ret.isLeaf = isLeaf;
ret.isSingle = isSingle;
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
index 3393655..7dd48d1 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
@@ -1656,8 +1656,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
* DataTimeFormat time. <p> eg. now() + 1d - 2h </p>
*/
private Long parseDateExpression(DateExpressionContext ctx) {
- long time;
- time = parseTimeFormat(ctx.getChild(0).getText());
+ long time = parseTimeFormat(ctx.getChild(0).getText());
for (int i = 1; i < ctx.getChildCount(); i = i + 2) {
if (ctx.getChild(i).getText().equals("+")) {
time += parseDuration(ctx.getChild(i + 1).getText());
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
index e4491cd..c493914 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
@@ -146,8 +146,7 @@ public class QueryResourceManager {
SingleSeriesExpression singleSeriesExpression = new SingleSeriesExpression(selectedPath,
filter);
- QueryDataSource queryDataSource;
- queryDataSource = StorageEngine.getInstance()
+ QueryDataSource queryDataSource = StorageEngine.getInstance()
.query(singleSeriesExpression, context, filePathsManager);
// calculate the distinct number of seq and unseq tsfiles
if (config.isEnablePerformanceTracing()) {
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
index 8289d48..0e00e97 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
@@ -73,10 +73,9 @@ public class LocalTextModificationAccessorTest {
@Test
public void readNull() throws IOException {
String tempFileName = TestConstant.BASE_OUTPUT_PATH.concat("mod.temp");
- LocalTextModificationAccessor accessor;
- accessor = new LocalTextModificationAccessor(tempFileName);
+ LocalTextModificationAccessor accessor = new LocalTextModificationAccessor(tempFileName);
new File(tempFileName).delete();
Collection<Modification> modifications = accessor.read();
assertEquals(new ArrayList<>(), modifications);
}
-}
\ No newline at end of file
+}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
index a7df125..67e99ff 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
@@ -596,9 +596,8 @@ public class IoTDBAuthorizationIT {
int insertCnt = 20000;
int batchSize = 500;
- long time;
- time = System.currentTimeMillis();
+ long time = System.currentTimeMillis();
for (int i = 0; i < insertCnt; ) {
for (int j = 0; j < batchSize; j++) {
userStmt.addBatch(
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
index 4eb87ab..284c17b 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
@@ -159,9 +159,8 @@ public class IoTDBFillIT {
Assert.assertTrue(hasResultSet);
- int cnt;
ResultSet resultSet = statement.getResultSet();
- cnt = 0;
+ int cnt = 0;
try {
while (resultSet.next()) {
String ans = resultSet.getString(TIMESTAMP_STR) + "," + resultSet.getString(TEMPERATURE_STR_1)
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
index f583b46..f7e3f59 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
@@ -336,7 +336,6 @@ public class MManagerBasicTest {
@Test
public void testGetStorageGroupNameByAutoLevel() {
int level = IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel();
- boolean caughtException;
try {
assertEquals("root.laptop",
@@ -346,7 +345,7 @@ public class MManagerBasicTest {
fail(e.getMessage());
}
- caughtException = false;
+ boolean caughtException = false;
try {
MetaUtils.getStorageGroupPathByLevel(new PartialPath("root1.laptop.d1.s1"), level);
} catch (MetadataException e) {
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
index 414b5fe..70d283c 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
@@ -79,7 +79,6 @@ public class MManagerImproveTest {
public void analyseTimeCost() throws MetadataException {
mManager = IoTDB.metaManager;
- long startTime, endTime;
long string_combine, path_exist, list_init, check_filelevel, get_seriestype;
string_combine = path_exist = list_init = check_filelevel = get_seriestype = 0;
@@ -87,11 +86,11 @@ public class MManagerImproveTest {
String measurement = "s5";
String path = deviceId + TsFileConstant.PATH_SEPARATOR + measurement;
- startTime = System.currentTimeMillis();
+ long startTime = System.currentTimeMillis();
for (int i = 0; i < 100000; i++) {
assertTrue(mManager.isPathExist(new PartialPath(path)));
}
- endTime = System.currentTimeMillis();
+ long endTime = System.currentTimeMillis();
path_exist += endTime - startTime;
startTime = System.currentTimeMillis();
@@ -133,8 +132,7 @@ public class MManagerImproveTest {
}
private void doCacheTest(String deviceId, List<String> measurementList) throws MetadataException {
- MNode node = null;
- node = mManager.getDeviceNodeWithAutoCreate(new PartialPath(deviceId));
+ MNode node = mManager.getDeviceNodeWithAutoCreate(new PartialPath(deviceId));
for (String s : measurementList) {
assertTrue(node.hasChild(s));
MeasurementMNode measurementNode = (MeasurementMNode) node.getChild(s);
diff --git a/server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java b/server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
index 4266ded..b24af31 100644
--- a/server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
@@ -51,8 +51,6 @@ public class FileSizeTest {
@Ignore
@Test
public void testGetFileSizesInByte() {
- long dataSizeBefore;
- long dataSizeAfter;
boolean isWriteSuccess = true;
File testFile = new File(TEST_FILE_PATH);
if (testFile.exists()) {
@@ -71,7 +69,7 @@ public class FileSizeTest {
e.printStackTrace();
}
- dataSizeBefore = FileSize.getInstance().getFileSizesInByte().get(FileSizeConstants.SYS);
+ long dataSizeBefore = FileSize.getInstance().getFileSizesInByte().get(FileSizeConstants.SYS);
byte[] contentInBytes = TEST_FILE_CONTENT.getBytes();
// insert something into the test file under data dir
try (FileOutputStream fileOutputStream = new FileOutputStream(testFile)) {
@@ -82,7 +80,7 @@ public class FileSizeTest {
e.printStackTrace();
}
// calculate the delta of data dir file size
- dataSizeAfter = FileSize.getInstance().getFileSizesInByte().get(FileSizeConstants.SYS);
+ long dataSizeAfter = FileSize.getInstance().getFileSizesInByte().get(FileSizeConstants.SYS);
long deltaSize = dataSizeAfter - dataSizeBefore;
if (isWriteSuccess) {
diff --git a/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java b/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java
index f27d807..e742d57 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java
@@ -98,10 +98,6 @@ public class SyncFileManagerTest {
}
}
}
- Map<String, Map<Long, Set<File>>> lastFileMap;
- Map<String, Map<Long, Set<File>>> curFileMap;
- Map<String, Map<Long, Set<File>>> deletedFilesMap;
- Map<String, Map<Long, Set<File>>> toBeSyncedFilesMap;
// lastFileList is empty
manager.getValidFiles(dataDir);
@@ -110,7 +106,7 @@ public class SyncFileManagerTest {
updateLastLocalFiles(allFileList);
manager.getValidFiles(dataDir);
- lastFileMap = manager.getLastLocalFilesMap();
+ Map<String, Map<Long, Set<File>>> lastFileMap = manager.getLastLocalFilesMap();
assertFileMap(allFileList, lastFileMap);
// add some files
@@ -142,8 +138,8 @@ public class SyncFileManagerTest {
}
}
manager.getValidFiles(dataDir);
- curFileMap = manager.getCurrentSealedLocalFilesMap();
- toBeSyncedFilesMap = manager.getToBeSyncedFilesMap();
+ Map<String, Map<Long, Set<File>>> curFileMap = manager.getCurrentSealedLocalFilesMap();
+ Map<String, Map<Long, Set<File>>> toBeSyncedFilesMap = manager.getToBeSyncedFilesMap();
assertFileMap(allFileList, curFileMap);
assertFileMap(correctToBeSyncedFiles, toBeSyncedFilesMap);
@@ -211,7 +207,7 @@ public class SyncFileManagerTest {
}
manager.getValidFiles(dataDir);
curFileMap = manager.getCurrentSealedLocalFilesMap();
- deletedFilesMap = manager.getDeletedFilesMap();
+ Map<String, Map<Long, Set<File>>> deletedFilesMap = manager.getDeletedFilesMap();
toBeSyncedFilesMap = manager.getToBeSyncedFilesMap();
assertFileMap(allFileList, curFileMap);
assertFileMap(correctDeleteFile, deletedFilesMap);
@@ -280,4 +276,4 @@ public class SyncFileManagerTest {
logger.error("Can not clear sync log {}", config.getLastFileInfoPath(), e);
}
}
-}
\ No newline at end of file
+}
diff --git a/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/common/BasicOperator.java b/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/common/BasicOperator.java
index b32a021..94d1e98 100755
--- a/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/common/BasicOperator.java
+++ b/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/common/BasicOperator.java
@@ -59,8 +59,7 @@ public class BasicOperator extends FilterOperator {
@Override
public BasicOperator clone() {
- BasicOperator ret;
- ret = new BasicOperator(this.tokenIntType, seriesPath, seriesValue);
+ BasicOperator ret = new BasicOperator(this.tokenIntType, seriesPath, seriesValue);
ret.tokenSymbol = tokenSymbol;
ret.isLeaf = isLeaf;
ret.isSingle = isSingle;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
index 253b2c6..d3070be 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
@@ -92,7 +92,6 @@ public class MetadataIndexConstructor {
// else, build level index for devices
Queue<MetadataIndexNode> deviceMetadaIndexQueue = new ArrayDeque<>();
MetadataIndexNode currentIndexNode = new MetadataIndexNode(MetadataIndexNodeType.LEAF_DEVICE);
- MetadataIndexNode deviceMetadataIndexNode;
for (Map.Entry<String, MetadataIndexNode> entry : deviceMetadataIndexMap.entrySet()) {
// when constructing from internal node, each node is related to an entry
@@ -104,7 +103,7 @@ public class MetadataIndexConstructor {
entry.getValue().serializeTo(out.wrapAsStream());
}
addCurrentIndexNodeToQueue(currentIndexNode, deviceMetadaIndexQueue, out);
- deviceMetadataIndexNode = generateRootNode(deviceMetadaIndexQueue,
+ MetadataIndexNode deviceMetadataIndexNode = generateRootNode(deviceMetadaIndexQueue,
out, MetadataIndexNodeType.INTERNAL_DEVICE);
deviceMetadataIndexNode.setEndOffset(out.getPosition());
return deviceMetadataIndexNode;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java
index ac97492..7860332 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/BytesUtils.java
@@ -857,11 +857,10 @@ public class BytesUtils {
* @return short number
*/
public static short bytesToShort(byte[] b) {
- short s = 0;
short s0 = (short) (b[1] & 0xff);
short s1 = (short) (b[0] & 0xff);
s1 <<= 8;
- s = (short) (s0 | s1);
+ short s = (short) (s0 | s1);
return s;
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java
index b15c0a8..a92fe99 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/RamUsageEstimator.java
@@ -163,10 +163,8 @@ public final class RamUsageEstimator {
// Initialize empirically measured defaults. We'll modify them to the current
// JVM settings later on if possible.
int referenceSize = Constants.JRE_IS_64BIT ? 8 : 4;
- int objectHeader = Constants.JRE_IS_64BIT ? 16 : 8;
// The following is objectHeader + NUM_BYTES_INT, but aligned (object alignment)
// so on 64 bit JVMs it'll be align(16 + 4, @8) = 24.
- int arrayHeader = Constants.JRE_IS_64BIT ? 24 : 12;
supportedFeatures = EnumSet.noneOf(JvmFeature.class);
@@ -193,8 +191,8 @@ public final class RamUsageEstimator {
// "best guess" based on reference size. We will attempt to modify
// these to exact values if there is supported infrastructure.
- objectHeader = Constants.JRE_IS_64BIT ? (8 + referenceSize) : 8;
- arrayHeader = Constants.JRE_IS_64BIT ? (8 + 2 * referenceSize) : 12;
+ int objectHeader = Constants.JRE_IS_64BIT ? (8 + referenceSize) : 8;
+ int arrayHeader = Constants.JRE_IS_64BIT ? (8 + 2 * referenceSize) : 12;
// get the object header size:
// - first try out if the field offsets are not scaled (see warning in Unsafe docs)
@@ -548,7 +546,6 @@ public final class RamUsageEstimator {
* Create a cached information about shallow size and reference fields for a given class.
*/
private static ClassCache createCacheEntry(final Class<?> clazz) {
- ClassCache cachedInfo;
long shallowInstanceSize = NUM_BYTES_OBJECT_HEADER;
final ArrayList<Field> referenceFields = new ArrayList<Field>(32);
for (Class<?> c = clazz; c != null; c = c.getSuperclass()) {
@@ -565,7 +562,7 @@ public final class RamUsageEstimator {
}
}
- cachedInfo = new ClassCache(
+ ClassCache cachedInfo = new ClassCache(
alignObjectSize(shallowInstanceSize),
referenceFields.toArray(new Field[0]));
return cachedInfo;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/StatisticsV1.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/StatisticsV1.java
index 4408543..ea91dd3 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/StatisticsV1.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/v1/file/metadata/statistics/StatisticsV1.java
@@ -83,11 +83,11 @@ public abstract class StatisticsV1<T> {
statistics.deserialize(buffer);
return statistics;
}
-
+
/**
* For upgrading 0.9.x/v1 -> 0.10/v2
*/
- public static Statistics upgradeOldStatistics(StatisticsV1<?> oldstatistics,
+ public static Statistics upgradeOldStatistics(StatisticsV1<?> oldstatistics,
TSDataType dataType, int numOfValues, long maxTimestamp, long minTimestamp) {
Statistics<?> statistics = Statistics.getStatsByType(dataType);
statistics.setStartTime(minTimestamp);
@@ -97,16 +97,16 @@ public abstract class StatisticsV1<T> {
switch (dataType) {
case INT32:
((IntegerStatistics) statistics)
- .initializeStats(((IntegerStatisticsV1) oldstatistics).getMin(),
- ((IntegerStatisticsV1) oldstatistics).getMax(),
+ .initializeStats(((IntegerStatisticsV1) oldstatistics).getMin(),
+ ((IntegerStatisticsV1) oldstatistics).getMax(),
((IntegerStatisticsV1) oldstatistics).getFirst(),
((IntegerStatisticsV1) oldstatistics).getLast(),
((IntegerStatisticsV1) oldstatistics).getSum());
break;
case INT64:
((LongStatistics) statistics)
- .initializeStats(((LongStatisticsV1) oldstatistics).getMin(),
- ((LongStatisticsV1) oldstatistics).getMax(),
+ .initializeStats(((LongStatisticsV1) oldstatistics).getMin(),
+ ((LongStatisticsV1) oldstatistics).getMax(),
((LongStatisticsV1) oldstatistics).getFirst(),
((LongStatisticsV1) oldstatistics).getLast(),
((LongStatisticsV1) oldstatistics).getSum());
@@ -123,16 +123,16 @@ public abstract class StatisticsV1<T> {
break;
case DOUBLE:
((DoubleStatistics) statistics)
- .initializeStats(((DoubleStatisticsV1) oldstatistics).getMin(),
- ((DoubleStatisticsV1) oldstatistics).getMax(),
+ .initializeStats(((DoubleStatisticsV1) oldstatistics).getMin(),
+ ((DoubleStatisticsV1) oldstatistics).getMax(),
((DoubleStatisticsV1) oldstatistics).getFirst(),
((DoubleStatisticsV1) oldstatistics).getLast(),
((DoubleStatisticsV1) oldstatistics).getSum());
break;
case FLOAT:
((FloatStatistics) statistics)
- .initializeStats(((FloatStatisticsV1) oldstatistics).getMin(),
- ((FloatStatisticsV1) oldstatistics).getMax(),
+ .initializeStats(((FloatStatisticsV1) oldstatistics).getMin(),
+ ((FloatStatisticsV1) oldstatistics).getMax(),
((FloatStatisticsV1) oldstatistics).getFirst(),
((FloatStatisticsV1) oldstatistics).getLast(),
((FloatStatisticsV1) oldstatistics).getSum());
@@ -148,8 +148,7 @@ public abstract class StatisticsV1<T> {
* For upgrading 0.9.x/v1 -> 0.10.x/v2
*/
public static Statistics constructStatisticsFromOldChunkMetadata(ChunkMetadataV1 oldChunkMetadata) {
- Statistics<?> statistics;
- statistics = Statistics.getStatsByType(oldChunkMetadata.getTsDataType());
+ Statistics<?> statistics = Statistics.getStatsByType(oldChunkMetadata.getTsDataType());
statistics.setStartTime(oldChunkMetadata.getStartTime());
statistics.setEndTime(oldChunkMetadata.getEndTime());
statistics.setCount(oldChunkMetadata.getNumOfPoints());
@@ -159,16 +158,16 @@ public abstract class StatisticsV1<T> {
switch (statistics.getType()) {
case INT32:
((IntegerStatistics) statistics)
- .initializeStats(ReadWriteIOUtils.readInt(buffers[0]),
- ReadWriteIOUtils.readInt(buffers[1]),
+ .initializeStats(ReadWriteIOUtils.readInt(buffers[0]),
+ ReadWriteIOUtils.readInt(buffers[1]),
ReadWriteIOUtils.readInt(buffers[2]),
ReadWriteIOUtils.readInt(buffers[3]),
ReadWriteIOUtils.readDouble(buffers[4]));
break;
case INT64:
((LongStatistics) statistics)
- .initializeStats(ReadWriteIOUtils.readLong(buffers[0]),
- ReadWriteIOUtils.readLong(buffers[1]),
+ .initializeStats(ReadWriteIOUtils.readLong(buffers[0]),
+ ReadWriteIOUtils.readLong(buffers[1]),
ReadWriteIOUtils.readLong(buffers[2]),
ReadWriteIOUtils.readLong(buffers[3]),
ReadWriteIOUtils.readDouble(buffers[4]));
@@ -185,16 +184,16 @@ public abstract class StatisticsV1<T> {
break;
case DOUBLE:
((DoubleStatistics) statistics)
- .initializeStats(ReadWriteIOUtils.readDouble(buffers[0]),
- ReadWriteIOUtils.readDouble(buffers[1]),
+ .initializeStats(ReadWriteIOUtils.readDouble(buffers[0]),
+ ReadWriteIOUtils.readDouble(buffers[1]),
ReadWriteIOUtils.readDouble(buffers[2]),
ReadWriteIOUtils.readDouble(buffers[3]),
ReadWriteIOUtils.readDouble(buffers[4]));
break;
case FLOAT:
((FloatStatistics) statistics)
- .initializeStats(ReadWriteIOUtils.readFloat(buffers[0]),
- ReadWriteIOUtils.readFloat(buffers[1]),
+ .initializeStats(ReadWriteIOUtils.readFloat(buffers[0]),
+ ReadWriteIOUtils.readFloat(buffers[1]),
ReadWriteIOUtils.readFloat(buffers[2]),
ReadWriteIOUtils.readFloat(buffers[3]),
ReadWriteIOUtils.readDouble(buffers[4]));
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java
index 85b9186..a1ce151 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java
@@ -118,7 +118,6 @@ public class ReadWriteTest {
TSRecord tsRecord = new TSRecord(1, "d1");
DataPoint dPoint1 = new FloatDataPoint("s1", 1.2f);
DataPoint dPoint2 = new IntDataPoint("s2", 20);
- DataPoint dPoint3;
tsRecord.addTuple(dPoint1);
tsRecord.addTuple(dPoint2);
@@ -127,7 +126,7 @@ public class ReadWriteTest {
tsRecord = new TSRecord(2, "d1");
dPoint2 = new IntDataPoint("s2", 20);
- dPoint3 = new IntDataPoint("s3", 50);
+ DataPoint dPoint3 = new IntDataPoint("s3", 50);
tsRecord.addTuple(dPoint2);
tsRecord.addTuple(dPoint3);
tsFileWriter.write(tsRecord);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java
index b9ba9f3..9fc3527 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/ReadWriteIOUtilsTest.java
@@ -45,8 +45,7 @@ public class ReadWriteIOUtilsTest {
fail(e.toString());
}
- String result;
- result = ReadWriteIOUtils.readString(ByteBuffer.wrap(byteArrayOutputStream.toByteArray()));
+ String result = ReadWriteIOUtils.readString(ByteBuffer.wrap(byteArrayOutputStream.toByteArray()));
Assert.assertNotNull(result);
Assert.assertEquals(str, result);
@@ -80,8 +79,7 @@ public class ReadWriteIOUtilsTest {
fail(e.toString());
}
- Map<String, String> result;
- result = ReadWriteIOUtils.readMap(ByteBuffer.wrap(byteArrayOutputStream.toByteArray()));
+ Map<String, String> result = ReadWriteIOUtils.readMap(ByteBuffer.wrap(byteArrayOutputStream.toByteArray()));
Assert.assertNotNull(result);
Assert.assertEquals(map, result);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java
index b50297b..d2e6836 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java
@@ -105,10 +105,10 @@ public class SameMeasurementsWithDifferentDataTypesTest {
schema.extendTemplate(TEMPLATE_1, new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(TEMPLATE_1, new MeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(TEMPLATE_1, new MeasurementSchema("s3", TSDataType.INT32, TSEncoding.TS_2DIFF));
-
+
schema.extendTemplate(TEMPLATE_2, new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.extendTemplate(TEMPLATE_2, new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
-
+
schema.registerDevice("d1", TEMPLATE_1);
schema.registerDevice("d2", TEMPLATE_2);
@@ -118,7 +118,6 @@ public class SameMeasurementsWithDifferentDataTypesTest {
TSRecord tsRecord = new TSRecord(1, "d1");
DataPoint dPoint1 = new FloatDataPoint("s1", 1.2f);
DataPoint dPoint2 = new IntDataPoint("s2", 20);
- DataPoint dPoint3;
tsRecord.addTuple(dPoint1);
tsRecord.addTuple(dPoint2);
@@ -127,7 +126,7 @@ public class SameMeasurementsWithDifferentDataTypesTest {
tsRecord = new TSRecord(2, "d1");
dPoint2 = new IntDataPoint("s2", 20);
- dPoint3 = new IntDataPoint("s3", 50);
+ DataPoint dPoint3 = new IntDataPoint("s3", 50);
tsRecord.addTuple(dPoint2);
tsRecord.addTuple(dPoint3);
tsFileWriter.write(tsRecord);
@@ -174,7 +173,7 @@ public class SameMeasurementsWithDifferentDataTypesTest {
tsRecord.addTuple(dPoint2);
tsRecord.addTuple(dPoint3);
tsFileWriter.write(tsRecord);
-
+
tsRecord = new TSRecord(1, "d2");
dPoint1 = new LongDataPoint("s1", 2000L);
dPoint2 = new LongDataPoint("s2", 210L);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
index 7503e24..87b88fc 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
@@ -301,8 +301,7 @@ public class RestorableTsFileIOWriterTest {
writer = new TsFileWriter(rWriter);
writer.close();
TsFileSequenceReader reader = new TsFileSequenceReader(FILE_NAME);
- List<ChunkMetadata> chunkMetadataList;
- chunkMetadataList = reader.getChunkMetadataList(new Path("d1", "s1"));
+ List<ChunkMetadata> chunkMetadataList = reader.getChunkMetadataList(new Path("d1", "s1"));
assertNotNull(chunkMetadataList);
chunkMetadataList = reader.getChunkMetadataList(new Path("d1", "s2"));
assertNotNull(chunkMetadataList);
@@ -408,4 +407,4 @@ public class RestorableTsFileIOWriterTest {
assertTrue(file.delete());
}
-}
\ No newline at end of file
+}