[iotdb] branch master updated: Fix schema region recover bug (#7696)

[zyk]

This is an automated email from the ASF dual-hosted git repository.

zyk 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 631fad8860 Fix schema region recover bug (#7696)
631fad8860 is described below

commit 631fad88601fd32d35cb04f29778889716a38489
Author: Marcos_Zyk <38524330+marcos...@users.noreply.github.com>
AuthorDate: Sun Oct 23 16:19:52 2022 +0800

    Fix schema region recover bug (#7696)
---
 .../plan/schemaregion/impl/ActivateTemplateInClusterPlanImpl.java | 8 ++++----
 .../plan/schemaregion/write/IActivateTemplateInClusterPlan.java   | 4 ++--
 .../iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java    | 2 +-
 .../db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java      | 2 +-
 .../iotdb/db/qp/physical/sys/ActivateTemplateInClusterPlan.java   | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/ActivateTemplateInClusterPlanImpl.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/ActivateTemplateInClusterPlanImpl.java
index 39070aa709..cb6b60232b 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/ActivateTemplateInClusterPlanImpl.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/ActivateTemplateInClusterPlanImpl.java
@@ -53,8 +53,8 @@ public class ActivateTemplateInClusterPlanImpl implements 
IActivateTemplateInClu
   }
 
   @Override
-  public void setTemplateId(int templateSetLevel) {
-    this.templateSetLevel = templateSetLevel;
+  public void setTemplateId(int templateId) {
+    this.templateId = templateId;
   }
 
   @Override
@@ -63,8 +63,8 @@ public class ActivateTemplateInClusterPlanImpl implements 
IActivateTemplateInClu
   }
 
   @Override
-  public void setTemplateSetLevel(int templateId) {
-    this.templateId = templateId;
+  public void setTemplateSetLevel(int templateSetLevel) {
+    this.templateSetLevel = templateSetLevel;
   }
 
   @Override
diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/IActivateTemplateInClusterPlan.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/IActivateTemplateInClusterPlan.java
index f11a23a4d6..955961f5af 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/IActivateTemplateInClusterPlan.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/write/IActivateTemplateInClusterPlan.java
@@ -44,11 +44,11 @@ public interface IActivateTemplateInClusterPlan extends 
ISchemaRegionPlan {
 
   int getTemplateSetLevel();
 
-  void setTemplateSetLevel(int templateId);
+  void setTemplateSetLevel(int templateSetLevel);
 
   int getTemplateId();
 
-  void setTemplateId(int templateSetLevel);
+  void setTemplateId(int templateId);
 
   boolean isAligned();
 
diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
index d787ec70f1..b55db20d7b 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
@@ -2128,7 +2128,7 @@ public class SchemaRegionMemoryImpl implements 
ISchemaRegion {
     }
 
     private boolean isFailed() {
-      return e == null;
+      return e != null;
     }
 
     private Exception getException() {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
index 13932d2449..df28bc01da 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
@@ -1988,7 +1988,7 @@ public class SchemaRegionSchemaFileImpl implements 
ISchemaRegion {
     }
 
     private boolean isFailed() {
-      return e == null;
+      return e != null;
     }
 
     private Exception getException() {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplateInClusterPlan.java
 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplateInClusterPlan.java
index 5b6484ba6e..f877f1dc19 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplateInClusterPlan.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ActivateTemplateInClusterPlan.java
@@ -70,8 +70,8 @@ public class ActivateTemplateInClusterPlan extends 
PhysicalPlan
   }
 
   @Override
-  public void setTemplateId(int templateSetLevel) {
-    this.templateSetLevel = templateSetLevel;
+  public void setTemplateId(int templateId) {
+    this.templateId = templateId;
   }
 
   public int getTemplateSetLevel() {
@@ -79,8 +79,8 @@ public class ActivateTemplateInClusterPlan extends 
PhysicalPlan
   }
 
   @Override
-  public void setTemplateSetLevel(int templateId) {
-    this.templateId = templateId;
+  public void setTemplateSetLevel(int templateSetLevel) {
+    this.templateSetLevel = templateSetLevel;
   }
 
   public boolean isAligned() {