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/06/13 03:19:29 UTC
[iotdb] 01/01: fix the issue that AutoCreateTimeSeries throws NPE
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/fix_null_queryExecution
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2adf4d4e8356c98c812531d8bb1f6891a6239a51
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Mon Jun 13 11:19:17 2022 +0800
fix the issue that AutoCreateTimeSeries throws NPE
---
.../db/mpp/plan/analyze/ClusterSchemaFetcher.java | 33 ++++++++--------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
index a3867c174a..cf7c6bb9af 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
@@ -329,15 +329,10 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
ExecutionResult executionResult =
coordinator.execute(statement, queryId, null, "", partitionFetcher, this);
// TODO: throw exception
- try {
- int statusCode = executionResult.status.getCode();
- if (statusCode != TSStatusCode.SUCCESS_STATUS.getStatusCode()
- && statusCode != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
- throw new RuntimeException(
- "cannot auto create schema, status is: " + executionResult.status);
- }
- } finally {
- coordinator.getQueryExecution(queryId).stopAndCleanup();
+ int statusCode = executionResult.status.getCode();
+ if (statusCode != TSStatusCode.SUCCESS_STATUS.getStatusCode()
+ && statusCode != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
+ throw new RuntimeException("cannot auto create schema, status is: " + executionResult.status);
}
}
@@ -347,20 +342,16 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
ExecutionResult executionResult =
coordinator.execute(statement, queryId, null, "", partitionFetcher, this);
// TODO: throw exception
- try {
- int statusCode = executionResult.status.getCode();
- if (statusCode == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- return;
- }
+ int statusCode = executionResult.status.getCode();
+ if (statusCode == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ return;
+ }
- for (TSStatus subStatus : executionResult.status.subStatus) {
- if (subStatus.code != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
- throw new RuntimeException(
- "cannot auto create schema, status is: " + executionResult.status);
- }
+ for (TSStatus subStatus : executionResult.status.subStatus) {
+ if (subStatus.code != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
+ throw new RuntimeException(
+ "cannot auto create schema, status is: " + executionResult.status);
}
- } finally {
- coordinator.getQueryExecution(queryId).stopAndCleanup();
}
}