You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/06 02:49:15 UTC
[shardingsphere] branch master updated: Rename ITKeyGenerateAlgorithmFixture (#17359)
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 86f54b7e12a Rename ITKeyGenerateAlgorithmFixture (#17359)
86f54b7e12a is described below
commit 86f54b7e12add3dd96f8bb31980c96e5bc63b61b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri May 6 10:49:07 2022 +0800
Rename ITKeyGenerateAlgorithmFixture (#17359)
---
...yGenerateAlgorithm.java => ITKeyGenerateAlgorithmFixture.java} | 8 ++++----
.../org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm | 2 +-
.../src/test/resources/cases/rql/dataset/db/show_rules.xml | 2 +-
.../rql/dataset/dbtbl_with_readwrite_splitting/show_rules.xml | 2 +-
.../dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml | 4 ++--
.../show_table_rule.xml | 2 +-
.../src/test/resources/cases/rql/dataset/tbl/show_rules.xml | 2 +-
.../resources/env/scenario/db/proxy/conf/mysql/config-db.yaml | 2 +-
.../env/scenario/db/proxy/conf/postgresql/config-db.yaml | 2 +-
.../src/test/resources/env/scenario/db/rules.yaml | 2 +-
.../proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../env/scenario/dbtbl_with_readwrite_splitting/rules.yaml | 2 +-
.../mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 2 +-
.../config-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 2 +-
.../dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml | 2 +-
.../scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml | 2 +-
.../empty_rules/proxy/conf/postgresql/config-empty-rules.yaml | 2 +-
.../resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml | 2 +-
.../env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml | 2 +-
.../src/test/resources/env/scenario/tbl/rules.yaml | 2 +-
21 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ConstantKeyGenerateAlgorithm.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITKeyGenerateAlgorithmFixture.java
similarity index 85%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ConstantKeyGenerateAlgorithm.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITKeyGenerateAlgorithmFixture.java
index 616f1d85052..28997ddab5e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ConstantKeyGenerateAlgorithm.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITKeyGenerateAlgorithmFixture.java
@@ -19,15 +19,15 @@ package org.apache.shardingsphere.test.integration.fixture;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-public final class ConstantKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
+public final class ITKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
@Override
- public Comparable<?> generateKey() {
- return 1;
+ public Long generateKey() {
+ return 1L;
}
@Override
public String getType() {
- return "CONSTANT";
+ return "IT.FIXTURE";
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
index 3ed76ca4bc9..9d02248e09c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.integration.fixture.ConstantKeyGenerateAlgorithm
+org.apache.shardingsphere.test.integration.fixture.ITKeyGenerateAlgorithmFixture
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_rules.xml
index 1630efea627..5547dfed5ad 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_rules.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_rules.xml
@@ -33,7 +33,7 @@
<column name="key_generator_props" />
</metadata>
<row values="t_order| ds_${0..9}.t_order| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | | | | | | | " />
- <row values="t_order_item| ds_${0..9}.t_order_item| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | | | | | item_id| CONSTANT| " />
+ <row values="t_order_item| ds_${0..9}.t_order_item| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | | | | | item_id| IT.FIXTURE| " />
<row values="t_order_details| ds_${0..9}.t_order_details| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | | | | | | " />
<row values="t_order_federate_sharding| ds_${0..1}.t_order_federate_sharding| | INLINE| order_id_sharding| INLINE| algorithm-expression=ds_${order_id_sharding % 2}| | | | | | | " />
<row values="t_order_item_federate_sharding| ds_${0..1}.t_order_item_federate_sharding| | INLINE| item_id| INLINE| algorithm-expression=ds_${db_inline_item_id % 2}| | | | | | | " />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_rules.xml
index 31ac2194b06..67a60d793e9 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_rules.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_rules.xml
@@ -33,7 +33,7 @@
<column name="key_generator_props" />
</metadata>
<row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | | | " />
- <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | item_id| CONSTANT| " />
+ <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
<row values="t_order_details| readwrite_ds_${0..9}.t_order_details_${0..9}| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | | | " />
<row values="t_order_item_federate_sharding | readwrite_ds_1.t_order_item_federate_sharding_${0..1}| | | | | | INLINE| item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}| | | " />
<row values="t_order_federate_sharding | readwrite_ds_1.t_order_federate_sharding_${0..1}| | | | | | INLINE| order_id_sharding| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}| | | " />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml
index ee6c974169e..65001492996 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml
@@ -32,8 +32,8 @@
<column name="key_generator_type" />
<column name="key_generator_props" />
</metadata>
- <row values="t_user_item| readwrite_ds_${0..9}.t_user_item_${0..9}| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| item_id| IT.STANDARD.FIXTURE| | item_id| CONSTANT| " />
- <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | IT.STANDARD.FIXTURE| address_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | user_id| CONSTANT| " />
+ <row values="t_user_item| readwrite_ds_${0..9}.t_user_item_${0..9}| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| item_id| IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
+ <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | IT.STANDARD.FIXTURE| address_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | user_id| IT.FIXTURE| " />
<row values="t_user_details| readwrite_ds_${0..9}.t_user_details_${0..9}| | IT.STANDARD.FIXTURE| address_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | | | " />
<row values="t_order_item_federate_sharding| readwrite_ds_1.t_order_item_federate_sharding_${0..1}| | | | | | INLINE| item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}| | | " />
<row values="t_order_federate_sharding| readwrite_ds_1.t_order_federate_sharding_${0..1}| | | | | | INLINE| order_id_sharding| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}| | | " />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_table_rule.xml
index 49ae6ada640..7da07518afc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_table_rule.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_table_rule.xml
@@ -32,5 +32,5 @@
<column name="key_generator_type" />
<column name="key_generator_props" />
</metadata>
- <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | IT.STANDARD.FIXTURE| address_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | user_id| CONSTANT| " />
+ <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | IT.STANDARD.FIXTURE| address_id| IT.STANDARD.FIXTURE| | IT.STANDARD.FIXTURE| user_id| IT.STANDARD.FIXTURE| | user_id| IT.FIXTURE| " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_rules.xml
index 7b5821da912..3236733b45e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_rules.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_rules.xml
@@ -33,7 +33,7 @@
<column name="key_generator_props" />
</metadata>
<row values="t_order| tbl.t_order_${0..9}| | | | | | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | | | " />
- <row values="t_order_item| tbl.t_order_item_${0..9}| | | | | | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | item_id| CONSTANT| " />
+ <row values="t_order_item| tbl.t_order_item_${0..9}| | | | | | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
<row values="t_order_details| tbl.t_order_details_${0..9}| | | | | | IT.STANDARD.FIXTURE| order_id| IT.STANDARD.FIXTURE| | | | " />
<row values="t_order_federate_sharding| tbl.t_order_federate_sharding_${0..1}| | | | | | INLINE| order_id_sharding| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2},allow-range-query-with-inline-sharding=true| | | " />
<row values="t_order_item_federate_sharding | tbl.t_order_item_federate_sharding_${0..1}| | | | | | INLINE| item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}| | | " />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
index 474999b09e5..0b8a21caa23 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/mysql/config-db.yaml
@@ -164,4 +164,4 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
index 984163f8968..899b5b7ae52 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/proxy/conf/postgresql/config-db.yaml
@@ -164,4 +164,4 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml
index caeebc56736..a4edf4b23f4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/db/rules.yaml
@@ -72,7 +72,7 @@ rules:
keyGenerators:
constant:
- type: Constant
+ type: IT.FIXTURE
props:
sql-federation-enabled: true
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
index 71dc57c7d5d..e316c6e863a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting.yaml
@@ -266,7 +266,7 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
index 7518d22f97d..cf3d2c46e1b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting.yaml
@@ -266,7 +266,7 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
index 3b49484c558..4f49a60bd13 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
@@ -83,7 +83,7 @@ rules:
keyGenerators:
constant:
- type: Constant
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 39ced82017a..80ada34b5ad 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -278,7 +278,7 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 016e66d774b..6a5df7ddbc6 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/config-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -278,7 +278,7 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
index 3fc8e1d8055..0b1ce5ea3c2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
@@ -94,7 +94,7 @@ rules:
keyGenerators:
constant:
- type: Constant
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml
index b519b82ccc2..c61e63bdaee 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/config-empty-rules.yaml
@@ -238,7 +238,7 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml
index 20165727552..375fe449f6f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/config-empty-rules.yaml
@@ -238,7 +238,7 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
- !READWRITE_SPLITTING
dataSources:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
index 38f7ec569ab..e26df3a846a 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
@@ -85,4 +85,4 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
index 72055ce7b2e..82c7839296c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/config-tbl.yaml
@@ -85,4 +85,4 @@ rules:
keyGenerators:
constant:
- type: CONSTANT
+ type: IT.FIXTURE
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml
index 4efdfb4d0c4..a1aabed37d5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/tbl/rules.yaml
@@ -72,7 +72,7 @@ rules:
keyGenerators:
constant:
- type: Constant
+ type: IT.FIXTURE
props:
sql-federation-enabled: true