You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/01/25 14:39:27 UTC
[incubator-iotdb] branch fix_sonar updated: fix sonar of postback
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_sonar
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_sonar by this push:
new 0aa13fa fix sonar of postback
new b9217ec Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
0aa13fa is described below
commit 0aa13fa870979d2d48a1ad4f8d0e4c87da72fde6
Author: lta <li...@163.com>
AuthorDate: Fri Jan 25 22:38:26 2019 +0800
fix sonar of postback
---
.../iotdb/db/auth/role/LocalFileRoleAccessor.java | 4 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 3 +-
.../db/postback/conf/PostBackSenderDescriptor.java | 27 ++-----
.../iotdb/db/postback/sender/FileSenderImpl.java | 2 +-
.../iotdb/db/postback/utils/CreateDataSender1.java | 10 +--
.../iotdb/db/postback/utils/CreateDataSender2.java | 10 +--
.../iotdb/db/postback/utils/CreateDataSender3.java | 10 +--
.../iotdb/db/postback/sender/FileManagerTest.java | 10 +--
.../sender/IoTDBSingleClientPostBackTest.java | 84 +++++++++++-----------
.../sender/MultipleClientPostBackTest.java | 16 ++---
10 files changed, 80 insertions(+), 96 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
index ba6ddb2..8f46f56 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
@@ -113,11 +113,9 @@ public class LocalFileRoleAccessor implements IRoleAccessor {
.writePathPrivilege(outputStream, pathPrivilege, STRING_ENCODING,
encodingBufferLocal);
}
-
+ outputStream.flush();
} catch (Exception e) {
throw new IOException(e.getMessage());
- } finally {
- outputStream.flush();
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
index beb499d..48e77d1 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
@@ -145,11 +145,10 @@ public class LocalFileUserAccessor implements IUserAccessor {
.writeString(outputStream, user.getRoleList().get(i), STRING_ENCODING,
encodingBufferLocal);
}
+ outputStream.flush();
} catch (Exception e) {
throw new IOException(e.getMessage());
- } finally {
- outputStream.flush();
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java
index 19d54bd..4703baf 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/conf/PostBackSenderDescriptor.java
@@ -57,7 +57,6 @@ public class PostBackSenderDescriptor {
* load an properties file and set TsfileDBConfig variables
*/
private void loadProps() {
- InputStream inputStream = null;
String url = System.getProperty(IoTDBConstant.IOTDB_CONF, null);
if (url == null) {
url = System.getProperty(IoTDBConstant.IOTDB_HOME, null);
@@ -74,30 +73,24 @@ public class PostBackSenderDescriptor {
url += (File.separatorChar + PostBackSenderConfig.CONFIG_NAME);
}
- try {
- inputStream = new FileInputStream(new File(url));
- } catch (FileNotFoundException e) {
- LOGGER.warn("Fail to find config file {}", url);
- // update all data seriesPath
- return;
- }
-
LOGGER.info("Start to read config file {}", url);
Properties properties = new Properties();
- try {
+ try (InputStream inputStream = new FileInputStream(new File(url))) {
properties.load(inputStream);
conf.setServerIp(properties.getProperty("server_ip", conf.getServerIp()));
conf.setServerPort(Integer
- .parseInt(properties.getProperty("server_port", conf.getServerPort() + "")));
+ .parseInt(properties.getProperty("server_port", Integer.toString(conf.getServerPort()))));
conf.setClientPort(Integer
- .parseInt(properties.getProperty("client_port", conf.getClientPort() + "")));
+ .parseInt(properties.getProperty("client_port", Integer.toString(conf.getClientPort()))));
conf.setUploadCycleInSeconds(Integer.parseInt(properties
- .getProperty("upload_cycle_in_seconds", conf.getUploadCycleInSeconds() + "")));
+ .getProperty("upload_cycle_in_seconds",
+ Integer.toString(conf.getUploadCycleInSeconds()))));
conf.setSchemaPath(properties.getProperty("iotdb_schema_directory", conf.getSchemaPath()));
conf.setClearEnable(Boolean
- .parseBoolean(properties.getProperty("is_clear_enable", conf.getClearEnable() + "")));
+ .parseBoolean(
+ properties.getProperty("is_clear_enable", Boolean.toString(conf.getClearEnable()))));
conf.setUuidPath(conf.getDataDirectory() + POSTBACK + File.separator + "uuid.txt");
conf.setLastFileInfo(
conf.getDataDirectory() + POSTBACK + File.separator + "lastLocalFileList.txt");
@@ -118,12 +111,6 @@ public class PostBackSenderDescriptor {
} catch (Exception e) {
LOGGER.warn("Error format in config file because {}, use default configuration",
e.getMessage());
- } finally {
- try {
- inputStream.close();
- } catch (IOException e) {
- LOGGER.error("Fail to close config file input stream because {}", e.getMessage());
- }
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java
index 8d0e19a..d5dc212 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/sender/FileSenderImpl.java
@@ -489,7 +489,7 @@ public class FileSenderImpl implements FileSender {
try {
PostbackUtils.deleteFile(new File(snapshotPath));
} catch (IOException e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error(" ", e);
}
}
try {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java
index 7f539a9..a4f25e6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender1.java
@@ -117,7 +117,7 @@ public class CreateDataSender1 {
statement.executeBatch();
statement.clearBatch();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
}
}
@@ -137,7 +137,7 @@ public class CreateDataSender1 {
statement.execute(sql);
}
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
}
}
@@ -243,15 +243,15 @@ public class CreateDataSender1 {
statement = connection.createStatement();
setStorageGroup(statement, storageGroupList);
- LOGGER.info("Finish set storage group.");
+ LOGGER.debug("Finish set storage group.");
createTimeseries(statement, timeseriesMap);
- LOGGER.info("Finish create timeseries.");
+ LOGGER.debug("Finish create timeseries.");
while (true) {
randomInsertData(statement, timeseriesMap);
}
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
} finally {
if (statement != null) {
statement.close();
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java
index c7f36c6..07cb144 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender2.java
@@ -120,7 +120,7 @@ public class CreateDataSender2 {
statement.executeBatch();
statement.clearBatch();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
}
}
@@ -141,7 +141,7 @@ public class CreateDataSender2 {
statement.execute(sql);
}
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
}
}
@@ -247,15 +247,15 @@ public class CreateDataSender2 {
statement = connection.createStatement();
setStorageGroup(statement, storageGroupList);
- LOGGER.info("Finish set storage group.");
+ LOGGER.debug("Finish set storage group.");
createTimeseries(statement, timeseriesMap);
- LOGGER.info("Finish create timeseries.");
+ LOGGER.debug("Finish create timeseries.");
while (true) {
randomInsertData(statement, timeseriesMap);
}
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
} finally {
if (statement != null) {
statement.close();
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java
index d36e8b5..e3f05a2 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/postback/utils/CreateDataSender3.java
@@ -125,7 +125,7 @@ public class CreateDataSender3 {
statement1.executeBatch();
statement1.clearBatch();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
}
}
@@ -147,7 +147,7 @@ public class CreateDataSender3 {
statement1.execute(sql);
}
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
}
}
@@ -264,15 +264,15 @@ public class CreateDataSender3 {
statement1 = connection1.createStatement();
setStorageGroup(statement, statement1, storageGroupList);
- LOGGER.info("Finish set storage group.");
+ LOGGER.debug("Finish set storage group.");
createTimeseries(statement, statement1, timeseriesMap);
- LOGGER.info("Finish create timeseries.");
+ LOGGER.debug("Finish create timeseries.");
while (true) {
randomInsertData(statement, statement1, timeseriesMap);
}
}
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
} finally {
if (statement != null) {
statement.close();
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java
index e1ff141..f808a87 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/FileManagerTest.java
@@ -242,13 +242,13 @@ public class FileManagerTest {
assert (allFileList.size() == fileList.size());
for (Entry<String, Set<String>> entry : fileList.entrySet()) {
assert (allFileList.containsKey(entry.getKey()));
- LOGGER.info("allFileList");
+ LOGGER.debug("allFileList");
for (String a : allFileList.get(entry.getKey())) {
- LOGGER.info(a);
+ LOGGER.debug(a);
}
- LOGGER.info("FileList");
+ LOGGER.debug("FileList");
for (String a : entry.getValue()) {
- LOGGER.info(a);
+ LOGGER.debug(a);
}
assert (allFileList.get(entry.getKey()).containsAll(entry.getValue()));
}
@@ -365,7 +365,7 @@ public class FileManagerTest {
private boolean isEmpty(Map<String, Set<String>> sendingFileList) {
for (Entry<String, Set<String>> entry : sendingFileList.entrySet()) {
- if (entry.getValue().isEmpty()) {
+ if (!entry.getValue().isEmpty()) {
return false;
}
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java
index eaf1aae..b3f8898 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/IoTDBSingleClientPostBackTest.java
@@ -144,7 +144,7 @@ public class IoTDBSingleClientPostBackTest {
"insert into root.test.d1.g0(timestamp,s0) values(400,1050)", "merge", "flush",};
private boolean testFlag = Constant.testFlag;
private static final String POSTBACK = "postback";
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSingleClientPostBackTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(IoTDBSingleClientPostBackTest.class);
public static void main(String[] args) throws Exception {
IoTDBSingleClientPostBackTest singleClientPostBackTest = new IoTDBSingleClientPostBackTest();
@@ -193,16 +193,16 @@ public class IoTDBSingleClientPostBackTest {
EnvironmentUtils.cleanEnv();
}
if (success) {
- LOGGER.info("Test succeed!");
+ logger.debug("Test succeed!");
} else {
- LOGGER.info("Test failed!");
+ logger.debug("Test failed!");
}
}
public void testPostback() {
if (testFlag) {
// the first time to postback
- LOGGER.info("It's the first time to post back!");
+ logger.debug("It's the first time to post back!");
try {
Thread.sleep(2000);
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -238,7 +238,7 @@ public class IoTDBSingleClientPostBackTest {
dataSender.add(res.getString("Time") + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
}
@@ -249,13 +249,13 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataSender.add(res.getString("Time") + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
}
}
statement.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
}
} catch (ClassNotFoundException | InterruptedException e) {
fail(e.getMessage());
@@ -278,7 +278,7 @@ public class IoTDBSingleClientPostBackTest {
dataReceiver.add(res.getString("Time") + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
}
@@ -290,13 +290,13 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataReceiver.add(res.getString("Time") + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
}
}
statement.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("",e);
} finally {
if (connection != null) {
connection.close();
@@ -306,17 +306,17 @@ public class IoTDBSingleClientPostBackTest {
fail(e.getMessage());
Thread.currentThread().interrupt();
}
- LOGGER.info(String.valueOf(dataSender.size()));
- LOGGER.info(String.valueOf(dataReceiver.size()));
- LOGGER.info(dataSender.toString());
- LOGGER.info(dataReceiver.toString());
+ logger.debug(String.valueOf(dataSender.size()));
+ logger.debug(String.valueOf(dataReceiver.size()));
+ logger.debug(dataSender.toString());
+ logger.debug(dataReceiver.toString());
if (!(dataSender.size() == dataReceiver.size() && dataSender.containsAll(dataReceiver))) {
success = false;
return;
}
// the second time to postback
- LOGGER.info("It's the second time to post back!");
+ logger.debug("It's the second time to post back!");
try {
Thread.sleep(2000);
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -332,7 +332,7 @@ public class IoTDBSingleClientPostBackTest {
statement.close();
Thread.sleep(100);
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
} finally {
if (connection != null) {
connection.close();
@@ -363,7 +363,7 @@ public class IoTDBSingleClientPostBackTest {
dataSender.add(res.getString("Time") + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
}
@@ -374,13 +374,13 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataSender.add(res.getString("Time") + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
}
}
statement.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
} finally {
if (connection != null) {
connection.close();
@@ -407,7 +407,7 @@ public class IoTDBSingleClientPostBackTest {
dataReceiver.add(res.getString("Time") + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
}
@@ -418,13 +418,13 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataReceiver.add(res.getString("Time") + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
}
}
statement.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
} finally {
if (connection != null) {
connection.close();
@@ -434,17 +434,17 @@ public class IoTDBSingleClientPostBackTest {
fail(e.getMessage());
Thread.currentThread().interrupt();
}
- LOGGER.info(String.valueOf(dataSender.size()));
- LOGGER.info(String.valueOf(dataReceiver.size()));
- LOGGER.info(dataSender.toString());
- LOGGER.info(dataReceiver.toString());
+ logger.debug(String.valueOf(dataSender.size()));
+ logger.debug(String.valueOf(dataReceiver.size()));
+ logger.debug(dataSender.toString());
+ logger.debug(dataReceiver.toString());
if (!(dataSender.size() == dataReceiver.size() && dataSender.containsAll(dataReceiver))) {
success = false;
return;
}
// the third time to postback
- LOGGER.info("It's the third time to post back!");
+ logger.debug("It's the third time to post back!");
try {
Thread.sleep(2000);
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -458,7 +458,7 @@ public class IoTDBSingleClientPostBackTest {
statement.close();
Thread.sleep(100);
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
}
} catch (ClassNotFoundException | InterruptedException e) {
fail(e.getMessage());
@@ -483,7 +483,7 @@ public class IoTDBSingleClientPostBackTest {
dataSender.add(res.getString("Time") + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
}
@@ -494,7 +494,7 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataSender.add(res.getString("Time") + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
}
}
@@ -504,7 +504,7 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataSender.add(res.getString("Time") + res.getString("root.flush.d0.s0")
+ res.getString("root.flush.d0.s1") + res.getString("root.flush.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.flush.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.flush.d0.s0")
+ res.getString("root.flush.d0.s1") + res.getString("root.flush.d1.g0.s0"));
}
}
@@ -515,14 +515,14 @@ public class IoTDBSingleClientPostBackTest {
dataSender.add(res.getString("Time") + res.getString("root.iotdb.d0.s0")
+ res.getString("root.iotdb.d0.s1") + res.getString("root.iotdb.d1.s2")
+ res.getString("root.iotdb.d1.s3"));
- LOGGER.info(res.getString("Time") + res.getString("root.iotdb.d0.s0")
+ logger.debug(res.getString("Time") + res.getString("root.iotdb.d0.s0")
+ res.getString("root.iotdb.d0.s1") + res.getString("root.iotdb.d1.s2")
+ res.getString("root.iotdb.d1.s3"));
}
}
statement.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
}
} catch (ClassNotFoundException | InterruptedException e) {
fail(e.getMessage());
@@ -545,7 +545,7 @@ public class IoTDBSingleClientPostBackTest {
dataReceiver.add(res.getString("Time") + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.vehicle.d0.s0")
+ res.getString("root.vehicle.d0.s1") + res.getString("root.vehicle.d1.s2")
+ res.getString("root.vehicle.d1.s3"));
}
@@ -556,7 +556,7 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataReceiver.add(res.getString("Time") + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.test.d0.s0")
+ res.getString("root.test.d0.s1") + res.getString("root.test.d1.g0.s0"));
}
}
@@ -566,7 +566,7 @@ public class IoTDBSingleClientPostBackTest {
while (res.next()) {
dataReceiver.add(res.getString("Time") + res.getString("root.flush.d0.s0")
+ res.getString("root.flush.d0.s1") + res.getString("root.flush.d1.g0.s0"));
- LOGGER.info(res.getString("Time") + " | " + res.getString("root.flush.d0.s0")
+ logger.debug(res.getString("Time") + " | " + res.getString("root.flush.d0.s0")
+ res.getString("root.flush.d0.s1") + res.getString("root.flush.d1.g0.s0"));
}
}
@@ -577,14 +577,14 @@ public class IoTDBSingleClientPostBackTest {
dataReceiver.add(res.getString("Time") + res.getString("root.iotdb.d0.s0")
+ res.getString("root.iotdb.d0.s1") + res.getString("root.iotdb.d1.s2")
+ res.getString("root.iotdb.d1.s3"));
- LOGGER.info(res.getString("Time") + res.getString("root.iotdb.d0.s0")
+ logger.debug(res.getString("Time") + res.getString("root.iotdb.d0.s0")
+ res.getString("root.iotdb.d0.s1") + res.getString("root.iotdb.d1.s2")
+ res.getString("root.iotdb.d1.s3"));
}
}
statement.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ logger.error("", e);
} finally {
if (connection != null) {
connection.close();
@@ -594,10 +594,10 @@ public class IoTDBSingleClientPostBackTest {
fail(e.getMessage());
Thread.currentThread().interrupt();
}
- LOGGER.info(String.valueOf(dataSender.size()));
- LOGGER.info(String.valueOf(dataReceiver.size()));
- LOGGER.info(String.valueOf(dataSender));
- LOGGER.info(String.valueOf(dataReceiver));
+ logger.debug(String.valueOf(dataSender.size()));
+ logger.debug(String.valueOf(dataReceiver.size()));
+ logger.debug(String.valueOf(dataSender));
+ logger.debug(String.valueOf(dataReceiver));
if (!(dataSender.size() == dataReceiver.size() && dataSender.containsAll(dataReceiver))) {
success = false;
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java
index 64d13a5..2c30fb0 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/postback/sender/MultipleClientPostBackTest.java
@@ -91,7 +91,7 @@ public class MultipleClientPostBackTest {
for (String storageGroup : timeseriesList.keySet()) {
String sqlFormat = "select %s from %s";
- LOGGER.info(String.format("%s:", storageGroup));
+ LOGGER.debug(String.format("%s:", storageGroup));
int count = 0;
int count1 = 0;
int count2 = 0;
@@ -136,7 +136,7 @@ public class MultipleClientPostBackTest {
statement.close();
statement1.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
} finally {
if (connection != null) {
connection.close();
@@ -151,14 +151,14 @@ public class MultipleClientPostBackTest {
if (count > 20) {
break;
}
- LOGGER.info(String.valueOf(count1));
- LOGGER.info(String.valueOf(count2));
+ LOGGER.debug(String.valueOf(count1));
+ LOGGER.debug(String.valueOf(count2));
}
}
for (String storageGroup : timeseriesList1.keySet()) {
String sqlFormat = "select %s from %s";
- LOGGER.info(String.format("%s:", storageGroup));
+ LOGGER.debug(String.format("%s:", storageGroup));
int count = 0;
int count1;
int count2;
@@ -203,7 +203,7 @@ public class MultipleClientPostBackTest {
statement.close();
statement1.close();
} catch (Exception e) {
- LOGGER.error(e.getMessage());
+ LOGGER.error("", e);
} finally {
if (connection != null) {
connection.close();
@@ -218,8 +218,8 @@ public class MultipleClientPostBackTest {
if (count > 20) {
break;
}
- LOGGER.info(String.valueOf(count1));
- LOGGER.info(String.valueOf(count2));
+ LOGGER.debug(String.valueOf(count1));
+ LOGGER.debug(String.valueOf(count2));
}
}
}