This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/AllowRetry in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b81dd56c44c0778e9312e080ebf39c21fc22c8a4 Author: JackieTien97 <[email protected]> AuthorDate: Tue Aug 13 09:52:46 2024 +0800 fix compilation --- .../db/exception/metadata/AliasAlreadyExistException.java | 4 ++-- .../db/exception/metadata/AlignedTimeseriesException.java | 7 ++++--- .../db/exception/metadata/DatabaseNotSetException.java | 12 +++++++----- .../metadata/IllegalParameterOfPathException.java | 7 ++++--- .../metadata/MeasurementAlreadyExistException.java | 4 ++-- .../db/exception/metadata/PathAlreadyExistException.java | 4 ++-- .../metadata/template/TemplateIncompatibleException.java | 11 +++++------ .../execution/fragment/FragmentInstanceManager.java | 8 ++++++-- .../execution/schedule/queue/IndexedBlockingQueue.java | 3 ++- .../iotdb/commons/exception/IllegalPathException.java | 14 ++++++++------ .../iotdb/commons/exception/IllegalPrivilegeException.java | 11 +++++------ .../org/apache/iotdb/commons/exception/IoTDBException.java | 4 ++-- 12 files changed, 49 insertions(+), 40 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java index 2df35dead3d..9b8dcd7ca69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AliasAlreadyExistException.java @@ -30,7 +30,7 @@ public class AliasAlreadyExistException extends MetadataException { public AliasAlreadyExistException(String path, String alias) { super( String.format("Alias [%s] for Path [%s] already exist", alias, path), - TSStatusCode.ALIAS_ALREADY_EXIST.getStatusCode()); - this.isUserException = true; + TSStatusCode.ALIAS_ALREADY_EXIST.getStatusCode(), + true); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AlignedTimeseriesException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AlignedTimeseriesException.java index 1594d6b203b..f11c986afdc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AlignedTimeseriesException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/AlignedTimeseriesException.java @@ -25,8 +25,9 @@ import org.apache.iotdb.rpc.TSStatusCode; public class AlignedTimeseriesException extends MetadataException { public AlignedTimeseriesException(String message, String path) { - super(String.format("%s (Path: %s)", message, path)); - errorCode = TSStatusCode.ALIGNED_TIMESERIES_ERROR.getStatusCode(); - this.isUserException = true; + super( + String.format("%s (Path: %s)", message, path), + TSStatusCode.ALIGNED_TIMESERIES_ERROR.getStatusCode(), + true); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/DatabaseNotSetException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/DatabaseNotSetException.java index ef395f5de48..7e700c117e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/DatabaseNotSetException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/DatabaseNotSetException.java @@ -27,14 +27,16 @@ public class DatabaseNotSetException extends MetadataException { private static final long serialVersionUID = 3739300272099030533L; public DatabaseNotSetException(String path) { - super(String.format("Database is not set for current seriesPath: [%s]", path)); - this.errorCode = TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(); + super( + String.format("Database is not set for current seriesPath: [%s]", path), + TSStatusCode.DATABASE_NOT_EXIST.getStatusCode()); } public DatabaseNotSetException(String path, boolean isUserException) { - super(String.format("Database is not set for current seriesPath: [%s]", path)); - this.isUserException = isUserException; - this.errorCode = TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(); + super( + String.format("Database is not set for current seriesPath: [%s]", path), + TSStatusCode.DATABASE_NOT_EXIST.getStatusCode(), + isUserException); } public DatabaseNotSetException(String path, String reason) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/IllegalParameterOfPathException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/IllegalParameterOfPathException.java index febe7b000b9..9ae6e79f406 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/IllegalParameterOfPathException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/IllegalParameterOfPathException.java @@ -25,8 +25,9 @@ import org.apache.iotdb.rpc.TSStatusCode; public class IllegalParameterOfPathException extends MetadataException { public IllegalParameterOfPathException(String msg, String path) { - super(String.format("%s. Failed to create timeseries for path %s", msg, path)); - errorCode = TSStatusCode.ILLEGAL_PARAMETER.getStatusCode(); - this.isUserException = true; + super( + String.format("%s. Failed to create timeseries for path %s", msg, path), + TSStatusCode.ILLEGAL_PARAMETER.getStatusCode(), + true); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java index 3b63c01eeff..a3d5adabac8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/MeasurementAlreadyExistException.java @@ -31,8 +31,8 @@ public class MeasurementAlreadyExistException extends MetadataException { public MeasurementAlreadyExistException(String path, MeasurementPath measurementPath) { super( String.format("Path [%s] already exist", path), - TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode()); - this.isUserException = true; + TSStatusCode.TIMESERIES_ALREADY_EXIST.getStatusCode(), + true); this.measurementPath = measurementPath; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java index d91ea75dba0..5da3c957cba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/PathAlreadyExistException.java @@ -30,7 +30,7 @@ public class PathAlreadyExistException extends MetadataException { public PathAlreadyExistException(String path) { super( String.format("Path [%s] already exist", path), - TSStatusCode.PATH_ALREADY_EXIST.getStatusCode()); - this.isUserException = true; + TSStatusCode.PATH_ALREADY_EXIST.getStatusCode(), + true); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateIncompatibleException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateIncompatibleException.java index bb1d0c1a997..cc39a3b50b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateIncompatibleException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/metadata/template/TemplateIncompatibleException.java @@ -32,8 +32,8 @@ public class TemplateIncompatibleException extends MetadataException { String.format( "Cannot create timeseries [%s] since device template [%s] already set on path [%s].", path, templateName, templateSetPath), - TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode()); - this.isUserException = true; + TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode(), + true); } public TemplateIncompatibleException(String templateName, PartialPath templateSetPath) { @@ -42,12 +42,11 @@ public class TemplateIncompatibleException extends MetadataException { "Cannot set device template [%s] to path [%s] " + "since there's timeseries under path [%s].", templateName, templateSetPath, templateSetPath), - TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode()); - this.isUserException = true; + TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode(), + true); } public TemplateIncompatibleException(String reason) { - super(reason, TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode()); - this.isUserException = true; + super(reason, TSStatusCode.TEMPLATE_INCOMPATIBLE.getStatusCode(), true); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java index de6adc98ae3..0886cb406bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java @@ -267,9 +267,13 @@ public class FragmentInstanceManager { } catch (Throwable t) { clearFIRelatedResources(instanceId); // deal with - if (t instanceof IllegalStateException && TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG.equals(t.getMessage())) { + if (t instanceof IllegalStateException + && TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG.equals(t.getMessage())) { logger.warn(TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG); - stateMachine.failed(new IoTDBException(TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG, TOO_MANY_CONCURRENT_QUERIES_ERROR.getStatusCode())); + stateMachine.failed( + new IoTDBException( + TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG, + TOO_MANY_CONCURRENT_QUERIES_ERROR.getStatusCode())); } else { logger.warn("Execute error caused by ", t); stateMachine.failed(t); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingQueue.java index 019b6db17ca..632b5b48ed6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/IndexedBlockingQueue.java @@ -38,7 +38,8 @@ import com.google.common.base.Preconditions; */ public abstract class IndexedBlockingQueue<E extends IDIndexedAccessible> { - public static final String TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG = "The system can't allow more queries."; + public static final String TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG = + "The system can't allow more queries."; protected final int capacity; protected final E queryHolder; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPathException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPathException.java index f1c46742cc5..1332284ec0e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPathException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPathException.java @@ -25,14 +25,16 @@ public class IllegalPathException extends MetadataException { private static final long serialVersionUID = 2693272249167539978L; public IllegalPathException(String path) { - super(String.format("%s is not a legal path", path)); - errorCode = TSStatusCode.ILLEGAL_PATH.getStatusCode(); - this.isUserException = true; + super( + String.format("%s is not a legal path", path), + TSStatusCode.ILLEGAL_PATH.getStatusCode(), + true); } public IllegalPathException(String path, String reason) { - super(String.format("%s is not a legal path, because %s", path, reason)); - errorCode = TSStatusCode.ILLEGAL_PATH.getStatusCode(); - this.isUserException = true; + super( + String.format("%s is not a legal path, because %s", path, reason), + TSStatusCode.ILLEGAL_PATH.getStatusCode(), + true); } } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPrivilegeException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPrivilegeException.java index 475edefaaee..da8a4ae7815 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPrivilegeException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IllegalPrivilegeException.java @@ -26,14 +26,13 @@ public class IllegalPrivilegeException extends MetadataException { private static final long serialVersionUID = 2693272249167539978L; public IllegalPrivilegeException(Integer priv) { - super(String.format("%s is not a legal privilege", PrivilegeType.values()[priv].toString())); - errorCode = TSStatusCode.ILLEGAL_PRIVILEGE.getStatusCode(); - this.isUserException = true; + super( + String.format("%s is not a legal privilege", PrivilegeType.values()[priv].toString()), + TSStatusCode.ILLEGAL_PRIVILEGE.getStatusCode(), + true); } public IllegalPrivilegeException(String reason) { - super(String.format("%s", reason)); - errorCode = TSStatusCode.ILLEGAL_PATH.getStatusCode(); - this.isUserException = true; + super(String.format("%s", reason), TSStatusCode.ILLEGAL_PATH.getStatusCode(), true); } } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IoTDBException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IoTDBException.java index a5f8104e072..3fca9bc6210 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IoTDBException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/IoTDBException.java @@ -23,13 +23,13 @@ package org.apache.iotdb.commons.exception; public class IoTDBException extends Exception { private static final long serialVersionUID = 8480450962311247736L; - protected final int errorCode; + private final int errorCode; /** * This kind of exception is caused by users' wrong sql, and there is no need for server to print * the full stack of the exception */ - protected final boolean isUserException; + private final boolean isUserException; public IoTDBException(String message, int errorCode) { super(message);
