[iotdb] branch master updated: [ISSUE-7430] Fix npe when dispatchRemote (#7439)

[haonan]

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 09f3510ce8 [ISSUE-7430] Fix npe when dispatchRemote (#7439)
09f3510ce8 is described below

commit 09f3510ce8a5c1203128621b57e3aee47549fe6f
Author: cserwen <cser...@apache.org>
AuthorDate: Tue Sep 27 15:31:29 2022 +0800

    [ISSUE-7430] Fix npe when dispatchRemote (#7439)
    
    Co-authored-by: dengzhiwen1 <dengzhiw...@xiaomi.com>
---
 .../iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java    | 3 ++-
 .../org/apache/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 e1d01c9753..a76aad7965 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 @@ public class FragmentInstanceDispatcherImpl implements 
IFragInstanceDispatcher {
           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 574ac8be54..e82b25f1f1 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 @@ public class DataNodeRegionManager {
         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;
       }