You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by er...@apache.org on 2022/06/24 07:07:53 UTC

[iotdb] 01/01: Make InconsistentDataException as a RuntimeException

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

ericpai pushed a commit to branch bugfix/inconsisten-exception
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit d38352137aefb62dc4d94d60802b524fc6cd3ccd
Author: ericpai <er...@hotmail.com>
AuthorDate: Fri Jun 24 15:01:08 2022 +0800

    Make InconsistentDataException as a RuntimeException
---
 .../{runtime => exception}/InconsistentDataException.java    |  5 ++---
 .../ParallelRequestTimeoutException.java}                    | 12 ++++--------
 .../apache/iotdb/itbase/runtime/ParallelRequestDelegate.java |  7 +++----
 .../org/apache/iotdb/itbase/runtime/RequestDelegate.java     |  2 ++
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java b/integration-test/src/main/java/org/apache/iotdb/itbase/exception/InconsistentDataException.java
similarity index 88%
copy from integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java
copy to integration-test/src/main/java/org/apache/iotdb/itbase/exception/InconsistentDataException.java
index a6c49c242b..51a29adb14 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/exception/InconsistentDataException.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.itbase.runtime;
+package org.apache.iotdb.itbase.exception;
 
-import java.sql.SQLException;
 import java.util.List;
 
-public class InconsistentDataException extends SQLException {
+public class InconsistentDataException extends RuntimeException {
 
   public <T> InconsistentDataException(List<T> data, List<String> endpoints) {
     super(String.format("Datasets are inconsistent: %s with data %s", endpoints, data));
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java b/integration-test/src/main/java/org/apache/iotdb/itbase/exception/ParallelRequestTimeoutException.java
similarity index 71%
rename from integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java
rename to integration-test/src/main/java/org/apache/iotdb/itbase/exception/ParallelRequestTimeoutException.java
index a6c49c242b..7c6537e7db 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/InconsistentDataException.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/exception/ParallelRequestTimeoutException.java
@@ -16,14 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.itbase.runtime;
+package org.apache.iotdb.itbase.exception;
 
-import java.sql.SQLException;
-import java.util.List;
-
-public class InconsistentDataException extends SQLException {
-
-  public <T> InconsistentDataException(List<T> data, List<String> endpoints) {
-    super(String.format("Datasets are inconsistent: %s with data %s", endpoints, data));
+public class ParallelRequestTimeoutException extends RuntimeException {
+  public ParallelRequestTimeoutException(String message, Throwable throwable) {
+    super(message, throwable);
   }
 }
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ParallelRequestDelegate.java b/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ParallelRequestDelegate.java
index 9760e8e275..1cbd6636b0 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ParallelRequestDelegate.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/ParallelRequestDelegate.java
@@ -19,8 +19,7 @@
 package org.apache.iotdb.itbase.runtime;
 
 import org.apache.iotdb.it.env.EnvFactory;
-
-import org.junit.Assert;
+import org.apache.iotdb.itbase.exception.ParallelRequestTimeoutException;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -61,8 +60,8 @@ public class ParallelRequestDelegate<T> extends RequestDelegate<T> {
         for (int j = i; j < getEndpoints().size(); j++) {
           resultFutures.get(j).cancel(true);
         }
-        logger.error("Waiting for query results of {} timeout", getEndpoints().get(i), e);
-        Assert.fail(String.format("Test failed by timeout of %s", getEndpoints().get(i)));
+        throw new ParallelRequestTimeoutException(
+            String.format("Waiting for query results of %s timeout", getEndpoints().get(i)), e);
       }
     }
     handleExceptions(exceptions);
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestDelegate.java b/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestDelegate.java
index 2b0e1743e4..c2211f6b06 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestDelegate.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestDelegate.java
@@ -18,6 +18,8 @@
  */
 package org.apache.iotdb.itbase.runtime;
 
+import org.apache.iotdb.itbase.exception.InconsistentDataException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;