You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/05/06 03:00:22 UTC
[shardingsphere] branch master updated: Rename DriverKeyGenerateAlgorithmFixture (#17363)
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 3042d894102 Rename DriverKeyGenerateAlgorithmFixture (#17363)
3042d894102 is described below
commit 3042d8941023873b92a8cd6078233b5004799039
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri May 6 11:00:13 2022 +0800
Rename DriverKeyGenerateAlgorithmFixture (#17363)
---
...enerateAlgorithm.java => DriverKeyGenerateAlgorithmFixture.java} | 4 ++--
.../org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm | 2 +-
.../yaml/integrate/sharding/configWithDataSourceWithProps.yaml | 6 +++---
.../yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml | 6 +++---
.../yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml | 6 +++---
.../integrate/sharding/configWithoutDataSourceWithoutProps.yaml | 6 +++---
.../sharding_readwrite_splitting/configWithDataSourceWithProps.yaml | 6 +++---
.../configWithDataSourceWithoutProps.yaml | 6 +++---
.../configWithoutDataSourceWithProps.yaml | 6 +++---
.../configWithoutDataSourceWithoutProps.yaml | 6 +++---
10 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/IncrementKeyGenerateAlgorithm.java b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java
similarity index 91%
rename from shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/IncrementKeyGenerateAlgorithm.java
rename to shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java
index 2e7c814cccc..5ae8c7b9fa4 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import java.util.concurrent.atomic.AtomicInteger;
-public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
+public final class DriverKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
private static final AtomicInteger SEQUENCE = new AtomicInteger(100);
@@ -32,6 +32,6 @@ public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm
@Override
public String getType() {
- return "INCREMENT";
+ return "DRIVER.FIXTURE";
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
index a2ac89afccc..c6c328db1e4 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.fixture.algorithm.keygen.IncrementKeyGenerateAlgorithm
+org.apache.shardingsphere.driver.fixture.algorithm.keygen.DriverKeyGenerateAlgorithmFixture
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index da04419b745..5aa925281b1 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -50,7 +50,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -85,8 +85,8 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
mode:
type: Cluster
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index b3828b0077b..308f923249b 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -48,7 +48,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -83,8 +83,8 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
mode:
type: Cluster
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index 96f5ff05689..7919ff559bf 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -45,7 +45,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -78,5 +78,5 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 5d8c7dc100e..bff0cc28185 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -45,7 +45,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: db${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -80,5 +80,5 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
index 8ea5f0bebe3..b044987bc26 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
@@ -62,7 +62,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -101,8 +101,8 @@ rules:
algorithm-expression: t_order_item_${id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
index 94b67f57c12..92614074306 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
@@ -62,7 +62,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -105,8 +105,8 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
index 10963266638..8af32e43634 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
@@ -45,7 +45,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -80,8 +80,8 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
index fcc944f9104..2eb9bf8d7bb 100644
--- a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
@@ -45,7 +45,7 @@ rules:
shardingAlgorithmName: t_order_inline
keyGenerateStrategy:
column: order_id
- keyGeneratorName: increment
+ keyGeneratorName: keygen_fixture
t_order_item:
actualDataNodes: readwrite_ds_${0..1}.t_order_item_${0..1}
databaseStrategy:
@@ -80,8 +80,8 @@ rules:
algorithm-expression: t_order_item_${order_id % 2}
keyGenerators:
- increment:
- type: INCREMENT
+ keygen_fixture:
+ type: DRIVER.FIXTURE
- !READWRITE_SPLITTING
dataSources: