This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 fc7e2cd Minor refactor for RQL (#10516)
fc7e2cd is described below
commit fc7e2cd9ce3dcf7366dd88f32ce25641fff2d51b
Author: Haoran Meng <[email protected]>
AuthorDate: Fri May 28 12:56:45 2021 +0800
Minor refactor for RQL (#10516)
Co-authored-by: menghaoranss <[email protected]>
---
.../distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java | 2 +-
.../rql/impl/ReadwriteSplittingRulesQueryBackendHandler.java | 2 +-
.../distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java | 2 +-
.../rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java | 2 +-
.../distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
index fb035f9..2b798ba 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java
@@ -90,6 +90,6 @@ public final class DatabaseDiscoveryRulesQueryBackendHandler
extends SchemaRequi
return Arrays.asList(ruleConfig.getName(),
Joiner.on(",").join(ruleConfig.getDataSourceNames()),
discoverTypes.get(ruleConfig.getDiscoveryTypeName()).getType(),
Objects.nonNull(discoverProps) ?
Joiner.on(",").join(discoverProps.entrySet().stream()
- .map(each -> Joiner.on(":").join(each.getKey(),
each.getValue())).collect(Collectors.toList())) : "");
+ .map(each -> Joiner.on("=").join(each.getKey(),
each.getValue())).collect(Collectors.toList())) : "");
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandler.java
index c6dbce1..3a297a2 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandler.java
@@ -93,6 +93,6 @@ public final class ReadwriteSplittingRulesQueryBackendHandler
extends SchemaRequ
ruleConfig.getWriteDataSourceName(),
Joiner.on(",").join(ruleConfig.getReadDataSourceNames()),
loadBalancers.get(ruleConfig.getLoadBalancerName()).getType(),
Objects.nonNull(loadBalancerProps) ?
Joiner.on(",").join(loadBalancerProps.entrySet().stream()
- .map(each -> Joiner.on(":").join(each.getKey(),
each.getValue())).collect(Collectors.toList())) : "");
+ .map(each -> Joiner.on("=").join(each.getKey(),
each.getValue())).collect(Collectors.toList())) : "");
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
index 6371499..340718e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandler.java
@@ -233,6 +233,6 @@ public final class ShardingTableRulesQueryBackendHandler
extends SchemaRequiredB
private String buildProperties(final Properties properties) {
return Objects.nonNull(properties) ?
Joiner.on(",").join(properties.entrySet().stream()
- .map(each -> Joiner.on(":").join(each.getKey(),
each.getValue())).collect(Collectors.toList())) : "";
+ .map(each -> Joiner.on("=").join(each.getKey(),
each.getValue())).collect(Collectors.toList())) : "";
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
index c92fba3..29aeb59 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandlerTest.java
@@ -94,7 +94,7 @@ public final class
ReadwriteSplittingRulesQueryBackendHandlerTest {
assertTrue(rowData.contains("ds_primary"));
assertTrue(rowData.contains("ds_slave_0,ds_slave_1"));
assertTrue(rowData.contains("random"));
- assertTrue(rowData.contains("read_weight:2:1"));
+ assertTrue(rowData.contains("read_weight=2:1"));
}
private ReadwriteSplittingRuleConfiguration
buildReadwriteSplittingRuleConfiguration() {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
index b1a60be..c3b92fb 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/ShardingTableRulesQueryBackendHandlerTest.java
@@ -99,14 +99,14 @@ public final class
ShardingTableRulesQueryBackendHandlerTest {
assertThat(rowDataList.get(3), is("INLINE"));
assertThat(rowDataList.get(4), is("user_id"));
assertThat(rowDataList.get(5), is("INLINE"));
- assertThat(rowDataList.get(6), is("algorithm-expression:ds_${user_id %
2}"));
+ assertThat(rowDataList.get(6), is("algorithm-expression=ds_${user_id %
2}"));
assertThat(rowDataList.get(7), is("INLINE"));
assertThat(rowDataList.get(8), is("order_id"));
assertThat(rowDataList.get(9), is("INLINE"));
- assertThat(rowDataList.get(10),
is("algorithm-expression:t_order_${order_id % 2}"));
+ assertThat(rowDataList.get(10),
is("algorithm-expression=t_order_${order_id % 2}"));
assertThat(rowDataList.get(11), is("order_id"));
assertThat(rowDataList.get(12), is("SNOWFLAKE"));
- assertThat(rowDataList.get(13), is("worker-id:123"));
+ assertThat(rowDataList.get(13), is("worker-id=123"));
}
private Collection<RuleConfiguration> buildShardingConfiguration() {
