From 55b856fa88e4e8235e6f94e64fa7ab5b496cdbe3 Mon Sep 17 00:00:00 2001 From: dengzhiwen1 Date: Mon, 26 Sep 2022 19:47:51 +0800 Subject: [PATCH] fix npe when dispatchRemote --- .../db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java | 3 ++- .../iotdb/db/service/thrift/impl/DataNodeRegionManager.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java index e1d01c975340b..a76aad79652c0 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -264,7 +264,8 @@ private void dispatchLocally(FragmentInstance instance) throws FragmentInstanceD try { SchemaValidator.validate(insertNode); } catch (SemanticException e) { - throw new FragmentInstanceDispatchException(e); + throw new FragmentInstanceDispatchException( + RpcUtils.getStatus(TSStatusCode.METADATA_ERROR.getStatusCode(), e.getMessage())); } hasFailedMeasurement = insertNode.hasFailedMeasurements(); if (hasFailedMeasurement) { diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRegionManager.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRegionManager.java index 574ac8be54d00..e82b25f1f17b8 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRegionManager.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeRegionManager.java @@ -128,6 +128,8 @@ private TSendPlanNodeResp executeDataInsert(DataRegionId dataRegionId, InsertNod SchemaValidator.validate(insertNode); } catch (SemanticException e) { response.setAccepted(false); + response.setStatus( + RpcUtils.getStatus(TSStatusCode.METADATA_ERROR.getStatusCode(), e.getMessage())); response.setMessage(e.getMessage()); return response; }