This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 46fc6683e9c Adjust algorithm parameters in RQL type DistSQL to json
format (#29104)
46fc6683e9c is described below
commit 46fc6683e9c057bb1dcea013d0d361e54a957880
Author: jiangML <[email protected]>
AuthorDate: Tue Nov 21 19:19:45 2023 +0800
Adjust algorithm parameters in RQL type DistSQL to json format (#29104)
* Adjust algorithm parameters in RQL type DistSQL to json format
* Fix checkstyle error
* Fix e2e test error
---
.../distsql/handler/query/ShowShardingAuditorsExecutor.java | 3 ++-
.../handler/query/ShowShardingKeyGeneratorExecutor.java | 3 ++-
.../handler/query/ShowUnusedShardingAuditorsExecutor.java | 3 ++-
.../distsql/query/ShowShardingAuditorsExecutorTest.java | 7 ++++---
.../distsql/query/ShowShardingKeyGeneratorExecutorTest.java | 7 ++++---
.../distsql/query/ShowUnusedShardingAuditorsExecutorTest.java | 6 ++++--
.../shardingsphere/infra/props/PropertiesConverter.java | 3 +++
.../distsql/handler/query/ShowGlobalClockRuleExecutor.java | 4 +++-
.../handler/query/ShowGlobalClockRuleExecutorTest.java | 11 +++++++----
.../resources/cases/rql/dataset/db/show_sharding_auditors.xml | 2 +-
.../cases/rql/dataset/db/show_sharding_generators.xml | 2 +-
.../dbtbl_with_readwrite_splitting/show_sharding_auditors.xml | 2 +-
.../show_sharding_generators.xml | 2 +-
.../show_sharding_auditors.xml | 2 +-
.../show_sharding_generators.xml | 2 +-
.../dataset/sharding_and_encrypt/show_sharding_auditors.xml | 2 +-
.../dataset/sharding_and_encrypt/show_sharding_generators.xml | 2 +-
.../cases/rql/dataset/tbl/show_sharding_auditors.xml | 2 +-
.../cases/rql/dataset/tbl/show_sharding_generators.xml | 2 +-
19 files changed, 41 insertions(+), 26 deletions(-)
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
index 142a4f0624c..8b9eb452903 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.infra.props.PropertiesConverter;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAuditorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -46,7 +47,7 @@ public final class ShowShardingAuditorsExecutor implements
RQLExecutor<ShowShard
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
while (data.hasNext()) {
Entry<String, AlgorithmConfiguration> entry = data.next();
- result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(), entry.getValue().getProps()));
+ result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(),
PropertiesConverter.convert(entry.getValue().getProps())));
}
return result;
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
index a79d83a50f5..8f938fd5c98 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.infra.props.PropertiesConverter;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.distsql.statement.ShowShardingKeyGeneratorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -48,7 +49,7 @@ public final class ShowShardingKeyGeneratorExecutor
implements RQLExecutor<ShowS
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
while (data.hasNext()) {
Entry<String, AlgorithmConfiguration> entry = data.next();
- result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(), entry.getValue().getProps().toString()));
+ result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(),
PropertiesConverter.convert(entry.getValue().getProps())));
}
return result;
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
index f84c0c9526e..7b30173c55a 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.infra.props.PropertiesConverter;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration;
import
org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAuditorsStatement;
@@ -50,7 +51,7 @@ public final class ShowUnusedShardingAuditorsExecutor
implements RQLExecutor<Sho
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
for (Entry<String, AlgorithmConfiguration> entry :
shardingRuleConfig.getAuditors().entrySet()) {
if (!inUsedAuditors.contains(entry.getKey())) {
- result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(), entry.getValue().getProps().toString()));
+ result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(),
PropertiesConverter.convert(entry.getValue().getProps())));
}
}
return result;
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java
index 5185eb20bcd..9fd996cd085 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java
@@ -26,12 +26,13 @@ import
org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingAuditorsExecutor;
import
org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAuditorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -54,7 +55,7 @@ class ShowShardingAuditorsExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("sharding_key_required_auditor"));
assertThat(row.getCell(2), is("DML_SHARDING_CONDITIONS"));
- assertThat(row.getCell(3).toString(), is("{}"));
+ assertThat(row.getCell(3).toString(), is("{\"key\":\"value\"}"));
}
@Test
@@ -70,7 +71,7 @@ class ShowShardingAuditorsExecutorTest {
private ShardingRuleConfiguration createRuleConfiguration() {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
- result.getAuditors().put("sharding_key_required_auditor", new
AlgorithmConfiguration("DML_SHARDING_CONDITIONS", new Properties()));
+ result.getAuditors().put("sharding_key_required_auditor", new
AlgorithmConfiguration("DML_SHARDING_CONDITIONS", PropertiesBuilder.build(new
Property("key", "value"))));
return result;
}
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java
index 0c81baf9170..8a2ae30cbf9 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java
@@ -26,12 +26,13 @@ import
org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingKeyGeneratorExecutor;
import
org.apache.shardingsphere.sharding.distsql.statement.ShowShardingKeyGeneratorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -55,7 +56,7 @@ class ShowShardingKeyGeneratorExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("snowflake"));
assertThat(row.getCell(2), is("SNOWFLAKE"));
- assertThat(row.getCell(3), is("{}"));
+ assertThat(row.getCell(3), is("{\"key\":\"value\"}"));
}
@Test
@@ -72,7 +73,7 @@ class ShowShardingKeyGeneratorExecutorTest {
private ShardingRuleConfiguration createRuleConfiguration() {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
- result.getKeyGenerators().put("snowflake", new
AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+ result.getKeyGenerators().put("snowflake", new
AlgorithmConfiguration("SNOWFLAKE", PropertiesBuilder.build(new Property("key",
"value"))));
return result;
}
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java
index de62418838d..8b925d7de4f 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java
@@ -29,6 +29,8 @@ import
org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAudi
import
org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingAuditorsExecutor;
import
org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAuditorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
import java.util.Collection;
@@ -53,7 +55,7 @@ class ShowUnusedShardingAuditorsExecutorTest {
LocalDataQueryResultRow row = iterator.next();
assertThat(row.getCell(1), is("fixture"));
assertThat(row.getCell(2), is("FIXTURE"));
- assertThat(row.getCell(3), is("{}"));
+ assertThat(row.getCell(3), is("{\"key\":\"value\"}"));
}
@Test
@@ -78,7 +80,7 @@ class ShowUnusedShardingAuditorsExecutorTest {
private RuleConfiguration createRuleConfiguration() {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
result.getAuditors().put("sharding_key_required_auditor", new
AlgorithmConfiguration("DML_SHARDING_CONDITIONS", new Properties()));
- result.getAuditors().put("fixture", new
AlgorithmConfiguration("FIXTURE", null));
+ result.getAuditors().put("fixture", new
AlgorithmConfiguration("FIXTURE", PropertiesBuilder.build(new Property("key",
"value"))));
result.getAutoTables().add(createShardingAutoTableRuleConfiguration());
return result;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/props/PropertiesConverter.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/props/PropertiesConverter.java
index bc3fc0a88f5..fb356f00517 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/props/PropertiesConverter.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/props/PropertiesConverter.java
@@ -38,6 +38,9 @@ public final class PropertiesConverter {
* @return converted string content
*/
public static String convert(final Properties props) {
+ if (null == props) {
+ return "";
+ }
Map<Object, Object> sortedProps = new LinkedHashMap<>();
props.keySet().stream().map(Object::toString).sorted().forEach(each ->
sortedProps.put(each, props.get(each)));
return sortedProps.isEmpty() ? "" :
JsonUtils.toJsonString(sortedProps);
diff --git
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
index a70dad586cf..19994a29254 100644
---
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
+++
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
@@ -23,6 +23,7 @@ import
org.apache.shardingsphere.globalclock.core.rule.GlobalClockRule;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement;
+import org.apache.shardingsphere.infra.props.PropertiesConverter;
import java.util.Arrays;
import java.util.Collection;
@@ -36,7 +37,8 @@ public final class ShowGlobalClockRuleExecutor implements
MetaDataRequiredQuerya
@Override
public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereMetaData metaData, final ShowGlobalClockRuleStatement
sqlStatement) {
GlobalClockRuleConfiguration ruleConfig =
metaData.getGlobalRuleMetaData().getSingleRule(GlobalClockRule.class).getConfiguration();
- return Collections.singleton(new
LocalDataQueryResultRow(ruleConfig.getType(), ruleConfig.getProvider(),
String.valueOf(ruleConfig.isEnabled()), ruleConfig.getProps().toString()));
+ return Collections.singleton(new
LocalDataQueryResultRow(ruleConfig.getType(), ruleConfig.getProvider(),
+ String.valueOf(ruleConfig.isEnabled()),
PropertiesConverter.convert(ruleConfig.getProps())));
}
@Override
diff --git
a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
index c1f073e03fc..450fec66f8d 100644
---
a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
+++
b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
@@ -17,14 +17,16 @@
package org.apache.shardingsphere.globalclock.distsql.handler.query;
+import
org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
import org.apache.shardingsphere.globalclock.core.rule.GlobalClockRule;
-import
org.apache.shardingsphere.globalclock.core.rule.builder.DefaultGlobalClockRuleConfigurationBuilder;
+import
org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
-import
org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement;
+import org.apache.shardingsphere.test.util.PropertiesBuilder;
+import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
import java.util.Collection;
@@ -51,7 +53,7 @@ class ShowGlobalClockRuleExecutorTest {
assertThat(row.getCell(1), is("TSO"));
assertThat(row.getCell(2), is("local"));
assertThat(row.getCell(3), is("false"));
- assertThat(row.getCell(4), is("{}"));
+ assertThat(row.getCell(4), is("{\"key\":\"value\"}"));
}
@Test
@@ -68,7 +70,8 @@ class ShowGlobalClockRuleExecutorTest {
private ShardingSphereMetaData mockMetaData() {
GlobalClockRule sqlParserRule = mock(GlobalClockRule.class);
- when(sqlParserRule.getConfiguration()).thenReturn(new
DefaultGlobalClockRuleConfigurationBuilder().build());
+ GlobalClockRuleConfiguration globalClockRuleConfig = new
GlobalClockRuleConfiguration("TSO", "local", false, PropertiesBuilder.build(new
Property("key", "value")));
+
when(sqlParserRule.getConfiguration()).thenReturn(globalClockRuleConfig);
return new ShardingSphereMetaData(new LinkedHashMap<>(),
mock(ResourceMetaData.class),
new RuleMetaData(Collections.singleton(sqlParserRule)), new
ConfigurationProperties(new Properties()));
}
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_auditors.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_auditors.xml
index 272eebbe056..99de34197a1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_auditors.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_auditors.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auditor_constant| IT.AUDITOR.FIXTURE| {}" />
+ <row values="auditor_constant| IT.AUDITOR.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_generators.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_generators.xml
index 22392646802..4275896cc95 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_generators.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/show_sharding_generators.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auto_increment| IT.AUTO_INCREMENT.FIXTURE| {}" />
+ <row values="auto_increment| IT.AUTO_INCREMENT.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_auditors.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_auditors.xml
index 272eebbe056..99de34197a1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_auditors.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_auditors.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auditor_constant| IT.AUDITOR.FIXTURE| {}" />
+ <row values="auditor_constant| IT.AUDITOR.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_generators.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_generators.xml
index 22392646802..4275896cc95 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_generators.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_generators.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auto_increment| IT.AUTO_INCREMENT.FIXTURE| {}" />
+ <row values="auto_increment| IT.AUTO_INCREMENT.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_auditors.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_auditors.xml
index 272eebbe056..99de34197a1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_auditors.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_auditors.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auditor_constant| IT.AUDITOR.FIXTURE| {}" />
+ <row values="auditor_constant| IT.AUDITOR.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 442a18aa3a6..7b0fdad232c 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| IT.FIXTURE| {}" />
+ <row values="constant| IT.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
index 272eebbe056..99de34197a1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auditor_constant| IT.AUDITOR.FIXTURE| {}" />
+ <row values="auditor_constant| IT.AUDITOR.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 442a18aa3a6..7b0fdad232c 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| IT.FIXTURE| {}" />
+ <row values="constant| IT.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_auditors.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_auditors.xml
index 272eebbe056..99de34197a1 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_auditors.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_auditors.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auditor_constant| IT.AUDITOR.FIXTURE| {}" />
+ <row values="auditor_constant| IT.AUDITOR.FIXTURE| " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_generators.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_generators.xml
index 22392646802..4275896cc95 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_generators.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_generators.xml
@@ -21,5 +21,5 @@
<column name="type" />
<column name="props" />
</metadata>
- <row values="auto_increment| IT.AUTO_INCREMENT.FIXTURE| {}" />
+ <row values="auto_increment| IT.AUTO_INCREMENT.FIXTURE| " />
</dataset>
