This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 db239c0c9b1 Move global-clock-tso-provider-core module to
global-clock-tso-provider-local (#32949)
db239c0c9b1 is described below
commit db239c0c9b1758cb9f0bf713c130497897c62d6a
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Sep 21 21:12:13 2024 +0800
Move global-clock-tso-provider-core module to
global-clock-tso-provider-local (#32949)
* Move global-clock-tso-provider-core module to
global-clock-tso-provider-local
* Move global-clock-tso-provider-core module to
global-clock-tso-provider-local
* Move global-clock-tso-provider-core module to
global-clock-tso-provider-local
---
jdbc/pom.xml | 2 +-
kernel/global-clock/type/tso/pom.xml | 1 -
.../type/tso/{core => provider/local}/pom.xml | 18 ++----------------
.../type/tso/provider/local}/LocalTSOProvider.java | 6 ++++--
...dingsphere.globalclock.provider.GlobalClockProvider | 2 +-
kernel/global-clock/type/tso/provider/pom.xml | 1 +
kernel/global-clock/type/tso/provider/redis/pom.xml | 7 -------
.../tso/provider/{ => redis}/RedisTSOPropertyKey.java | 2 +-
.../tso/provider/{ => redis}/RedisTSOProvider.java | 5 +++--
...dingsphere.globalclock.provider.GlobalClockProvider | 2 +-
proxy/backend/core/pom.xml | 2 +-
11 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index aa3a343817c..81c46dfcac3 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-global-clock-tso-core</artifactId>
+
<artifactId>shardingsphere-global-clock-tso-provider-local</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
diff --git a/kernel/global-clock/type/tso/pom.xml
b/kernel/global-clock/type/tso/pom.xml
index 349cbad2f6b..da62a5ecc27 100644
--- a/kernel/global-clock/type/tso/pom.xml
+++ b/kernel/global-clock/type/tso/pom.xml
@@ -29,7 +29,6 @@
<modules>
<module>spi</module>
- <module>core</module>
<module>provider</module>
</modules>
</project>
diff --git a/kernel/global-clock/type/tso/core/pom.xml
b/kernel/global-clock/type/tso/provider/local/pom.xml
similarity index 72%
rename from kernel/global-clock/type/tso/core/pom.xml
rename to kernel/global-clock/type/tso/provider/local/pom.xml
index d02bfb91776..e64672372bc 100644
--- a/kernel/global-clock/type/tso/core/pom.xml
+++ b/kernel/global-clock/type/tso/provider/local/pom.xml
@@ -20,10 +20,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-global-clock-tso</artifactId>
+ <artifactId>shardingsphere-global-clock-tso-provider</artifactId>
<version>5.5.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-global-clock-tso-core</artifactId>
+ <artifactId>shardingsphere-global-clock-tso-provider-local</artifactId>
<name>${project.artifactId}</name>
<dependencies>
@@ -32,24 +32,10 @@
<artifactId>shardingsphere-global-clock-api</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-global-clock-tso-spi</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-global-clock-tso-provider-redis</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-database</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/kernel/global-clock/type/tso/core/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/LocalTSOProvider.java
b/kernel/global-clock/type/tso/provider/local/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/local/LocalTSOProvider.java
similarity index 88%
rename from
kernel/global-clock/type/tso/core/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/LocalTSOProvider.java
rename to
kernel/global-clock/type/tso/provider/local/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/local/LocalTSOProvider.java
index 0cda6f4cb7c..f98509d99ad 100644
---
a/kernel/global-clock/type/tso/core/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/LocalTSOProvider.java
+++
b/kernel/global-clock/type/tso/provider/local/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/local/LocalTSOProvider.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.globalclock.type.tso.provider;
+package org.apache.shardingsphere.globalclock.type.tso.provider.local;
+
+import org.apache.shardingsphere.globalclock.type.tso.provider.TSOProvider;
import java.util.concurrent.atomic.AtomicLong;
/**
- * Local timestamp oracle provider.
+ * Local TSO provider.
*/
public final class LocalTSOProvider implements TSOProvider {
diff --git
a/kernel/global-clock/type/tso/core/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
b/kernel/global-clock/type/tso/provider/local/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
similarity index 90%
rename from
kernel/global-clock/type/tso/core/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
rename to
kernel/global-clock/type/tso/provider/local/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
index 9335d6062a9..10126b9af15 100644
---
a/kernel/global-clock/type/tso/core/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
+++
b/kernel/global-clock/type/tso/provider/local/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.globalclock.type.tso.provider.LocalTSOProvider
+org.apache.shardingsphere.globalclock.type.tso.provider.local.LocalTSOProvider
diff --git a/kernel/global-clock/type/tso/provider/pom.xml
b/kernel/global-clock/type/tso/provider/pom.xml
index 05f80b4c641..959086fc242 100644
--- a/kernel/global-clock/type/tso/provider/pom.xml
+++ b/kernel/global-clock/type/tso/provider/pom.xml
@@ -28,6 +28,7 @@
<name>${project.artifactId}</name>
<modules>
+ <module>local</module>
<module>redis</module>
</modules>
</project>
diff --git a/kernel/global-clock/type/tso/provider/redis/pom.xml
b/kernel/global-clock/type/tso/provider/redis/pom.xml
index 37d673692d1..ae6caee7503 100644
--- a/kernel/global-clock/type/tso/provider/redis/pom.xml
+++ b/kernel/global-clock/type/tso/provider/redis/pom.xml
@@ -38,13 +38,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-fixture-database</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
diff --git
a/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/RedisTSOPropertyKey.java
b/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/redis/RedisTSOPropertyKey.java
similarity index 95%
rename from
kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/RedisTSOPropertyKey.java
rename to
kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/redis/RedisTSOPropertyKey.java
index b800a6e7e57..d7db4995b0f 100644
---
a/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/RedisTSOPropertyKey.java
+++
b/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/redis/RedisTSOPropertyKey.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.globalclock.type.tso.provider;
+package org.apache.shardingsphere.globalclock.type.tso.provider.redis;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/RedisTSOProvider.java
b/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/redis/RedisTSOProvider.java
similarity index 95%
rename from
kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/RedisTSOProvider.java
rename to
kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/redis/RedisTSOProvider.java
index 67838b40bd9..a06a8ec52f5 100644
---
a/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/RedisTSOProvider.java
+++
b/kernel/global-clock/type/tso/provider/redis/src/main/java/org/apache/shardingsphere/globalclock/type/tso/provider/redis/RedisTSOProvider.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.globalclock.type.tso.provider;
+package org.apache.shardingsphere.globalclock.type.tso.provider.redis;
import com.google.common.base.Strings;
+import org.apache.shardingsphere.globalclock.type.tso.provider.TSOProvider;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
@@ -26,7 +27,7 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * Redis timestamp oracle provider.
+ * Redis TSO provider.
*/
public final class RedisTSOProvider implements TSOProvider {
diff --git
a/kernel/global-clock/type/tso/provider/redis/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
b/kernel/global-clock/type/tso/provider/redis/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
index 1549e8dc05f..d1fd253cdaa 100644
---
a/kernel/global-clock/type/tso/provider/redis/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
+++
b/kernel/global-clock/type/tso/provider/redis/src/main/resources/META-INF/services/org.apache.shardingsphere.globalclock.provider.GlobalClockProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.globalclock.type.tso.provider.RedisTSOProvider
+org.apache.shardingsphere.globalclock.type.tso.provider.redis.RedisTSOProvider
diff --git a/proxy/backend/core/pom.xml b/proxy/backend/core/pom.xml
index 149f576cc06..c5fb48c6852 100644
--- a/proxy/backend/core/pom.xml
+++ b/proxy/backend/core/pom.xml
@@ -159,7 +159,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-global-clock-tso-core</artifactId>
+
<artifactId>shardingsphere-global-clock-tso-provider-local</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
