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/11/15 08:21:51 UTC
(iotdb) branch master updated: return WRITE_PROCESS_ERROR when catching BatchProcessException in writing process (#11543)
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 f1fc5b1de10 return WRITE_PROCESS_ERROR when catching BatchProcessException in writing process (#11543)
f1fc5b1de10 is described below
commit f1fc5b1de1047b3413d15d6643c7b5bf47650346
Author: Zhang.Jinrui <xi...@gmail.com>
AuthorDate: Wed Nov 15 16:21:44 2023 +0800
return WRITE_PROCESS_ERROR when catching BatchProcessException in writing process (#11543)
---
.../db/consensus/statemachine/dataregion/DataExecutionVisitor.java | 4 ++--
.../java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java
index a5faea10f5f..17059ff5fc6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java
@@ -84,7 +84,7 @@ public class DataExecutionVisitor extends PlanVisitor<TSStatus, DataRegion> {
node.getTimes()[0],
node.getMeasurements(),
e.getFailingStatus());
- return StatusUtils.getStatus(TSStatusCode.representOf(e.getErrorCode()));
+ return new TSStatus(TSStatusCode.WRITE_PROCESS_ERROR.getStatusCode());
}
}
@@ -197,7 +197,7 @@ public class DataExecutionVisitor extends PlanVisitor<TSStatus, DataRegion> {
return StatusUtils.OK;
} catch (IOException e) {
LOGGER.error("Error in executing plan node: {}", node, e);
- return StatusUtils.EXECUTE_STATEMENT_ERROR;
+ return new TSStatus(TSStatusCode.WRITE_PROCESS_ERROR.getStatusCode());
}
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index d0d8a7131fa..f163a7d61ab 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -2864,7 +2864,7 @@ public class DataRegion implements IDataRegionForQuery {
} catch (WriteProcessException | BatchProcessException e) {
insertMultiTabletsNode
.getResults()
- .put(i, RpcUtils.getStatus(e.getErrorCode(), e.getMessage()));
+ .put(i, new TSStatus(TSStatusCode.WRITE_PROCESS_ERROR.getStatusCode()));
}
}