This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
from 120d4f5f120 Add unit test for Bootstrap use proxy default port from
props (#17707)
add 30931033f2e Refactor distribute database lock (#17711)
No new revisions were added by this update.
Summary of changes:
.../cluster/ClusterContextManagerBuilder.java | 2 +-
.../cluster/coordinator/RegistryCenter.java | 4 +-
...java => AbstractDistributeLockNodeService.java} | 28 ++-
.../coordinator/lock/DistributeLockContext.java | 46 ++---
.../cluster/coordinator/lock/LockNodeService.java | 17 +-
.../coordinator/lock/LockRegistryService.java | 9 -
.../lock/ShardingSphereDistributeLockManager.java | 63 -------
.../lock/ShardingSphereLockManagerFactory.java | 44 -----
.../ShardingSphereDistributeDatabaseLock.java} | 81 ++++-----
.../event/DatabaseAckLockReleasedEvent.java | 2 +-
.../database/event/DatabaseAckLockedEvent.java | 2 +-
.../database/event/DatabaseLockReleasedEvent.java | 2 +-
.../database/event/DatabaseLockedEvent.java | 2 +-
.../database/node/DatabaseLockNodeService.java | 14 +-
.../watcher/DatabaseLockChangedWatcher.java} | 34 ++--
.../lock/global/DistributeInterMutexLock.java | 195 ---------------------
.../global/DistributeInterReentrantMutexLock.java | 52 ------
.../lock/global/ShardingSphereGlobalLock.java | 56 ------
...hardingSphereDatabaseDistributeLockManager.java | 170 ------------------
.../database/ShardingSphereDatabaseLock.java | 84 ---------
.../watcher/DatabaseAckChangedWatcher.java | 69 --------
.../coordinator/lock/mutex/InterMutexLock.java | 5 +-
.../lock/mutex/InterReentrantMutexLock.java | 7 +-
.../mutex/ShardingSphereDistributeMutexLock.java | 9 +-
...ava => ShardingSphereInterMutexLockHolder.java} | 27 ++-
.../lock/mutex/node/MutexLockNodeService.java | 12 +-
.../lock/mutex/watcher/MutexAckChangedWatcher.java | 69 --------
...edWatcher.java => MutexLockChangedWatcher.java} | 24 ++-
.../lock/service/MutexLockRegistryService.java | 12 +-
.../service/ReentrantMutexLockRegistryService.java | 75 --------
.../coordinator/lock/util/LockNodeUtil.java | 16 +-
.../coordinator/lock/util/TimeoutMilliseconds.java | 8 +-
...anager.cluster.coordinator.lock.LockNodeService | 4 +-
...inator.lock.ShardingSphereDistributeLockManager | 18 --
....cluster.coordinator.registry.GovernanceWatcher | 6 +-
... => AbstractDistributeLockNodeServiceTest.java} | 42 ++---
.../lock/DistributeLockContextTest.java | 18 +-
.../node/DatabaseLockNodeServiceTest.java} | 6 +-
.../watcher/DatabaseLockChangedWatcherTest.java} | 52 ++++--
.../watcher/DatabaseLocksChangedWatcherTest.java | 81 ---------
.../node/MutexLockNodeServiceTest.java} | 10 +-
.../mutex/watcher/MutexLockChangedWatcherTest.java | 101 +++++++++++
.../lock/service/MutexLockRegistryServiceTest.java | 2 +-
.../ReentrantMutexLockRegistryServiceTest.java | 65 -------
.../coordinator/lock/util/LockNodeUtilTest.java | 22 ++-
45 files changed, 358 insertions(+), 1309 deletions(-)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global/AbstractGlobalLockNodeService.java
=> AbstractDistributeLockNodeService.java} (66%)
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/ShardingSphereDistributeLockManager.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/ShardingSphereLockManagerFactory.java
copy
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{mutex/ShardingSphereDistributeMutexLock.java
=> database/ShardingSphereDistributeDatabaseLock.java} (59%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global
=> }/database/event/DatabaseAckLockReleasedEvent.java (98%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global
=> }/database/event/DatabaseAckLockedEvent.java (98%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global
=> }/database/event/DatabaseLockReleasedEvent.java (97%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global
=> }/database/event/DatabaseLockedEvent.java (97%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global
=> }/database/node/DatabaseLockNodeService.java (68%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global/database/watcher/DatabaseLocksChangedWatcher.java
=> database/watcher/DatabaseLockChangedWatcher.java} (64%)
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/DistributeInterMutexLock.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/DistributeInterReentrantMutexLock.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/ShardingSphereGlobalLock.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/ShardingSphereDatabaseDistributeLockManager.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/ShardingSphereDatabaseLock.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/watcher/DatabaseAckChangedWatcher.java
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/mutex/{ShardingSphereMutexLockHolder.java
=> ShardingSphereInterMutexLockHolder.java} (75%)
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/mutex/watcher/MutexAckChangedWatcher.java
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/mutex/watcher/{MutexLocksChangedWatcher.java
=> MutexLockChangedWatcher.java} (71%)
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/ReentrantMutexLockRegistryService.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.ShardingSphereDistributeLockManager
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global/AbstractGlobalStandardLockNodeServiceTest.java
=> AbstractDistributeLockNodeServiceTest.java} (52%)
copy
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global/database/node/DatabaseStandardLockNodeServiceTest.java
=> database/node/DatabaseLockNodeServiceTest.java} (87%)
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global/database/watcher/DatabaseAckChangedWatcherTest.java
=> database/watcher/DatabaseLockChangedWatcherTest.java} (57%)
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/watcher/DatabaseLocksChangedWatcherTest.java
rename
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/{global/database/node/DatabaseStandardLockNodeServiceTest.java
=> mutex/node/MutexLockNodeServiceTest.java} (77%)
create mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/mutex/watcher/MutexLockChangedWatcherTest.java
delete mode 100644
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/ReentrantMutexLockRegistryServiceTest.java
