You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/02/17 01:22:30 UTC
[iotdb] branch rel/0.12 updated: [To rel/0.12] [IOTDB-2502] Remove redundant query warn log
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.12 by this push:
new 879cbfa [To rel/0.12] [IOTDB-2502] Remove redundant query warn log
879cbfa is described below
commit 879cbfa8fab0abb40fa1c557d7884ff707272b36
Author: Xiangwei Wei <34...@users.noreply.github.com>
AuthorDate: Thu Feb 17 09:14:26 2022 +0800
[To rel/0.12] [IOTDB-2502] Remove redundant query warn log
---
.../java/org/apache/iotdb/db/service/TSServiceImpl.java | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 449e75c..431e687 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -722,15 +722,11 @@ public class TSServiceImpl implements TSIService.Iface {
}
} catch (Exception e) {
LOGGER.error("Error occurred when executing executeBatchStatement: ", e);
- TSStatus status = tryCatchQueryException(e);
- if (status != null) {
- result.add(status);
+ TSStatus status = onQueryException(e, "executing " + statement);
+ if (status.getCode() != TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode()) {
isAllSuccessful = false;
- } else {
- result.add(
- onNPEOrUnexpectedException(
- e, "executing " + statement, TSStatusCode.INTERNAL_SERVER_ERROR));
}
+ result.add(status);
}
}
Measurement.INSTANCE.addOperationLatency(Operation.EXECUTE_JDBC_BATCH, t1);
@@ -1972,26 +1968,20 @@ public class TSServiceImpl implements TSIService.Iface {
}
if (e instanceof QueryTimeoutRuntimeException) {
- DETAILED_FAILURE_QUERY_TRACE_LOGGER.warn(e.getMessage(), e);
return RpcUtils.getStatus(TSStatusCode.TIME_OUT, rootCause.getMessage());
} else if (e instanceof ParseCancellationException) {
- DETAILED_FAILURE_QUERY_TRACE_LOGGER.warn(INFO_PARSING_SQL_ERROR, e);
return RpcUtils.getStatus(
TSStatusCode.SQL_PARSE_ERROR, INFO_PARSING_SQL_ERROR + rootCause.getMessage());
} else if (e instanceof SQLParserException) {
- DETAILED_FAILURE_QUERY_TRACE_LOGGER.warn(INFO_CHECK_METADATA_ERROR, e);
return RpcUtils.getStatus(
TSStatusCode.METADATA_ERROR, INFO_CHECK_METADATA_ERROR + rootCause.getMessage());
} else if (e instanceof QueryProcessException) {
- DETAILED_FAILURE_QUERY_TRACE_LOGGER.warn(INFO_QUERY_PROCESS_ERROR, e);
return RpcUtils.getStatus(
TSStatusCode.QUERY_PROCESS_ERROR, INFO_QUERY_PROCESS_ERROR + rootCause.getMessage());
} else if (e instanceof QueryInBatchStatementException) {
- DETAILED_FAILURE_QUERY_TRACE_LOGGER.warn(INFO_NOT_ALLOWED_IN_BATCH_ERROR, e);
return RpcUtils.getStatus(
TSStatusCode.QUERY_NOT_ALLOWED, INFO_NOT_ALLOWED_IN_BATCH_ERROR + rootCause.getMessage());
} else if (e instanceof IoTDBException) {
- DETAILED_FAILURE_QUERY_TRACE_LOGGER.warn(INFO_QUERY_PROCESS_ERROR, e);
return RpcUtils.getStatus(((IoTDBException) e).getErrorCode(), rootCause.getMessage());
}
return null;