You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/02/16 09:11:44 UTC
[iotdb] 02/02: modify method invocation
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch errorLog
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 07613efb5e37f610ccde29d51faa61b752b8d551
Author: Alima777 <wx...@gmail.com>
AuthorDate: Wed Feb 16 17:10:40 2022 +0800
modify method invocation
---
.../apache/iotdb/db/service/thrift/impl/TSServiceImpl.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
index 884a136..f2142b6 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
@@ -157,7 +157,6 @@ import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onIoTDBException;
import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onNPEOrUnexpectedException;
import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onNonQueryException;
import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onQueryException;
-import static org.apache.iotdb.db.utils.ErrorHandlingUtils.tryCatchQueryException;
/** Thrift RPC implementation at server side. */
public class TSServiceImpl implements TSIService.Iface {
@@ -584,16 +583,10 @@ 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, "\"" + statement + "\". " + OperationType.EXECUTE_BATCH_STATEMENT);
+ if (status.getCode() != TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode()) {
isAllSuccessful = false;
- } else {
- result.add(
- onNPEOrUnexpectedException(
- e,
- "\"" + statement + "\". " + OperationType.EXECUTE_BATCH_STATEMENT,
- TSStatusCode.INTERNAL_SERVER_ERROR));
}
}
}