Fix createView NPE issue when region migration #14746 (#14747)

Signed-off-by: OneSizeFitQuorum <tanxinyu@apache.org>
apache · Jan 22, 2025 · ec84ae1 · ec84ae1
1 parent b8fa0b6
commit ec84ae1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...atanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeRegionManager.java b/...atanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeRegionManager.java
@@ -100,8 +100,8 @@ private DataNodeRegionManager() {}
 
   public ReentrantReadWriteLock getRegionLock(ConsensusGroupId consensusGroupId) {
     return consensusGroupId instanceof DataRegionId
-        ? dataRegionLockMap.get((DataRegionId) consensusGroupId)
-        : schemaRegionLockMap.get((SchemaRegionId) consensusGroupId);
+        ? dataRegionLockMap.get(consensusGroupId)
+        : schemaRegionLockMap.get(consensusGroupId);
   }
 
   public TSStatus createSchemaRegion(TRegionReplicaSet regionReplicaSet, String storageGroup) {

diff --git a/...src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java b/...src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java
@@ -143,9 +143,14 @@ public RegionWriteExecutor(
   @SuppressWarnings("squid:S1181")
   public RegionExecutionResult execute(ConsensusGroupId groupId, PlanNode planNode) {
     try {
-      WritePlanNodeExecutionContext context =
-          new WritePlanNodeExecutionContext(groupId, regionManager.getRegionLock(groupId));
-      return planNode.accept(executionVisitor, context);
+      ReentrantReadWriteLock lock = regionManager.getRegionLock(groupId);
+      if (lock == null) {
+        return RegionExecutionResult.create(
+            false,
+            "Failed to get the lock of the region because the region is not existed.",
+            RpcUtils.getStatus(TSStatusCode.NO_AVAILABLE_REGION_GROUP));
+      }
+      return planNode.accept(executionVisitor, new WritePlanNodeExecutionContext(groupId, lock));
     } catch (Throwable e) {
       LOGGER.warn(e.getMessage(), e);
       return RegionExecutionResult.create(