This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 84c05545bad Add MetaDataPersistException and rename
ClusterPersistRepositoryException to ClusterRepositoryPersistException (#32328)
84c05545bad is described below
commit 84c05545bad644e9f6122d9b664324336e8e8a69
Author: Haoran Meng <[email protected]>
AuthorDate: Tue Jul 30 14:09:27 2024 +0800
Add MetaDataPersistException and rename ClusterPersistRepositoryException
to ClusterRepositoryPersistException (#32328)
---
.../mode/exception/MetaDataPersistException.java} | 16 +++++++---------
.../cluster/persist/ReservationPersistService.java | 4 ++--
...ption.java => ClusterRepositoryPersistException.java} | 10 +++++-----
.../cluster/zookeeper/ZookeeperRepository.java | 4 ++--
.../zookeeper/handler/ZookeeperExceptionHandler.java | 6 +++---
.../zookeeper/handler/ZookeeperExceptionHandlerTest.java | 4 ++--
6 files changed, 21 insertions(+), 23 deletions(-)
diff --git
a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterPersistRepositoryException.java
b/mode/api/src/main/java/org/apache/shardingsphere/mode/exception/MetaDataPersistException.java
similarity index 65%
copy from
mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterPersistRepositoryException.java
copy to
mode/api/src/main/java/org/apache/shardingsphere/mode/exception/MetaDataPersistException.java
index c2d7ee1e3a9..50d6b757331 100644
---
a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterPersistRepositoryException.java
+++
b/mode/api/src/main/java/org/apache/shardingsphere/mode/exception/MetaDataPersistException.java
@@ -15,19 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.repository.cluster.exception;
+package org.apache.shardingsphere.mode.exception;
-import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
-import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.ClusterSQLException;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.SQLState;
+import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.MetaDataSQLException;
/**
- * Cluster persist repository exception.
+ * Meta data persist exception.
*/
-public final class ClusterPersistRepositoryException extends
ClusterSQLException {
+public abstract class MetaDataPersistException extends MetaDataSQLException {
- private static final long serialVersionUID = -6417179023552012152L;
-
- public ClusterPersistRepositoryException(final Exception cause) {
- super(XOpenSQLState.GENERAL_ERROR, 10, cause, "Cluster persist
repository error.");
+ protected MetaDataPersistException(final SQLState sqlState, final int
errorCode, final Exception cause, final String reason, final Object...
messageArgs) {
+ super(sqlState, errorCode, cause, reason, messageArgs);
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ReservationPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ReservationPersistService.java
index 90058e37eb1..390d0a76b05 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ReservationPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ReservationPersistService.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.persist;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.metadata.persist.node.ReservationNode;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
+import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;
import java.util.Optional;
@@ -42,7 +42,7 @@ public final class ReservationPersistService {
public Optional<Integer> reserveWorkerId(final Integer
preselectedWorkerId, final String instanceId) {
try {
return
repository.persistExclusiveEphemeral(ReservationNode.getWorkerIdReservationPath(preselectedWorkerId),
instanceId) ? Optional.of(preselectedWorkerId) : Optional.empty();
- } catch (final ClusterPersistRepositoryException ignore) {
+ } catch (final ClusterRepositoryPersistException ignore) {
return Optional.empty();
}
}
diff --git
a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterPersistRepositoryException.java
b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterRepositoryPersistException.java
similarity index 73%
rename from
mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterPersistRepositoryException.java
rename to
mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterRepositoryPersistException.java
index c2d7ee1e3a9..160bfe8fef7 100644
---
a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterPersistRepositoryException.java
+++
b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/exception/ClusterRepositoryPersistException.java
@@ -18,16 +18,16 @@
package org.apache.shardingsphere.mode.repository.cluster.exception;
import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
-import
org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.ClusterSQLException;
+import org.apache.shardingsphere.mode.exception.MetaDataPersistException;
/**
- * Cluster persist repository exception.
+ * Cluster repository persist exception.
*/
-public final class ClusterPersistRepositoryException extends
ClusterSQLException {
+public final class ClusterRepositoryPersistException extends
MetaDataPersistException {
private static final long serialVersionUID = -6417179023552012152L;
- public ClusterPersistRepositoryException(final Exception cause) {
- super(XOpenSQLState.GENERAL_ERROR, 10, cause, "Cluster persist
repository error.");
+ public ClusterRepositoryPersistException(final Exception cause) {
+ super(XOpenSQLState.GENERAL_ERROR, 10, cause, "Cluster repository
persist error.");
}
}
diff --git
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
index 3c07176bfa5..bd46fc4c1ae 100644
---
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
-import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
+import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
import
org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
import
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.ZookeeperExceptionHandler;
@@ -180,7 +180,7 @@ public final class ZookeeperRepository implements
ClusterPersistRepository {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- throw new ClusterPersistRepositoryException(ex);
+ throw new ClusterRepositoryPersistException(ex);
}
}
diff --git
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
index 008f01dc3b4..d04bc5aca18 100644
---
a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandler.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
+import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;
import org.apache.zookeeper.KeeperException.ConnectionLossException;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.KeeperException.NodeExistsException;
@@ -38,7 +38,7 @@ public final class ZookeeperExceptionHandler {
* <p>Ignore interrupt and connection invalid exception.</p>
*
* @param cause to be handled exception
- * @throws ClusterPersistRepositoryException cluster persist repository
exception
+ * @throws ClusterRepositoryPersistException cluster persist repository
exception
*/
public static void handleException(final Exception cause) {
if (null == cause) {
@@ -51,7 +51,7 @@ public final class ZookeeperExceptionHandler {
log.info("InterruptedException caught");
Thread.currentThread().interrupt();
} else {
- throw new ClusterPersistRepositoryException(cause);
+ throw new ClusterRepositoryPersistException(cause);
}
}
diff --git
a/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
index 6be7ce6de2e..9fd418e7616 100644
---
a/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
+++
b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/handler/ZookeeperExceptionHandlerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler;
-import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
+import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ class ZookeeperExceptionHandlerTest {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- assertThat(ex,
instanceOf(ClusterPersistRepositoryException.class));
+ assertThat(ex,
instanceOf(ClusterRepositoryPersistException.class));
}
}
}
