better

thulab · Dec 13, 2023 · b73b35d · b73b35d
1 parent 80e9ccb
commit b73b35d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/core/src/main/java/cn/edu/tsinghua/iot/benchmark/mode/TestWithDefaultPathMode.java b/core/src/main/java/cn/edu/tsinghua/iot/benchmark/mode/TestWithDefaultPathMode.java
@@ -45,8 +45,15 @@ protected boolean preCheck() {
     if (config.isIS_DOUBLE_WRITE()) {
       dbConfigs.add(config.getANOTHER_DBConfig());
     }
-    return cleanUpData(dbConfigs, measurement)
-        && (!config.isCREATE_SCHEMA() || registerSchema(measurement));
+    if (!cleanUpData(dbConfigs, measurement)) {
+      return false;
+    }
+    if (config.isCREATE_SCHEMA()) {
+      if (!registerSchema(measurement)) {
+        return false;
+      }
+    }
+    return true;
   }
 
   @Override

diff --git a/core/src/main/java/cn/edu/tsinghua/iot/benchmark/mode/VerificationWriteMode.java b/core/src/main/java/cn/edu/tsinghua/iot/benchmark/mode/VerificationWriteMode.java
@@ -40,8 +40,15 @@ protected boolean preCheck() {
     if (config.isIS_DOUBLE_WRITE()) {
       dbConfigs.add(config.getANOTHER_DBConfig());
     }
-    return cleanUpData(dbConfigs, measurement)
-        && (!config.isCREATE_SCHEMA() || registerSchema(measurement));
+    if (!cleanUpData(dbConfigs, measurement)) {
+      return false;
+    }
+    if (config.isCREATE_SCHEMA()) {
+      if (!registerSchema(measurement)) {
+        return false;
+      }
+    }
+    return true;
   }
 
   @Override