You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by la...@apache.org on 2022/07/11 13:49:08 UTC
[shardingsphere] branch master updated: Update strategy result of `SHOW SHARDING TABLE RULES` (#19010)
This is an automated email from the ASF dual-hosted git repository.
lanchengxiang 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 1cfc27c3055 Update strategy result of `SHOW SHARDING TABLE RULES` (#19010)
1cfc27c3055 is described below
commit 1cfc27c3055dd1b19baeb393ebd64d17a5fef0b4
Author: Raigor <ra...@gmail.com>
AuthorDate: Mon Jul 11 21:49:01 2022 +0800
Update strategy result of `SHOW SHARDING TABLE RULES` (#19010)
* Update strategy result of `SHOW SHARDING TABLE RULES`
* Change type result of NoneShardingStrategy to empty string.
* Fix IT xml.
* Fix IT xml.
* Fix IT xml.
* Fix IT xml.
* Fix IT xml.
---
.../ComplexShardingStrategyConfiguration.java | 5 +++
.../HintShardingStrategyConfiguration.java | 5 +++
.../NoneShardingStrategyConfiguration.java | 5 +++
.../sharding/ShardingStrategyConfiguration.java | 7 ++++
.../StandardShardingStrategyConfiguration.java | 5 +++
.../query/ShardingTableRuleQueryResultSet.java | 46 ++++++----------------
.../query/ShardingTableRuleQueryResultSetTest.java | 4 +-
.../resources/cases/rql/dataset/db/show_rules.xml | 10 ++---
.../cases/rql/dataset/db/show_table_rule.xml | 2 +-
.../dbtbl_with_readwrite_splitting/show_rules.xml | 10 ++---
.../show_table_rule.xml | 2 +-
.../show_rules.xml | 12 +++---
.../show_table_rule.xml | 2 +-
.../rql/dataset/readwrite_splitting/show_rules.xml | 6 +--
.../readwrite_splitting/show_table_rule.xml | 2 +-
.../sharding_governance/mysql/show_rules.xml | 4 +-
.../sharding_governance/mysql/show_table_rule.xml | 2 +-
.../resources/cases/rql/dataset/tbl/show_rules.xml | 10 ++---
.../cases/rql/dataset/tbl/show_table_rule.xml | 2 +-
19 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ComplexShardingStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ComplexShardingStrategyConfiguration.java
index 7d17c580ec3..ce4ddceeee6 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ComplexShardingStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ComplexShardingStrategyConfiguration.java
@@ -37,4 +37,9 @@ public final class ComplexShardingStrategyConfiguration implements ShardingStrat
this.shardingColumns = shardingColumns;
this.shardingAlgorithmName = shardingAlgorithmName;
}
+
+ @Override
+ public String getType() {
+ return "COMPLEX";
+ }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/HintShardingStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/HintShardingStrategyConfiguration.java
index 6d2e96beda6..30f14a80b6e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/HintShardingStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/HintShardingStrategyConfiguration.java
@@ -32,4 +32,9 @@ public final class HintShardingStrategyConfiguration implements ShardingStrategy
Preconditions.checkNotNull(shardingAlgorithmName, "Sharding algorithm name is required.");
this.shardingAlgorithmName = shardingAlgorithmName;
}
+
+ @Override
+ public String getType() {
+ return "HINT";
+ }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/NoneShardingStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/NoneShardingStrategyConfiguration.java
index 9910337f57c..42c0a2ffa4e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/NoneShardingStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/NoneShardingStrategyConfiguration.java
@@ -26,4 +26,9 @@ public final class NoneShardingStrategyConfiguration implements ShardingStrategy
public String getShardingAlgorithmName() {
return "";
}
+
+ @Override
+ public String getType() {
+ return "";
+ }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ShardingStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ShardingStrategyConfiguration.java
index 922da1b9226..e10c3f0b632 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ShardingStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/ShardingStrategyConfiguration.java
@@ -28,4 +28,11 @@ public interface ShardingStrategyConfiguration {
* @return sharding algorithm name
*/
String getShardingAlgorithmName();
+
+ /**
+ * Get type.
+ *
+ * @return type
+ */
+ String getType();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/StandardShardingStrategyConfiguration.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/StandardShardingStrategyConfiguration.java
index 6f1bfbf1dc0..013a216bd17 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/StandardShardingStrategyConfiguration.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/config/strategy/sharding/StandardShardingStrategyConfiguration.java
@@ -35,4 +35,9 @@ public final class StandardShardingStrategyConfiguration implements ShardingStra
this.shardingColumn = shardingColumn;
this.shardingAlgorithmName = shardingAlgorithmName;
}
+
+ @Override
+ public String getType() {
+ return "STANDARD";
+ }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
index 09b7f0d8255..73854a5ae2a 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingTableRuleQueryResultSet.java
@@ -93,14 +93,14 @@ public final class ShardingTableRuleQueryResultSet implements DistSQLResultSet {
result.add(shardingTableRuleConfig.getLogicTable());
result.add(shardingTableRuleConfig.getActualDataNodes());
result.add("");
- result.add(getDatabaseStrategyType(shardingTableRuleConfig));
- result.add(getDatabaseShardingColumn(shardingTableRuleConfig));
Optional<ShardingStrategyConfiguration> databaseShardingStrategyConfig = getDatabaseShardingStrategy(shardingTableRuleConfig);
+ result.add(databaseShardingStrategyConfig.map(this::getStrategyType).orElse(""));
+ result.add(databaseShardingStrategyConfig.map(this::getShardingColumn).orElse(""));
result.add(databaseShardingStrategyConfig.map(this::getAlgorithmType).orElse(""));
result.add(databaseShardingStrategyConfig.map(this::getAlgorithmProperties).orElse(""));
- result.add(getTableStrategyType(shardingTableRuleConfig.getTableShardingStrategy()));
- result.add(getTableShardingColumn(shardingTableRuleConfig.getTableShardingStrategy()));
Optional<ShardingStrategyConfiguration> tableShardingStrategyConfig = getTableShardingStrategy(shardingTableRuleConfig.getTableShardingStrategy());
+ result.add(tableShardingStrategyConfig.map(this::getStrategyType).orElse(""));
+ result.add(tableShardingStrategyConfig.map(this::getShardingColumn).orElse(""));
result.add(tableShardingStrategyConfig.map(this::getAlgorithmType).orElse(""));
result.add(tableShardingStrategyConfig.map(this::getAlgorithmProperties).orElse(""));
result.add(getKeyGenerateColumn(shardingTableRuleConfig.getKeyGenerateStrategy()));
@@ -118,9 +118,9 @@ public final class ShardingTableRuleQueryResultSet implements DistSQLResultSet {
result.add("");
result.add("");
result.add("");
- result.add(getTableStrategyType(shardingAutoTableRuleConfig.getShardingStrategy()));
- result.add(getTableShardingColumn(shardingAutoTableRuleConfig.getShardingStrategy()));
Optional<ShardingStrategyConfiguration> tableShardingStrategyConfig = getTableShardingStrategy(shardingAutoTableRuleConfig.getShardingStrategy());
+ result.add(tableShardingStrategyConfig.map(this::getStrategyType).orElse(""));
+ result.add(tableShardingStrategyConfig.map(this::getShardingColumn).orElse(""));
result.add(tableShardingStrategyConfig.map(this::getAlgorithmType).orElse(""));
result.add(tableShardingStrategyConfig.map(this::getAlgorithmProperties).orElse(""));
result.add(getKeyGenerateColumn(shardingAutoTableRuleConfig.getKeyGenerateStrategy()));
@@ -129,18 +129,6 @@ public final class ShardingTableRuleQueryResultSet implements DistSQLResultSet {
return result;
}
- private String getDatabaseStrategyType(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
- Optional<ShardingStrategyConfiguration> databaseShardingStrategy = getDatabaseShardingStrategy(shardingTableRuleConfig);
- return databaseShardingStrategy.isPresent() && !(databaseShardingStrategy.get() instanceof NoneShardingStrategyConfiguration)
- ? getAlgorithmConfiguration(databaseShardingStrategy.get().getShardingAlgorithmName()).getType()
- : "";
- }
-
- private String getDatabaseShardingColumn(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
- Optional<ShardingStrategyConfiguration> databaseShardingStrategy = getDatabaseShardingStrategy(shardingTableRuleConfig);
- return databaseShardingStrategy.isPresent() ? getShardingColumn(databaseShardingStrategy.get()) : "";
- }
-
private String getShardingColumn(final ShardingStrategyConfiguration shardingStrategyConfig) {
if (shardingStrategyConfig instanceof StandardShardingStrategyConfiguration) {
return ((StandardShardingStrategyConfiguration) shardingStrategyConfig).getShardingColumn();
@@ -151,14 +139,14 @@ public final class ShardingTableRuleQueryResultSet implements DistSQLResultSet {
return "";
}
- private String getAlgorithmType(final ShardingStrategyConfiguration databaseShardingStrategy) {
- return databaseShardingStrategy instanceof NoneShardingStrategyConfiguration ? "" : getAlgorithmConfiguration(databaseShardingStrategy.getShardingAlgorithmName()).getType();
+ private String getAlgorithmType(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ return shardingStrategyConfig instanceof NoneShardingStrategyConfiguration ? "" : getAlgorithmConfiguration(shardingStrategyConfig.getShardingAlgorithmName()).getType();
}
- private String getAlgorithmProperties(final ShardingStrategyConfiguration databaseShardingStrategy) {
- return databaseShardingStrategy instanceof NoneShardingStrategyConfiguration
+ private String getAlgorithmProperties(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ return shardingStrategyConfig instanceof NoneShardingStrategyConfiguration
? ""
- : PropertiesConverter.convert(getAlgorithmConfiguration(databaseShardingStrategy.getShardingAlgorithmName()).getProps());
+ : PropertiesConverter.convert(getAlgorithmConfiguration(shardingStrategyConfig.getShardingAlgorithmName()).getProps());
}
private Optional<ShardingStrategyConfiguration> getDatabaseShardingStrategy(final ShardingTableRuleConfiguration shardingTableRuleConfig) {
@@ -171,24 +159,14 @@ public final class ShardingTableRuleQueryResultSet implements DistSQLResultSet {
return shardingRuleConfig.getShardingAlgorithms().get(algorithmName);
}
- private String getTableStrategyType(final ShardingStrategyConfiguration shardingStrategyConfig) {
- Optional<ShardingStrategyConfiguration> tableShardingStrategy = getTableShardingStrategy(shardingStrategyConfig);
- return tableShardingStrategy.isPresent() ? getStrategyType(tableShardingStrategy.get()) : "";
- }
-
private String getStrategyType(final ShardingStrategyConfiguration shardingStrategyConfig) {
- return shardingStrategyConfig instanceof NoneShardingStrategyConfiguration ? "none" : getAlgorithmConfiguration(shardingStrategyConfig.getShardingAlgorithmName()).getType();
+ return shardingStrategyConfig.getType();
}
private Optional<ShardingStrategyConfiguration> getTableShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfig) {
return null == shardingStrategyConfig ? Optional.ofNullable(shardingRuleConfig.getDefaultTableShardingStrategy()) : Optional.of(shardingStrategyConfig);
}
- private String getTableShardingColumn(final ShardingStrategyConfiguration shardingStrategyConfig) {
- Optional<ShardingStrategyConfiguration> tableShardingStrategy = getTableShardingStrategy(shardingStrategyConfig);
- return tableShardingStrategy.isPresent() ? getShardingColumn(tableShardingStrategy.get()) : "";
- }
-
private String getKeyGenerateColumn(final KeyGenerateStrategyConfiguration keyGenerateStrategyConfig) {
return getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfig).isPresent() ? getKeyGenerateStrategyConfiguration(keyGenerateStrategyConfig).get().getColumn() : "";
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShardingTableRuleQueryResultSetTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShardingTableRuleQueryResultSetTest.java
index bdcab0d85cd..f8be56e6812 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShardingTableRuleQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShardingTableRuleQueryResultSetTest.java
@@ -53,11 +53,11 @@ public final class ShardingTableRuleQueryResultSetTest {
assertThat(actual.get(0), is("t_order"));
assertThat(actual.get(1), is("ds_${0..1}.t_order_${0..1}"));
assertThat(actual.get(2), is(""));
- assertThat(actual.get(3), is("INLINE"));
+ assertThat(actual.get(3), is("STANDARD"));
assertThat(actual.get(4), is("user_id"));
assertThat(actual.get(5), is("INLINE"));
assertThat(actual.get(6), is("algorithm-expression=ds_${user_id % 2}"));
- assertThat(actual.get(7), is("INLINE"));
+ assertThat(actual.get(7), is("STANDARD"));
assertThat(actual.get(8), is("order_id"));
assertThat(actual.get(9), is("INLINE"));
assertThat(actual.get(10), is("algorithm-expression=t_order_${order_id % 2}"));
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 5547dfed5ad..b726755d381 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
@@ -32,9 +32,9 @@
<column name="key_generator_type" />
<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| 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}| | | | | | | " />
+ <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | | | | | " />
+ <row values="t_order_item| ds_${0..9}.t_order_item| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | | | item_id| IT.FIXTURE| " />
+ <row values="t_order_details| ds_${0..9}.t_order_details| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | | | | " />
+ <row values="t_order_federate_sharding| ds_${0..1}.t_order_federate_sharding| | STANDARD| 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| | STANDARD| item_id| INLINE| algorithm-expression=ds_${db_inline_item_id % 2}| | | | | | | " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_table_rule.xml
index 70c88a7f818..e41de917080 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_table_rule.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/db/show_table_rule.xml
@@ -32,5 +32,5 @@
<column name="key_generator_type" />
<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| ds_${0..9}.t_order| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | | | | | " />
</dataset>
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 67a60d793e9..64c536bd59b 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
@@ -32,9 +32,9 @@
<column name="key_generator_type" />
<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| 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}| | | " />
+ <row values="t_order| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD| user_id| IT.STANDARD.FIXTURE| | STANDARD| order_id| IT.STANDARD.FIXTURE| | | | " />
+ <row values="t_order_item| readwrite_ds_${0..9}.t_order_item_${0..9}| | STANDARD| user_id| IT.STANDARD.FIXTURE| | STANDARD| order_id| IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
+ <row values="t_order_details| readwrite_ds_${0..9}.t_order_details_${0..9}| | STANDARD| user_id| IT.STANDARD.FIXTURE| | STANDARD| order_id| IT.STANDARD.FIXTURE| | | | " />
+ <row values="t_order_item_federate_sharding | readwrite_ds_1.t_order_item_federate_sharding_${0..1}| | | | | | STANDARD| 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}| | | | | | STANDARD| order_id_sharding| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}| | | " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_table_rule.xml
index 29171f0b2b0..efcb1ae02e6 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_table_rule.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_table_rule.xml
@@ -32,5 +32,5 @@
<column name="key_generator_type" />
<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| readwrite_ds_${0..9}.t_order_${0..9}| | STANDARD| user_id| IT.STANDARD.FIXTURE| | STANDARD| order_id| IT.STANDARD.FIXTURE| | | | " />
</dataset>
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 65001492996..72f9f74734a 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,10 +32,10 @@
<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| 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}| | | " />
- <row values="t_user_encrypt_federate_sharding| readwrite_ds_1.t_user_encrypt_federate_sharding_${0..1}| | | | | | INLINE| user_id| INLINE| algorithm-expression=t_user_encrypt_federate_sharding_${user_id % 2},allow-range-query-with-inline-sharding=true| | | " />
+ <row values="t_user_item| readwrite_ds_${0..9}.t_user_item_${0..9}| | STANDARD| user_id| IT.STANDARD.FIXTURE| | STANDARD| item_id| IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
+ <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | STANDARD| address_id| IT.STANDARD.FIXTURE| | STANDARD| user_id| IT.STANDARD.FIXTURE| | user_id| IT.FIXTURE| " />
+ <row values="t_user_details| readwrite_ds_${0..9}.t_user_details_${0..9}| | STANDARD| address_id| IT.STANDARD.FIXTURE| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | " />
+ <row values="t_order_item_federate_sharding| readwrite_ds_1.t_order_item_federate_sharding_${0..1}| | | | | | STANDARD| 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}| | | | | | STANDARD| order_id_sharding| INLINE| algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}| | | " />
+ <row values="t_user_encrypt_federate_sharding| readwrite_ds_1.t_user_encrypt_federate_sharding_${0..1}| | | | | | STANDARD| user_id| INLINE| algorithm-expression=t_user_encrypt_federate_sharding_${user_id % 2},allow-range-query-with-inline-sharding=true| | | " />
</dataset>
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 7da07518afc..d78e611efb0 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| IT.FIXTURE| " />
+ <row values="t_user| readwrite_ds_${0..9}.t_user_${0..9}| | STANDARD| address_id| IT.STANDARD.FIXTURE| | STANDARD| 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/readwrite_splitting/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_rules.xml
index eef1236ce69..a5ba6d69a51 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_rules.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_rules.xml
@@ -32,7 +32,7 @@
<column name="key_generator_type" />
<column name="key_generator_props" />
</metadata>
- <row values="t_order| write-read-ds.t_order| | | | | | none| | | | | | " />
- <row values="t_order_item| write-read-ds.t_order_item| | | | | | none| | | | | | " />
- <row values="t_order_details| write-read-ds.t_order_details| | | | | | none| | | | | | " />
+ <row values="t_order| write-read-ds.t_order| | | | | | | | | | | | " />
+ <row values="t_order_item| write-read-ds.t_order_item| | | | | | | | | | | | " />
+ <row values="t_order_details| write-read-ds.t_order_details| | | | | | | | | | | | " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_table_rule.xml
index b24a5a7c6d6..914e60810b4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_table_rule.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_table_rule.xml
@@ -32,5 +32,5 @@
<column name="key_generator_type" />
<column name="key_generator_props" />
</metadata>
- <row values="t_order| write-read-ds.t_order| | | | | | none| | | | | | " />
+ <row values="t_order| write-read-ds.t_order| | | | | | | | | | | | " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_rules.xml
index cc28921c7d4..697281ecb1c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_rules.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_rules.xml
@@ -32,6 +32,6 @@
<column name="key_generator_type" />
<column name="key_generator_props" />
</metadata>
- <row values="t_order| governance_db.t_order| | | | | | none| | | | | | " />
- <row values="t_order_details| governance_db.t_order_details| | | | | | none| | | | | | " />
+ <row values="t_order| governance_db.t_order| | | | | | | | | | | | " />
+ <row values="t_order_details| governance_db.t_order_details| | | | | | | | | | | | " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_table_rule.xml
index fbe4f579b8d..5aeaedcad93 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_table_rule.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_table_rule.xml
@@ -32,5 +32,5 @@
<column name="key_generator_type" />
<column name="key_generator_props" />
</metadata>
- <row values="t_order| governance_db.t_order| | | | | | none| | | | | | " />
+ <row values="t_order| governance_db.t_order| | | | | | | | | | | | " />
</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 3236733b45e..33a2c090023 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
@@ -32,9 +32,9 @@
<column name="key_generator_type" />
<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| 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}| | | " />
+ <row values="t_order| tbl.t_order_${0..9}| | | | | | STANDARD| order_id| IT.STANDARD.FIXTURE| | | | " />
+ <row values="t_order_item| tbl.t_order_item_${0..9}| | | | | | STANDARD| order_id| IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
+ <row values="t_order_details| tbl.t_order_details_${0..9}| | | | | | STANDARD| order_id| IT.STANDARD.FIXTURE| | | | " />
+ <row values="t_order_federate_sharding| tbl.t_order_federate_sharding_${0..1}| | | | | | STANDARD| 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}| | | | | | STANDARD| item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id % 2}| | | " />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_table_rule.xml
index 1cfa115fb77..8db85eebac2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_table_rule.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/tbl/show_table_rule.xml
@@ -32,5 +32,5 @@
<column name="key_generator_type" />
<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| tbl.t_order_${0..9}| | | | | | STANDARD| order_id| IT.STANDARD.FIXTURE| | | | " />
</dataset>