You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/07/06 06:07:20 UTC
[iotdb] branch master updated: [IOTDB-6047] replace printStackTrace with logger (#10452)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 e5d4745cdc5 [IOTDB-6047] replace printStackTrace with logger (#10452)
e5d4745cdc5 is described below
commit e5d4745cdc532bfa50d77eb675a2402de85ecbe6
Author: QiangShaowei <ba...@163.com>
AuthorDate: Thu Jul 6 14:07:13 2023 +0800
[IOTDB-6047] replace printStackTrace with logger (#10452)
---
.../org/apache/iotdb/hadoop/tsfile/TsFileHelper.java | 2 +-
.../src/main/java/org/apache/iotdb/JDBCExample.java | 6 +++++-
.../src/main/java/org/apache/iotdb/HttpExample.java | 14 ++++++--------
.../src/main/java/org/apache/iotdb/HttpsExample.java | 15 ++++++---------
.../src/main/java/org/apache/iotdb/SSLClient.java | 6 ++++--
.../org/apache/iotdb/SessionConcurrentExample.java | 14 +++++++++-----
.../java/org/apache/iotdb/SessionPoolExample.java | 8 ++++++--
.../apache/iotdb/tsfile/TsFileForceAppendWrite.java | 2 +-
.../apache/iotdb/tsfile/TsFileWriteWithTSRecord.java | 6 +++++-
.../java/org/apache/iotdb/it/env/EnvFactory.java | 2 +-
.../iotdb/spark/tsfile/io/TsFileRecordWriter.java | 5 ++++-
.../org/apache/iotdb/spark/tsfile/qp/Executor.java | 7 ++++++-
.../apache/iotdb/db/schemaengine/SchemaEngine.java | 3 +--
.../org/apache/iotdb/db/service/SettleService.java | 20 ++------------------
.../org/apache/iotdb/tsfile/utils/FileGenerator.java | 4 ++--
15 files changed, 59 insertions(+), 55 deletions(-)
diff --git a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
index 24be206fbf3..31a0c4e32df 100644
--- a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
+++ b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
@@ -121,7 +121,7 @@ public class TsFileHelper {
}
} catch (Throwable e) {
- e.printStackTrace();
+ logger.error("Write tsfile error", e);
System.out.println(e.getMessage());
}
}
diff --git a/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java b/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
index efebf4c2dbb..29781f04835 100644
--- a/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
+++ b/example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
@@ -21,6 +21,9 @@ package org.apache.iotdb;
import org.apache.iotdb.jdbc.IoTDBSQLException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -29,6 +32,7 @@ import java.sql.SQLException;
import java.sql.Statement;
public class JDBCExample {
+ private static Logger logger = LoggerFactory.getLogger(JDBCExample.class);
public static void main(String[] args) throws ClassNotFoundException, SQLException {
Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
@@ -63,7 +67,7 @@ public class JDBCExample {
"select count(**) from root where time >= 1 and time <= 100 group by ([0, 100), 20ms, 20ms)");
outputResult(resultSet);
} catch (IoTDBSQLException e) {
- e.printStackTrace();
+ logger.error("IoTDB Jdbc example error", e);
}
}
diff --git a/example/rest-java-example/src/main/java/org/apache/iotdb/HttpExample.java b/example/rest-java-example/src/main/java/org/apache/iotdb/HttpExample.java
index 79f4f1f4e0d..692678365a8 100644
--- a/example/rest-java-example/src/main/java/org/apache/iotdb/HttpExample.java
+++ b/example/rest-java-example/src/main/java/org/apache/iotdb/HttpExample.java
@@ -66,8 +66,7 @@ public class HttpExample {
String result = JsonParser.parseString(message).getAsJsonObject().toString();
logger.info(result);
} catch (IOException e) {
- e.printStackTrace();
-
+ logger.error("The ping rest api failed", e);
} finally {
try {
httpClient.close();
@@ -75,7 +74,7 @@ public class HttpExample {
response.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Http Client close error", e);
}
}
}
@@ -103,15 +102,14 @@ public class HttpExample {
String result = JsonParser.parseString(message).getAsJsonObject().toString();
logger.info(result);
} catch (IOException e) {
- e.printStackTrace();
-
+ logger.error("The insertTablet rest api failed", e);
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Response close error", e);
}
}
}
@@ -129,14 +127,14 @@ public class HttpExample {
ObjectMapper mapper = new ObjectMapper();
logger.info("message = {}", mapper.readValue(message, Map.class));
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("The query rest api failed", e);
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Response close error", e);
}
}
}
diff --git a/example/rest-java-example/src/main/java/org/apache/iotdb/HttpsExample.java b/example/rest-java-example/src/main/java/org/apache/iotdb/HttpsExample.java
index b346876a362..eda9faf8363 100644
--- a/example/rest-java-example/src/main/java/org/apache/iotdb/HttpsExample.java
+++ b/example/rest-java-example/src/main/java/org/apache/iotdb/HttpsExample.java
@@ -38,7 +38,6 @@ import java.util.Base64;
import java.util.Map;
public class HttpsExample {
-
private static Logger logger = LoggerFactory.getLogger(HttpsExample.class);
private static final String UTF8 = "utf-8";
@@ -67,8 +66,7 @@ public class HttpsExample {
logger.info(result);
} catch (IOException e) {
- e.printStackTrace();
-
+ logger.error("Https ping rest api failed", e);
} finally {
try {
httpClient.close();
@@ -76,7 +74,7 @@ public class HttpsExample {
response.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Response close error", e);
}
}
}
@@ -104,15 +102,14 @@ public class HttpsExample {
String result = JsonParser.parseString(message).getAsJsonObject().toString();
logger.info(result);
} catch (IOException e) {
- e.printStackTrace();
-
+ logger.error("Https insertTablet rest api failed", e);
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Response close error", e);
}
}
}
@@ -130,14 +127,14 @@ public class HttpsExample {
ObjectMapper mapper = new ObjectMapper();
logger.info("message = {}", mapper.readValue(message, Map.class));
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Https query rest api failed", e);
} finally {
try {
if (response != null) {
response.close();
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Response close error", e);
}
}
}
diff --git a/example/rest-java-example/src/main/java/org/apache/iotdb/SSLClient.java b/example/rest-java-example/src/main/java/org/apache/iotdb/SSLClient.java
index e724b69d069..8366fa507b3 100644
--- a/example/rest-java-example/src/main/java/org/apache/iotdb/SSLClient.java
+++ b/example/rest-java-example/src/main/java/org/apache/iotdb/SSLClient.java
@@ -30,6 +30,8 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContextBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
@@ -38,7 +40,7 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
public class SSLClient {
-
+ private static Logger logger = LoggerFactory.getLogger(SSLClient.class);
private static SSLConnectionSocketFactory sslConnectionSocketFactory = null;
private static PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = null;
@@ -82,7 +84,7 @@ public class SSLClient {
poolingHttpClientConnectionManager = new PoolingHttpClientConnectionManager(registryBuilder);
poolingHttpClientConnectionManager.setMaxTotal(10);
} catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
- e.printStackTrace();
+ logger.error("Build error", e);
}
}
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
index c38b3f8330e..16902c050ee 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
@@ -30,6 +30,9 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -39,6 +42,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class SessionConcurrentExample {
+ private static final Logger logger = LoggerFactory.getLogger(SessionConcurrentExample.class);
private static final int SG_NUM = 20;
private static final int DEVICE_NUM = 100;
@@ -52,7 +56,7 @@ public class SessionConcurrentExample {
session.open(false);
createTemplate(session);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error("create template with Session error", e);
}
CountDownLatch latch = new CountDownLatch(SG_NUM * PARALLEL_DEGREE_FOR_ONE_SG);
@@ -68,7 +72,7 @@ public class SessionConcurrentExample {
try {
latch.await();
} catch (InterruptedException e) {
- e.printStackTrace();
+ logger.warn("CountDownLatch interrupted", e);
Thread.currentThread().interrupt();
}
}
@@ -79,7 +83,7 @@ public class SessionConcurrentExample {
try {
session.open(false);
} catch (IoTDBConnectionException e) {
- e.printStackTrace();
+ logger.error("Open Session error", e);
}
for (int j = 0; j < DEVICE_NUM; j++) {
@@ -88,14 +92,14 @@ public class SessionConcurrentExample {
session,
String.format("root.sg_%d.d_%d", currentIndex / PARALLEL_DEGREE_FOR_ONE_SG, j));
} catch (IoTDBConnectionException | StatementExecutionException e) {
- e.printStackTrace();
+ logger.error("Insert tablet error", e);
}
}
try {
session.close();
} catch (IoTDBConnectionException e) {
- e.printStackTrace();
+ logger.error("Close session error", e);
}
latch.countDown();
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java b/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
index e0b658427af..d593f889f54 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
@@ -26,6 +26,9 @@ import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.pool.SessionPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -33,6 +36,7 @@ import java.util.concurrent.Executors;
@SuppressWarnings({"squid:S106", "squid:S1144"})
public class SessionPoolExample {
+ private static final Logger logger = LoggerFactory.getLogger(SessionPoolExample.class);
private static SessionPool sessionPool;
private static ExecutorService service;
@@ -111,7 +115,7 @@ public class SessionPoolExample {
System.out.println(wrapper.next());
}
} catch (IoTDBConnectionException | StatementExecutionException e) {
- e.printStackTrace();
+ logger.error("Query by row record error", e);
} finally {
// remember to close data set finally!
sessionPool.closeResultSet(wrapper);
@@ -139,7 +143,7 @@ public class SessionPoolExample {
System.out.println(builder);
}
} catch (IoTDBConnectionException | StatementExecutionException e) {
- e.printStackTrace();
+ logger.error("Query by Iterator error", e);
} finally {
// remember to close data set finally!
sessionPool.closeResultSet(wrapper);
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
index 57d8deaf54d..bc0227f46fa 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
@@ -86,7 +86,7 @@ public class TsFileForceAppendWrite {
fwriter.doTruncate();
write(fwriter);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error("ForceAppendTsFileWriter truncate or write error ", e);
}
}
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
index bb0eb7c7731..3d42e9e0f03 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
@@ -31,6 +31,9 @@ import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@@ -47,6 +50,7 @@ import static org.apache.iotdb.tsfile.Constant.SENSOR_3;
* addMeasurement(MeasurementSchema measurementSchema) throws WriteProcessException
*/
public class TsFileWriteWithTSRecord {
+ private static final Logger logger = LoggerFactory.getLogger(TsFileWriteWithTSRecord.class);
public static void main(String[] args) {
try {
@@ -73,7 +77,7 @@ public class TsFileWriteWithTSRecord {
write(tsFileWriter, DEVICE_1, writeMeasurementScheams, 10000, 0, 0);
}
} catch (Exception e) {
- e.printStackTrace();
+ logger.error("TsFileWriteWithTSRecord meet error", e);
}
}
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java
index fd4e7dcd15c..e03f3b469a1 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java
@@ -53,7 +53,7 @@ public class EnvFactory {
break;
}
} catch (ClassNotFoundException e) {
- e.printStackTrace();
+ logger.error("Get env error", e);
System.exit(-1);
}
}
diff --git a/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java b/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java
index 889e7b5ae5d..6c20b0e12b4 100644
--- a/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java
+++ b/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/io/TsFileRecordWriter.java
@@ -28,10 +28,13 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
public class TsFileRecordWriter extends RecordWriter<NullWritable, TSRecord> {
+ private static final Logger logger = LoggerFactory.getLogger(TsFileRecordWriter.class);
private TsFileWriter tsFileWriter = null;
@@ -52,7 +55,7 @@ public class TsFileRecordWriter extends RecordWriter<NullWritable, TSRecord> {
try {
tsFileWriter.write(tsRecord);
} catch (WriteProcessException e) {
- e.printStackTrace();
+ logger.error("The TsFileWriter write error", e);
}
}
}
diff --git a/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/Executor.java b/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/Executor.java
index 35d969184e7..e61ef03d341 100755
--- a/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/Executor.java
+++ b/iotdb-connector/spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/Executor.java
@@ -22,12 +22,17 @@ import org.apache.iotdb.tsfile.read.TsFileReader;
import org.apache.iotdb.tsfile.read.expression.QueryExpression;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/** This class used to execute Queries on TSFile */
public class Executor {
+ private static final Logger logger = LoggerFactory.getLogger(Executor.class);
+
private Executor() {}
public static List<QueryDataSet> query(
@@ -39,7 +44,7 @@ public class Executor {
dataSets.add(queryDataSet);
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.error("Query error", e);
}
return dataSets;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
index 460bf3fe5c6..f4a6b2d8b04 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
@@ -193,8 +193,7 @@ public class SchemaEngine {
ISchemaRegion schemaRegion = future.get();
schemaRegionMap.put(schemaRegion.getSchemaRegionId(), schemaRegion);
} catch (ExecutionException | InterruptedException | RuntimeException e) {
- logger.error("Something wrong happened during SchemaRegion recovery: {}", e.getMessage());
- e.printStackTrace();
+ logger.error("Something wrong happened during SchemaRegion recovery", e);
}
}
schemaRegionRecoverPools.shutdown();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/SettleService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/SettleService.java
index 99baed7b1d4..a7622a27650 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/SettleService.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/SettleService.java
@@ -86,29 +86,13 @@ public class SettleService implements IService {
tmpSgResourcesMap.put(sgPath, tsFilePaths);
}
}
- // while (!StorageEngine.getInstance().isAllSgReady()) {
- // // wait for all sg ready
- // }
+
List<TsFileResource> seqResourcesToBeSettled = new ArrayList<>();
List<TsFileResource> unseqResourcesToBeSettled = new ArrayList<>();
- // for (Map.Entry<PartialPath, List<String>> entry : tmpSgResourcesMap.entrySet()) {
- // try {
- // StorageEngine.getInstance()
- // .getResourcesToBeSettled(
- // entry.getKey(),
- // seqResourcesToBeSettled,
- // unseqResourcesToBeSettled,
- // entry.getValue());
- // } catch (StorageEngineException e) {
- // e.printStackTrace();
- // } finally {
- // StorageEngine.getInstance().setSettling(entry.getKey(), false);
- // }
- // }
startSettling(seqResourcesToBeSettled, unseqResourcesToBeSettled);
setRecoverFinish(true);
} catch (WriteProcessException e) {
- e.printStackTrace();
+ logger.error("Start error", e);
}
}
diff --git a/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java b/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
index 5995d1d41da..41384bd31b5 100755
--- a/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
+++ b/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
@@ -258,7 +258,7 @@ public class FileGenerator {
try {
writeToTsFile(schema);
} catch (WriteProcessException e) {
- e.printStackTrace();
+ LOG.warn("Write to tsfile error", e);
}
LOG.info("write to file successfully!!");
}
@@ -337,7 +337,7 @@ public class FileGenerator {
try {
return new Scanner(file);
} catch (FileNotFoundException e) {
- e.printStackTrace();
+ LOG.warn("Get data from file {} error, will return null Scanner", path, e);
return null;
}
}