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 f82ad70d501 Refactor fixture class prefix from IT to E2E (#36674)
f82ad70d501 is described below
commit f82ad70d501bfe62b9ffe306d655024c49bd3978
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 23 22:55:03 2025 +0800
Refactor fixture class prefix from IT to E2E (#36674)
* Refactor fixture class prefix from IT to E2E
* Refactor fixture class prefix from IT to E2E
---
...java => E2EAutoIncrementKeyGenerateAlgorithmFixture.java} | 12 ++++++------
...rithmFixture.java => E2EEncryptLikeAlgorithmFixture.java} | 2 +-
...rithmFixture.java => E2EKeyGenerateAlgorithmFixture.java} | 12 ++++++------
...thmFixture.java => E2EShardingAuditAlgorithmFixture.java} | 2 +-
...Fixture.java => E2EStandardShardingAlgorithmFixture.java} | 4 ++--
.../org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm | 2 +-
...ingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm | 4 ++--
.../org.apache.shardingsphere.sharding.spi.ShardingAlgorithm | 2 +-
...apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm | 2 +-
.../ral/dataset/empty_rules/show_sharding_table_rule.xml | 4 ++--
.../cases/rql/dataset/db/show_sharding_algorithms.xml | 2 +-
.../cases/rql/dataset/db/show_sharding_scaling_rules.xml | 2 +-
.../cases/rql/dataset/db/show_sharding_table_rule.xml | 2 +-
.../cases/rql/dataset/db/show_sharding_table_rules.xml | 8 ++++----
.../show_sharding_algorithms.xml | 2 +-
.../show_sharding_table_rule.xml | 2 +-
.../show_sharding_table_rules.xml | 6 +++---
.../show_sharding_algorithms.xml | 2 +-
.../show_sharding_generators.xml | 2 +-
.../show_sharding_table_rule.xml | 2 +-
.../show_sharding_table_rules.xml | 10 +++++-----
.../sharding_and_encrypt/show_sharding_algorithms.xml | 2 +-
.../sharding_and_encrypt/show_sharding_generators.xml | 2 +-
.../sharding_and_encrypt/show_sharding_table_rule.xml | 2 +-
.../sharding_and_encrypt/show_sharding_table_rules.xml | 10 +++++-----
.../cases/rql/dataset/tbl/show_sharding_algorithms.xml | 2 +-
.../cases/rql/dataset/tbl/show_sharding_table_rule.xml | 2 +-
.../cases/rql/dataset/tbl/show_sharding_table_rules.xml | 8 ++++----
test/e2e/sql/src/test/resources/env/e2e-env.properties | 4 ++--
.../resources/env/scenario/db/jdbc/conf/mysql/rules.yaml | 2 +-
.../resources/env/scenario/db/jdbc/conf/opengauss/rules.yaml | 2 +-
.../env/scenario/db/jdbc/conf/postgresql/rules.yaml | 2 +-
.../env/scenario/db/proxy/conf/mysql/database-db.yaml | 2 +-
.../env/scenario/db/proxy/conf/opengauss/database-db.yaml | 2 +-
.../env/scenario/db/proxy/conf/postgresql/database-db.yaml | 2 +-
.../db_tbl_sql_federation/jdbc/conf/mysql/rules.yaml | 2 +-
.../db_tbl_sql_federation/jdbc/conf/opengauss/rules.yaml | 2 +-
.../db_tbl_sql_federation/jdbc/conf/postgresql/rules.yaml | 2 +-
.../proxy/conf/mysql/database-dbtbl-with-sql-federation.yaml | 2 +-
.../conf/opengauss/database-dbtbl-with-sql-federation.yaml | 2 +-
.../conf/postgresql/database-dbtbl-with-sql-federation.yaml | 2 +-
.../jdbc/conf/mysql/rules.yaml | 2 +-
.../jdbc/conf/opengauss/rules.yaml | 2 +-
.../jdbc/conf/postgresql/rules.yaml | 2 +-
.../conf/mysql/database-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../opengauss/database-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../postgresql/database-dbtbl-with-readwrite-splitting.yaml | 2 +-
.../env/scenario/dbtbl_with_readwrite_splitting/rules.yaml | 2 +-
.../jdbc/conf/mysql/rules.yaml | 4 ++--
.../jdbc/conf/opengauss/rules.yaml | 4 ++--
.../jdbc/conf/postgresql/rules.yaml | 4 ++--
.../database-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 4 ++--
.../database-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 4 ++--
.../database-dbtbl-with-readwrite-splitting-and-encrypt.yaml | 4 ++--
.../dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml | 4 ++--
.../env/scenario/empty_rules/jdbc/conf/mysql/rules.yaml | 2 +-
.../env/scenario/empty_rules/jdbc/conf/opengauss/rules.yaml | 2 +-
.../env/scenario/empty_rules/jdbc/conf/postgresql/rules.yaml | 2 +-
.../empty_rules/proxy/conf/mysql/database-empty-rules.yaml | 2 +-
.../proxy/conf/opengauss/database-empty-rules.yaml | 2 +-
.../proxy/conf/postgresql/database-empty-rules.yaml | 2 +-
.../scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml | 2 +-
.../encrypt/proxy/conf/opengauss/database-encrypt.yaml | 2 +-
.../encrypt/proxy/conf/postgresql/database-encrypt.yaml | 2 +-
.../scenario/sharding_and_encrypt/jdbc/conf/mysql/rules.yaml | 4 ++--
.../sharding_and_encrypt/jdbc/conf/opengauss/rules.yaml | 4 ++--
.../sharding_and_encrypt/jdbc/conf/postgresql/rules.yaml | 4 ++--
.../proxy/conf/mysql/database-sharding-and-encrypt.yaml | 4 ++--
.../proxy/conf/opengauss/database-sharding-and-encrypt.yaml | 4 ++--
.../proxy/conf/postgresql/database-sharding-and-encrypt.yaml | 4 ++--
.../scenario/sharding_and_shadow/jdbc/conf/mysql/rules.yaml | 2 +-
.../sharding_and_shadow/jdbc/conf/opengauss/rules.yaml | 2 +-
.../sharding_and_shadow/jdbc/conf/postgresql/rules.yaml | 2 +-
.../proxy/conf/mysql/database-sharding-and-shadow.yaml | 2 +-
.../proxy/conf/opengauss/database-sharding-and-shadow.yaml | 2 +-
.../proxy/conf/postgresql/database-sharding-and-shadow.yaml | 2 +-
.../sharding_encrypt_shadow/jdbc/conf/mysql/rules.yaml | 2 +-
.../sharding_encrypt_shadow/jdbc/conf/opengauss/rules.yaml | 2 +-
.../sharding_encrypt_shadow/jdbc/conf/postgresql/rules.yaml | 2 +-
.../proxy/conf/mysql/database-sharding-encrypt-shadow.yaml | 2 +-
.../conf/opengauss/database-sharding-encrypt-shadow.yaml | 2 +-
.../conf/postgresql/database-sharding-encrypt-shadow.yaml | 2 +-
.../resources/env/scenario/tbl/jdbc/conf/mysql/rules.yaml | 2 +-
.../env/scenario/tbl/jdbc/conf/opengauss/rules.yaml | 2 +-
.../env/scenario/tbl/jdbc/conf/postgresql/rules.yaml | 2 +-
.../env/scenario/tbl/proxy/conf/mysql/database-tbl.yaml | 2 +-
.../env/scenario/tbl/proxy/conf/opengauss/database-tbl.yaml | 2 +-
.../env/scenario/tbl/proxy/conf/postgresql/database-tbl.yaml | 2 +-
88 files changed, 131 insertions(+), 131 deletions(-)
diff --git
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EAutoIncrementKeyGenerateAlgorithmFixture.java
similarity index 94%
rename from
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
rename to
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EAutoIncrementKeyGenerateAlgorithmFixture.java
index 92761732e91..af88f31602f 100644
---
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
+++
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EAutoIncrementKeyGenerateAlgorithmFixture.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-public final class ITAutoIncrementKeyGenerateAlgorithmFixture implements
KeyGenerateAlgorithm {
+public final class E2EAutoIncrementKeyGenerateAlgorithmFixture implements
KeyGenerateAlgorithm {
private final AtomicLong idGenerator = new AtomicLong(1L);
@@ -34,14 +34,14 @@ public final class
ITAutoIncrementKeyGenerateAlgorithmFixture implements KeyGene
return IntStream.range(0, keyGenerateCount).mapToObj(each ->
idGenerator.getAndIncrement()).collect(Collectors.toList());
}
- @Override
- public String getType() {
- return "E2E.AUTO_INCREMENT.FIXTURE";
- }
-
@Override
public boolean isSupportAutoIncrement() {
idGenerator.set(1L);
return true;
}
+
+ @Override
+ public String getType() {
+ return "E2E.AUTO_INCREMENT.FIXTURE";
+ }
}
diff --git
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITEncryptLikeAlgorithmFixture.java
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EEncryptLikeAlgorithmFixture.java
similarity index 98%
rename from
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITEncryptLikeAlgorithmFixture.java
rename to
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EEncryptLikeAlgorithmFixture.java
index bd8b5f1b23c..785b523ef39 100644
---
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITEncryptLikeAlgorithmFixture.java
+++
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EEncryptLikeAlgorithmFixture.java
@@ -35,7 +35,7 @@ import java.util.Scanner;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-public final class ITEncryptLikeAlgorithmFixture implements EncryptAlgorithm {
+public final class E2EEncryptLikeAlgorithmFixture implements EncryptAlgorithm {
private static final String DELTA_KEY = "delta";
diff --git
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EKeyGenerateAlgorithmFixture.java
similarity index 92%
rename from
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
rename to
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EKeyGenerateAlgorithmFixture.java
index 5c115232f21..f0052bfd1a4 100644
---
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
+++
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EKeyGenerateAlgorithmFixture.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-public final class ITKeyGenerateAlgorithmFixture implements
KeyGenerateAlgorithm, ComputeNodeInstanceContextAware {
+public final class E2EKeyGenerateAlgorithmFixture implements
KeyGenerateAlgorithm, ComputeNodeInstanceContextAware {
private Properties props;
@@ -41,15 +41,15 @@ public final class ITKeyGenerateAlgorithmFixture implements
KeyGenerateAlgorithm
return IntStream.range(0, keyGenerateCount).mapToObj(each ->
1L).collect(Collectors.toList());
}
- @Override
- public String getType() {
- return "E2E.FIXTURE";
- }
-
@Override
public void setComputeNodeInstanceContext(final ComputeNodeInstanceContext
computeNodeInstanceContext) {
if (null != computeNodeInstanceContext) {
computeNodeInstanceContext.generateWorkerId(props);
}
}
+
+ @Override
+ public String getType() {
+ return "E2E.KEYGEN.FIXTURE";
+ }
}
diff --git
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EShardingAuditAlgorithmFixture.java
similarity index 94%
rename from
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java
rename to
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EShardingAuditAlgorithmFixture.java
index a3bd723b12a..8fbd8fdaa92 100644
---
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java
+++
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EShardingAuditAlgorithmFixture.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm;
import java.util.List;
-public final class ITShardingAuditAlgorithmFixture implements
ShardingAuditAlgorithm {
+public final class E2EShardingAuditAlgorithmFixture implements
ShardingAuditAlgorithm {
@Override
public void check(final SQLStatementContext sqlStatementContext, final
List<Object> params, final RuleMetaData globalRuleMetaData, final
ShardingSphereDatabase database) {
diff --git
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EStandardShardingAlgorithmFixture.java
similarity index 94%
rename from
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java
rename to
test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EStandardShardingAlgorithmFixture.java
index 60e6012bc57..800eaac9c60 100644
---
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java
+++
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/E2EStandardShardingAlgorithmFixture.java
@@ -25,7 +25,7 @@ import java.math.BigInteger;
import java.util.Collection;
import java.util.LinkedHashSet;
-public final class ITStandardShardingAlgorithmFixture implements
StandardShardingAlgorithm<Integer> {
+public final class E2EStandardShardingAlgorithmFixture implements
StandardShardingAlgorithm<Integer> {
@Override
public String doSharding(final Collection<String> availableTargetNames,
final PreciseShardingValue<Integer> shardingValue) {
@@ -59,6 +59,6 @@ public final class ITStandardShardingAlgorithmFixture
implements StandardShardin
@Override
public String getType() {
- return "E2E.STANDARD.FIXTURE";
+ return "E2E.SHARDING.STANDARD.FIXTURE";
}
}
diff --git
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
index f6c7dada3ea..6aaaed385b1 100644
---
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
+++
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.e2e.fixture.ITEncryptLikeAlgorithmFixture
+org.apache.shardingsphere.test.e2e.fixture.E2EEncryptLikeAlgorithmFixture
diff --git
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm
index e934b093655..d95d41681ea 100644
---
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm
+++
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.e2e.fixture.ITKeyGenerateAlgorithmFixture
-org.apache.shardingsphere.test.e2e.fixture.ITAutoIncrementKeyGenerateAlgorithmFixture
+org.apache.shardingsphere.test.e2e.fixture.E2EKeyGenerateAlgorithmFixture
+org.apache.shardingsphere.test.e2e.fixture.E2EAutoIncrementKeyGenerateAlgorithmFixture
diff --git
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
index 493660ac2e5..4b035036ea5 100644
---
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
+++
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.e2e.fixture.ITStandardShardingAlgorithmFixture
+org.apache.shardingsphere.test.e2e.fixture.E2EStandardShardingAlgorithmFixture
diff --git
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm
index b33b70dcd59..9afb86d6e69 100644
---
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm
+++
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.e2e.fixture.ITShardingAuditAlgorithmFixture
+org.apache.shardingsphere.test.e2e.fixture.E2EShardingAuditAlgorithmFixture
diff --git
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
index 09b3e5d2ab4..8da582535af 100644
---
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
@@ -34,6 +34,6 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_user_item| | write_ds_${0..9}| | | | |STANDARD| user_id|
MOD| {"sharding-count":40}| user_id| E2E.FIXTURE|
{"worker-id":1} | |" />
- <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD|
{"sharding-count":40}| user_id| E2E.FIXTURE|
{"worker-id":1} | E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user_item| | write_ds_${0..9}| | | | |STANDARD| user_id|
MOD| {"sharding-count":40}| user_id| E2E.KEYGEN.FIXTURE|
{"worker-id":1} | |" />
+ <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD|
{"sharding-count":40}| user_id| E2E.KEYGEN.FIXTURE|
{"worker-id":1} | E2E.AUDITOR.FIXTURE| true" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_algorithms.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_algorithms.xml
index 8831660797b..d128f127ad1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_algorithms.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_algorithms.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="e2e_standard_fixture| E2E.STANDARD.FIXTURE| " />
+ <row values="e2e_standard_fixture| E2E.SHARDING.STANDARD.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
index 03472668dbb..c8f5b44da59 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
@@ -24,5 +24,5 @@
<column name="completion_detector" />
<column name="data_consistency_checker" />
</metadata>
-<!-- <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | | | | | | | " />-->
+<!-- <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | | | " />-->
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rule.xml
index 0813219eca2..4db00b56b38 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rule.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | | | | | | | | | " />
+ <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rules.xml
index 236d3f107cc..c5e62a0fbbc 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_table_rules.xml
@@ -34,8 +34,8 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | | | | | | | | | " />
- <row values="t_order_item| ds_${0..9}.t_order_item| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | | | | | item_id| E2E.AUTO_INCREMENT.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
- <row values="t_order_sharding_view| ds_${0..9}.t_order_sharding_view| |
STANDARD| user_id| E2E.STANDARD.FIXTURE| | | | | | | | | | " />
- <row values="t_order_details| ds_${0..9}.t_order_details| | STANDARD|
user_id| E2E.STANDARD.FIXTURE| | | | | | | | | " />
+ <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | | | | | " />
+ <row values="t_order_item| ds_${0..9}.t_order_item| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | item_id| E2E.AUTO_INCREMENT.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_order_sharding_view| ds_${0..9}.t_order_sharding_view| |
STANDARD| user_id| E2E.SHARDING.STANDARD.FIXTURE| | | | | | | | | | " />
+ <row values="t_order_details| ds_${0..9}.t_order_details| | STANDARD|
user_id| E2E.SHARDING.STANDARD.FIXTURE| | | | | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_algorithms.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_algorithms.xml
index 8831660797b..d128f127ad1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_algorithms.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_algorithms.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="e2e_standard_fixture| E2E.STANDARD.FIXTURE| " />
+ <row values="e2e_standard_fixture| E2E.SHARDING.STANDARD.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rule.xml
index 2e6370c247a..b42c8630833 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rule.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id| E2E.STANDARD.FIXTURE| | |
| | | " />
+ <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rules.xml
index c1d670ba5c6..31104d2c744 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_rules.xml
@@ -34,7 +34,7 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id| E2E.STANDARD.FIXTURE| | |
| | | " />
- <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| |
STANDARD| user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.STANDARD.FIXTURE| | item_id| E2E.AUTO_INCREMENT.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
- <row values="t_order_details|
readwrite_ds_${0..9}.t_order_details_${0..9}| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | STANDARD| order_id| E2E.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| |
STANDARD| user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | item_id| E2E.AUTO_INCREMENT.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_order_details|
readwrite_ds_${0..9}.t_order_details_${0..9}| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_algorithms.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_algorithms.xml
index 8831660797b..d128f127ad1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_algorithms.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_algorithms.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="e2e_standard_fixture| E2E.STANDARD.FIXTURE| " />
+ <row values="e2e_standard_fixture| E2E.SHARDING.STANDARD.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_generators.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_generators.xml
index 85dc1b02c26..5047dfbc174 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_generators.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_generators.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="constant| E2E.FIXTURE| " />
+ <row values="constant| E2E.KEYGEN.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rule.xml
index ee7aa85c2b0..8df257cf850 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rule.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.STANDARD.FIXTURE| | STANDARD| user_id| E2E.STANDARD.FIXTURE| |
user_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | user_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rules.xml
index 54faa47ce13..16b8b973a6c 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_rules.xml
@@ -34,9 +34,9 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id| E2E.STANDARD.FIXTURE| | |
| | | " />
- <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| |
STANDARD| user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.STANDARD.FIXTURE| | item_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
- <row values="t_user_item| readwrite_ds_${0..9}.t_user_item_${0..9}| |
STANDARD| user_id| E2E.STANDARD.FIXTURE| | STANDARD| item_id|
E2E.STANDARD.FIXTURE| | item_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
- <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.STANDARD.FIXTURE| | STANDARD| user_id| E2E.STANDARD.FIXTURE| |
user_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
- <row values="t_user_details| readwrite_ds_${0..9}.t_user_details_${0..9}|
| STANDARD| address_id| E2E.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| |
STANDARD| user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | item_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user_item| readwrite_ds_${0..9}.t_user_item_${0..9}| |
STANDARD| user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| item_id|
E2E.SHARDING.STANDARD.FIXTURE| | item_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | user_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user_details| readwrite_ds_${0..9}.t_user_details_${0..9}|
| STANDARD| address_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
index 8831660797b..d128f127ad1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="e2e_standard_fixture| E2E.STANDARD.FIXTURE| " />
+ <row values="e2e_standard_fixture| E2E.SHARDING.STANDARD.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
index 85dc1b02c26..5047dfbc174 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="constant| E2E.FIXTURE| " />
+ <row values="constant| E2E.KEYGEN.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
index f0a40b26bd1..d7d100b460d 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_user| encrypt_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.STANDARD.FIXTURE| | STANDARD| user_id| E2E.STANDARD.FIXTURE| |
user_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user| encrypt_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | user_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
index c66f824ad2c..c98947a7e84 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
@@ -34,9 +34,9 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| encrypt_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id| E2E.STANDARD.FIXTURE| | |
| | | " />
- <row values="t_order_item| encrypt_ds_${0..9}.t_order_item_${0..9}| |
STANDARD| user_id| E2E.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.STANDARD.FIXTURE| | item_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
- <row values="t_user_item| encrypt_ds_${0..9}.t_user_item_${0..9}| |
STANDARD| user_id| E2E.STANDARD.FIXTURE| | STANDARD| item_id|
E2E.STANDARD.FIXTURE| | item_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
- <row values="t_user| encrypt_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.STANDARD.FIXTURE| | STANDARD| user_id| E2E.STANDARD.FIXTURE| |
user_id| E2E.FIXTURE| | E2E.AUDITOR.FIXTURE| true" />
- <row values="t_user_details| encrypt_ds_${0..9}.t_user_details_${0..9}| |
STANDARD| address_id| E2E.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order| encrypt_ds_${0..9}.t_order_${0..9}| | STANDARD|
user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order_item| encrypt_ds_${0..9}.t_order_item_${0..9}| |
STANDARD| user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | item_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user_item| encrypt_ds_${0..9}.t_user_item_${0..9}| |
STANDARD| user_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| item_id|
E2E.SHARDING.STANDARD.FIXTURE| | item_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user| encrypt_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | user_id| E2E.KEYGEN.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_user_details| encrypt_ds_${0..9}.t_user_details_${0..9}| |
STANDARD| address_id| E2E.SHARDING.STANDARD.FIXTURE| | STANDARD| user_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
index 739328e2da5..4b77ca52708 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
@@ -21,6 +21,6 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="e2e_standard_fixture| E2E.STANDARD.FIXTURE| " />
+ <row values="e2e_standard_fixture| E2E.SHARDING.STANDARD.FIXTURE| " />
<row values="t_product_hint_inline| HINT_INLINE|
{"algorithm-expression":"t_product_${value}"}" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rule.xml
index 0c12760d70c..f2568fffa77 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rule.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| tbl.t_order_${0..9}| | | | | | STANDARD| order_id|
E2E.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order| tbl.t_order_${0..9}| | | | | | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
index 4d2026e6372..f4ef88469ff 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
@@ -34,9 +34,9 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| tbl.t_order_${0..9}| | | | | | STANDARD| order_id|
E2E.STANDARD.FIXTURE| | | | | | " />
- <row values="t_order_item| tbl.t_order_item_${0..9}| | | | | | STANDARD|
order_id| E2E.STANDARD.FIXTURE| | item_id| E2E.AUTO_INCREMENT.FIXTURE| |
E2E.AUDITOR.FIXTURE| true" />
- <row values="t_order_sharding_view| tbl.t_order_sharding_view_${0..9}| | |
| | | STANDARD| order_id| E2E.STANDARD.FIXTURE| | | | | | " />
- <row values="t_order_details| tbl.t_order_details_${0..9}| | | | | |
STANDARD| order_id| E2E.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order| tbl.t_order_${0..9}| | | | | | STANDARD| order_id|
E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order_item| tbl.t_order_item_${0..9}| | | | | | STANDARD|
order_id| E2E.SHARDING.STANDARD.FIXTURE| | item_id| E2E.AUTO_INCREMENT.FIXTURE|
| E2E.AUDITOR.FIXTURE| true" />
+ <row values="t_order_sharding_view| tbl.t_order_sharding_view_${0..9}| | |
| | | STANDARD| order_id| E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
+ <row values="t_order_details| tbl.t_order_details_${0..9}| | | | | |
STANDARD| order_id| E2E.SHARDING.STANDARD.FIXTURE| | | | | | " />
<row values="t_product | tbl.t_product_${0..9}| | | | | | HINT| |
HINT_INLINE| {"algorithm-expression":"t_product_${value}"}|
| | | | " />
</dataset>
diff --git a/test/e2e/sql/src/test/resources/env/e2e-env.properties
b/test/e2e/sql/src/test/resources/env/e2e-env.properties
index a72b8972921..be5df4accc2 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -16,7 +16,7 @@
#
#e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
-e2e.scenarios=dbtbl_with_readwrite_splitting_and_encrypt
+e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
e2e.run.additional.cases=false
e2e.run.smoke.cases=false
@@ -25,7 +25,7 @@ e2e.run.smoke.cases=false
e2e.run.type=DOCKER
#e2e.artifact.modes=Standalone,Cluster
-e2e.artifact.modes=Cluster
+e2e.artifact.modes=
# e2e.artifact.adapters=jdbc,proxy
e2e.artifact.adapters=proxy
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/mysql/rules.yaml
index 6f06295d095..0bbfe5715ef 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/mysql/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/mysql/rules.yaml
@@ -160,7 +160,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_sharding_view,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/opengauss/rules.yaml
index c4046302ebb..6acae945764 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/opengauss/rules.yaml
@@ -160,7 +160,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_sharding_view,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/postgresql/rules.yaml
index d39ffb07938..6b807cd5093 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/jdbc/conf/postgresql/rules.yaml
@@ -160,7 +160,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_sharding_view,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/mysql/database-db.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/mysql/database-db.yaml
index 4a611a756b8..49f26eb4ac2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/mysql/database-db.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/mysql/database-db.yaml
@@ -150,7 +150,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_sharding_view,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/opengauss/database-db.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/opengauss/database-db.yaml
index 9ce1e84d469..34f48db7ed4 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/opengauss/database-db.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/opengauss/database-db.yaml
@@ -150,7 +150,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_sharding_view,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/postgresql/database-db.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/postgresql/database-db.yaml
index b011022d09f..d2b8a053f4c 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/postgresql/database-db.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/conf/postgresql/database-db.yaml
@@ -150,7 +150,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_sharding_view,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/mysql/rules.yaml
index 5e0b9d2045b..912078e8edf 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/mysql/rules.yaml
@@ -156,7 +156,7 @@ rules:
- ref_0:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/opengauss/rules.yaml
index ba49d3b2967..d24cbf24ecc 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/opengauss/rules.yaml
@@ -156,7 +156,7 @@ rules:
- ref_0:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/postgresql/rules.yaml
index 2c8ae43e407..65f4b73cd8a 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/jdbc/conf/postgresql/rules.yaml
@@ -156,7 +156,7 @@ rules:
- ref_0:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/mysql/database-dbtbl-with-sql-federation.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/mysql/database-dbtbl-with-sql-federation.yaml
index 89716704491..e327e4b2a01 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/mysql/database-dbtbl-with-sql-federation.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/mysql/database-dbtbl-with-sql-federation.yaml
@@ -146,7 +146,7 @@ rules:
- ref_0:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/opengauss/database-dbtbl-with-sql-federation.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/opengauss/database-dbtbl-with-sql-federation.yaml
index abf56888121..4f5556fd86e 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/opengauss/database-dbtbl-with-sql-federation.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/opengauss/database-dbtbl-with-sql-federation.yaml
@@ -146,7 +146,7 @@ rules:
- ref_0:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/postgresql/database-dbtbl-with-sql-federation.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/postgresql/database-dbtbl-with-sql-federation.yaml
index 3a3ce2b0417..a1cf28ac68d 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/postgresql/database-dbtbl-with-sql-federation.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/conf/postgresql/database-dbtbl-with-sql-federation.yaml
@@ -146,7 +146,7 @@ rules:
- ref_0:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/mysql/rules.yaml
index 873cd2ea1d8..29305adacf3 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/mysql/rules.yaml
@@ -266,7 +266,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/opengauss/rules.yaml
index 9fe8a3e8fd9..0b7aad8e8fa 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/opengauss/rules.yaml
@@ -266,7 +266,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/postgresql/rules.yaml
index f6bab22caab..27091aaa6d6 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/jdbc/conf/postgresql/rules.yaml
@@ -266,7 +266,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting.yaml
index ab97276fd99..1f5c6d51625 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting.yaml
@@ -246,7 +246,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting.yaml
index b488ab58970..e865cbb1185 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting.yaml
@@ -246,7 +246,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting.yaml
index bf479f9d23d..cd4133b2bd6 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting.yaml
@@ -246,7 +246,7 @@ rules:
- ref_0:t_order,t_order_item,t_order_details
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
index 608335140ae..e8a2bfd4198 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/rules.yaml
@@ -63,7 +63,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
auto_increment:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/mysql/rules.yaml
index fe3f80b81b5..f9cfc964794 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/mysql/rules.yaml
@@ -302,11 +302,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/opengauss/rules.yaml
index f047008d15a..dae07493ee4 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/opengauss/rules.yaml
@@ -301,11 +301,11 @@ rules:
- ref_1:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/postgresql/rules.yaml
index 5b40c1472ed..50deb00bd8f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/jdbc/conf/postgresql/rules.yaml
@@ -301,11 +301,11 @@ rules:
- ref_1:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index b9416e1cb31..d4a635c989d 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/mysql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -282,11 +282,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 7204175c353..049bab88016 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/opengauss/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -281,11 +281,11 @@ rules:
- ref_1:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
index 388c0d54892..4ff793993b7 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/conf/postgresql/database-dbtbl-with-readwrite-splitting-and-encrypt.yaml
@@ -281,11 +281,11 @@ rules:
- ref_1:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
index 0e565b54c95..0bec2245149 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
@@ -93,11 +93,11 @@ rules:
- ref_1:t_order,t_order_item
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/mysql/rules.yaml
index 50a9d842b5c..e207e5220e0 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/mysql/rules.yaml
@@ -266,7 +266,7 @@ rules:
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
props:
worker-id: 1
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/opengauss/rules.yaml
index d46c8135882..80a8ad7e7ca 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/opengauss/rules.yaml
@@ -266,7 +266,7 @@ rules:
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
props:
worker-id: 1
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/postgresql/rules.yaml
index 00c6a58b29e..13032623d1f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/jdbc/conf/postgresql/rules.yaml
@@ -266,7 +266,7 @@ rules:
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
props:
worker-id: 1
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/database-empty-rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/database-empty-rules.yaml
index b8811e436a3..e4f32510ffc 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/database-empty-rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/mysql/database-empty-rules.yaml
@@ -245,7 +245,7 @@ rules:
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
props:
worker-id: 1
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/opengauss/database-empty-rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/opengauss/database-empty-rules.yaml
index 601afc932dd..8b99e4867cb 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/opengauss/database-empty-rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/opengauss/database-empty-rules.yaml
@@ -245,7 +245,7 @@ rules:
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
props:
worker-id: 1
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/database-empty-rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/database-empty-rules.yaml
index 63b0b2d8cdd..04985497abf 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/database-empty-rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/conf/postgresql/database-empty-rules.yaml
@@ -245,7 +245,7 @@ rules:
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
props:
worker-id: 1
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
index 768e0dda8b0..cbb79cb2aea 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/database-encrypt.yaml
@@ -25,7 +25,7 @@ dataSources:
connectionTimeoutMilliseconds: 30000
idleTimeoutMilliseconds: 60000
maxLifetimeMilliseconds: 1800000
- maxPoolSize: 5
+ maxPoolSize: 2
minPoolSize: 2
rules:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
index 02486176ab0..91a3d2064ff 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/database-encrypt.yaml
@@ -25,7 +25,7 @@ dataSources:
connectionTimeoutMilliseconds: 30000
idleTimeoutMilliseconds: 60000
maxLifetimeMilliseconds: 1800000
- maxPoolSize: 5
+ maxPoolSize: 2
minPoolSize: 2
rules:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
index 803f2c0b1c1..24128353791 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/database-encrypt.yaml
@@ -25,7 +25,7 @@ dataSources:
connectionTimeoutMilliseconds: 30000
idleTimeoutMilliseconds: 60000
maxLifetimeMilliseconds: 1800000
- maxPoolSize: 5
+ maxPoolSize: 2
minPoolSize: 2
rules:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/mysql/rules.yaml
index 057dcefc3bf..e7d7fccf353 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/mysql/rules.yaml
@@ -202,11 +202,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/opengauss/rules.yaml
index 9f5c558c7ad..d85b6eee369 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/opengauss/rules.yaml
@@ -202,11 +202,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/postgresql/rules.yaml
index 95242583a64..f62689b5513 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/jdbc/conf/postgresql/rules.yaml
@@ -202,11 +202,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/mysql/database-sharding-and-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/mysql/database-sharding-and-encrypt.yaml
index e00104408f6..92b5ecf416c 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/mysql/database-sharding-and-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/mysql/database-sharding-and-encrypt.yaml
@@ -192,11 +192,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/opengauss/database-sharding-and-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/opengauss/database-sharding-and-encrypt.yaml
index d1a80480fa2..dae7132fd28 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/opengauss/database-sharding-and-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/opengauss/database-sharding-and-encrypt.yaml
@@ -192,11 +192,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/postgresql/database-sharding-and-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/postgresql/database-sharding-and-encrypt.yaml
index f16f93f6d2d..f8e39809027 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/postgresql/database-sharding-and-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/conf/postgresql/database-sharding-and-encrypt.yaml
@@ -192,11 +192,11 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
keyGenerators:
constant:
- type: E2E.FIXTURE
+ type: E2E.KEYGEN.FIXTURE
auditors:
auditor_constant:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/mysql/rules.yaml
index aa8f7f9371b..1cef72e6f7b 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/mysql/rules.yaml
@@ -238,7 +238,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/opengauss/rules.yaml
index e04de3d5690..58cf304b054 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/opengauss/rules.yaml
@@ -238,7 +238,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/postgresql/rules.yaml
index 04812a4e241..6ff86ba5abe 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/jdbc/conf/postgresql/rules.yaml
@@ -238,7 +238,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/mysql/database-sharding-and-shadow.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/mysql/database-sharding-and-shadow.yaml
index 16a49d0f449..462a76456bb 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/mysql/database-sharding-and-shadow.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/mysql/database-sharding-and-shadow.yaml
@@ -218,7 +218,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/opengauss/database-sharding-and-shadow.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/opengauss/database-sharding-and-shadow.yaml
index 25a3a2d6b04..415168a5ee2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/opengauss/database-sharding-and-shadow.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/opengauss/database-sharding-and-shadow.yaml
@@ -218,7 +218,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/postgresql/database-sharding-and-shadow.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/postgresql/database-sharding-and-shadow.yaml
index ca1d1a8d028..ea4fd83cc70 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/postgresql/database-sharding-and-shadow.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/proxy/conf/postgresql/database-sharding-and-shadow.yaml
@@ -218,7 +218,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/mysql/rules.yaml
index 1205b3613fc..cb7c7734570 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/mysql/rules.yaml
@@ -238,7 +238,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/opengauss/rules.yaml
index a7b5c593117..f4b9a49ec7e 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/opengauss/rules.yaml
@@ -238,7 +238,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/postgresql/rules.yaml
index f5caa1b1688..e4de6c3a375 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/jdbc/conf/postgresql/rules.yaml
@@ -238,7 +238,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/mysql/database-sharding-encrypt-shadow.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/mysql/database-sharding-encrypt-shadow.yaml
index 2f601027c39..78fad932f27 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/mysql/database-sharding-encrypt-shadow.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/mysql/database-sharding-encrypt-shadow.yaml
@@ -218,7 +218,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/opengauss/database-sharding-encrypt-shadow.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/opengauss/database-sharding-encrypt-shadow.yaml
index b647597bdb1..e25869128ef 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/opengauss/database-sharding-encrypt-shadow.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/opengauss/database-sharding-encrypt-shadow.yaml
@@ -218,7 +218,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/postgresql/database-sharding-encrypt-shadow.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/postgresql/database-sharding-encrypt-shadow.yaml
index 027b8dbe78c..fc573ae1986 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/postgresql/database-sharding-encrypt-shadow.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/proxy/conf/postgresql/database-sharding-encrypt-shadow.yaml
@@ -218,7 +218,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
- !SHADOW
dataSources:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/mysql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/mysql/rules.yaml
index 3a2f1eed2f9..c002242344b 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/mysql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/mysql/rules.yaml
@@ -76,7 +76,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
t_product_hint_inline:
type: HINT_INLINE
props:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/opengauss/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/opengauss/rules.yaml
index 80c72358679..e0581b7896d 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/opengauss/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/opengauss/rules.yaml
@@ -76,7 +76,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
t_product_hint_inline:
type: HINT_INLINE
props:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/postgresql/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/postgresql/rules.yaml
index fa721c3a4c9..79dfe8478b3 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/postgresql/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/jdbc/conf/postgresql/rules.yaml
@@ -76,7 +76,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
t_product_hint_inline:
type: HINT_INLINE
props:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/mysql/database-tbl.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/mysql/database-tbl.yaml
index 11553092f9a..b1c5757f5ae 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/mysql/database-tbl.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/mysql/database-tbl.yaml
@@ -75,7 +75,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
t_product_hint_inline:
type: HINT_INLINE
props:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/opengauss/database-tbl.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/opengauss/database-tbl.yaml
index a85f6b9935e..fbe22214683 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/opengauss/database-tbl.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/opengauss/database-tbl.yaml
@@ -75,7 +75,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
t_product_hint_inline:
type: HINT_INLINE
props:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/database-tbl.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/database-tbl.yaml
index ef649acf279..3792df5de13 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/database-tbl.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/postgresql/database-tbl.yaml
@@ -75,7 +75,7 @@ rules:
shardingAlgorithms:
e2e_standard_fixture:
- type: E2E.STANDARD.FIXTURE
+ type: E2E.SHARDING.STANDARD.FIXTURE
t_product_hint_inline:
type: HINT_INLINE
props: