This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch mc_insert_block_11 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 82313f4de915a338a5fecd03a2721f9c8b867d49 Author: HTHou <[email protected]> AuthorDate: Thu Dec 3 10:11:42 2020 +0800 fix status code error --- .../apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 2 +- .../org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java index 609f625..4a995fa 100755 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java @@ -704,7 +704,7 @@ public class StorageGroupProcessor { blockInsertionIfReject(); } catch (WriteProcessException e) { TSStatus[] results = new TSStatus[insertTabletPlan.getRowCount()]; - Arrays.fill(results, RpcUtils.SUCCESS_STATUS); + Arrays.fill(results, RpcUtils.getStatus(TSStatusCode.WRITE_PROCESS_ERROR)); throw new BatchInsertionException(results); } } diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java index dd9b896..108628d 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java @@ -217,11 +217,11 @@ public class TsFileProcessor { if (workMemTable == null) { workMemTable = new PrimitiveMemTable(enableMemControl); } - if (enableMemControl) { - checkMemCostAndAddToTspInfo(insertTabletPlan, start, end); - } try { + if (enableMemControl) { + checkMemCostAndAddToTspInfo(insertTabletPlan, start, end); + } workMemTable.insertTablet(insertTabletPlan, start, end); if (IoTDBDescriptor.getInstance().getConfig().isEnableWal()) { insertTabletPlan.setStart(start);
