This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 7a9887de8e2 Move RetryExecutor to mode-core module (#36272)
7a9887de8e2 is described below
commit 7a9887de8e27246638eb6c9c3d880e74e56a93fc
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 12 18:34:02 2025 +0800
Move RetryExecutor to mode-core module (#36272)
---
.../java/org/apache/shardingsphere/mode}/retry/RetryExecutor.java | 2 +-
.../java/org/apache/shardingsphere/mode}/retry/RetryExecutorTest.java | 2 +-
.../cluster/persist/service/ClusterMetaDataManagerPersistService.java | 2 +-
.../repository/cluster/core/lock/type/DefaultDistributedLock.java | 4 ++--
.../mode/manager/standalone/lock/StandaloneLockContext.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/retry/RetryExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/retry/RetryExecutor.java
similarity index 97%
rename from
infra/util/src/main/java/org/apache/shardingsphere/infra/util/retry/RetryExecutor.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/retry/RetryExecutor.java
index c1f69df898a..8e750106e24 100644
---
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/retry/RetryExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/retry/RetryExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.retry;
+package org.apache.shardingsphere.mode.retry;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git
a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/retry/RetryExecutorTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/retry/RetryExecutorTest.java
similarity index 96%
rename from
infra/util/src/test/java/org/apache/shardingsphere/infra/util/retry/RetryExecutorTest.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/retry/RetryExecutorTest.java
index 4d15c1a6cd9..22e0d5a1b70 100644
---
a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/retry/RetryExecutorTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/retry/RetryExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.util.retry;
+package org.apache.shardingsphere.mode.retry;
import org.junit.jupiter.api.Test;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 2146577f5c5..ede6e61f048 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
import org.apache.shardingsphere.infra.metadata.statistics.DatabaseStatistics;
import org.apache.shardingsphere.infra.metadata.statistics.SchemaStatistics;
-import org.apache.shardingsphere.infra.util.retry.RetryExecutor;
import
org.apache.shardingsphere.mode.manager.cluster.exception.ReloadMetaDataContextFailedException;
import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
@@ -37,6 +36,7 @@ import
org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
import
org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
+import org.apache.shardingsphere.mode.retry.RetryExecutor;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
index 4ee12cc12a4..7db7653e045 100644
---
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
+++
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.mode.repository.cluster.core.lock.type;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import org.apache.shardingsphere.infra.util.retry.RetryExecutor;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLock;
import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockPropertyKey;
import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockTypedProperties;
+import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLock;
+import org.apache.shardingsphere.mode.retry.RetryExecutor;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
index 19cf4707c06..dedc0208ef8 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.mode.manager.standalone.lock;
-import org.apache.shardingsphere.infra.util.retry.RetryExecutor;
import org.apache.shardingsphere.mode.lock.LockContext;
import org.apache.shardingsphere.mode.lock.LockDefinition;
+import org.apache.shardingsphere.mode.retry.RetryExecutor;
import java.util.Collection;
import java.util.concurrent.CopyOnWriteArraySet;
