This is an automated email from the ASF dual-hosted git repository.
wangchao316 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 cba948251b6 Fix some code smells for integration test (#11583)
cba948251b6 is described below
commit cba948251b6a9e8b94008f6136a4876c9219e93a
Author: Bo Cui <[email protected]>
AuthorDate: Tue Nov 21 11:17:32 2023 +0800
Fix some code smells for integration test (#11583)
Fix some code smells for integration test (#11583)
---
.../java/org/apache/iotdb/it/utils/TsFileGenerator.java | 14 +++++++-------
.../java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 4 ++--
.../org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 2 +-
.../main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
b/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
index 9ffdfb87d7d..0b95e9931ae 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java
@@ -44,7 +44,7 @@ import java.util.Random;
import java.util.TreeSet;
public class TsFileGenerator implements AutoCloseable {
- private static final Logger logger =
LoggerFactory.getLogger(TsFileGenerator.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(TsFileGenerator.class);
private final File tsFile;
private final TsFileWriter writer;
@@ -70,7 +70,7 @@ public class TsFileGenerator implements AutoCloseable {
public void registerTimeseries(String path, List<MeasurementSchema>
measurementSchemaList) {
if (device2MeasurementSchema.containsKey(path)) {
- logger.error("Register same device {}.", path);
+ LOGGER.error("Register same device {}.", path);
return;
}
writer.registerTimeseries(new Path(path), measurementSchemaList);
@@ -81,7 +81,7 @@ public class TsFileGenerator implements AutoCloseable {
public void registerAlignedTimeseries(String path, List<MeasurementSchema>
measurementSchemaList)
throws WriteProcessException {
if (device2MeasurementSchema.containsKey(path)) {
- logger.error("Register same device {}.", path);
+ LOGGER.error("Register same device {}.", path);
return;
}
writer.registerAlignedTimeseries(new Path(path), measurementSchemaList);
@@ -127,7 +127,7 @@ public class TsFileGenerator implements AutoCloseable {
tablet.reset();
}
- logger.info("Write {} points into device {}", number, device);
+ LOGGER.info("Write {} points into device {}", number, device);
}
public void generateData(
@@ -169,7 +169,7 @@ public class TsFileGenerator implements AutoCloseable {
tablet.reset();
}
- logger.info(String.format("Write %d points into device %s", number,
device));
+ LOGGER.info("Write {} points into device {}", number, device);
}
private void generateDataPoint(Object obj, int row, MeasurementSchema
schema) {
@@ -193,7 +193,7 @@ public class TsFileGenerator implements AutoCloseable {
generateTEXT(obj, row);
break;
default:
- logger.error(String.format("Wrong data type %s.", schema.getType()));
+ LOGGER.error("Wrong data type {}.", schema.getType());
}
}
@@ -257,7 +257,7 @@ public class TsFileGenerator implements AutoCloseable {
for (long j = startTime; j <= endTime; j++) {
timeSet.remove(j);
}
- logger.info("Delete {} - {} timestamp of device {}", startTime,
endTime, device);
+ LOGGER.info("Delete {} - {} timestamp of device {}", startTime,
endTime, device);
}
}
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
index 22b3f11d391..0aa13d281c8 100644
---
a/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
@@ -119,7 +119,7 @@ public class IOTDBLoadTsFileIT {
"create timeseries %s %s",
new Path(device, schema.getMeasurementId(), true).getFullPath(),
schema.getType().name());
- LOGGER.info(String.format("schema execute: %s.", sql));
+ LOGGER.info("schema execute: {}", sql);
return sql;
}
@@ -130,7 +130,7 @@ public class IOTDBLoadTsFileIT {
sql += (String.format("%s %s", schema.getMeasurementId(),
schema.getType().name()));
sql += (i == schemas.size() - 1 ? ")" : ",");
}
- LOGGER.info(String.format("schema execute: %s.", sql));
+ LOGGER.info("schema execute: {}.", sql);
return sql;
}
diff --git
a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
index beab5b3216f..afda243302d 100644
---
a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
+++
b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
@@ -455,7 +455,7 @@ public abstract class AbstractIoTDBJDBCResultSet implements
ResultSet {
nonAlign = true;
}
} catch (SQLException throwables) {
- LOGGER.error(String.format("get meta data error:%s",
throwables.getMessage()));
+ LOGGER.error("Get meta data error: {}", throwables.getMessage());
}
return new IoTDBResultMetadata(
nonAlign,
diff --git
a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java
b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java
index 2e786789704..12e490d92cc 100644
--- a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java
+++ b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java
@@ -30,7 +30,7 @@ import java.util.Properties;
public class IoTDBDataSource implements DataSource {
- private static final Logger logger =
LoggerFactory.getLogger(IoTDBDataSource.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(IoTDBDataSource.class);
private String url;
private String user;
@@ -92,7 +92,7 @@ public class IoTDBDataSource implements DataSource {
try {
return new IoTDBConnection(url, properties);
} catch (TTransportException e) {
- logger.error(String.format("get connection error : %s", e.getMessage()));
+ LOGGER.error("get connection error:", e);
}
return null;
}
@@ -105,7 +105,7 @@ public class IoTDBDataSource implements DataSource {
newProp.setProperty(PWD_STR, password);
return new IoTDBConnection(url, newProp);
} catch (Exception e) {
- logger.error(String.format("get connection error : %s", e.getMessage()));
+ LOGGER.error("get connection error:", e);
}
return null;
}
