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 d4d1ca2 Minor refactor for RQL (#10625)
d4d1ca2 is described below
commit d4d1ca252210de8812e5a53c86a8f8045547822d
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Jun 2 20:24:10 2021 +0800
Minor refactor for RQL (#10625)
---
.../distsql/rql/impl/DatabaseDiscoveryRulesQueryBackendHandler.java | 3 ++-
.../backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java | 3 ++-
.../distsql/rql/impl/ReadwriteSplittingRulesQueryBackendHandler.java | 3 ++-
3 files changed, 6 insertions(+), 3 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 2b798ba..5e1c1f1 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
@@ -86,7 +86,8 @@ public final class DatabaseDiscoveryRulesQueryBackendHandler
extends SchemaRequi
@Override
public Collection<Object> getRowData() {
DatabaseDiscoveryDataSourceRuleConfiguration ruleConfig = data.next();
- Properties discoverProps =
discoverTypes.get(ruleConfig.getDiscoveryTypeName()).getProps();
+ Properties discoverProps =
Objects.nonNull(discoverTypes.get(ruleConfig.getDiscoveryTypeName()))
+ ?
discoverTypes.get(ruleConfig.getDiscoveryTypeName()).getProps() : null;
return Arrays.asList(ruleConfig.getName(),
Joiner.on(",").join(ruleConfig.getDataSourceNames()),
discoverTypes.get(ruleConfig.getDiscoveryTypeName()).getType(),
Objects.nonNull(discoverProps) ?
Joiner.on(",").join(discoverProps.entrySet().stream()
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
index 912b658..5d1f507 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/impl/EncryptRulesQueryBackendHandler.java
@@ -108,7 +108,8 @@ public final class EncryptRulesQueryBackendHandler extends
SchemaRequiredBackend
@Override
public Collection<Object> getRowData() {
Entry<String, EncryptColumnRuleConfiguration> entry = data.next();
- Properties encryptProps =
encryptors.get(entry.getValue().getEncryptorName()).getProps();
+ Properties encryptProps =
Objects.nonNull(encryptors.get(entry.getValue().getEncryptorName()))
+ ?
encryptors.get(entry.getValue().getEncryptorName()).getProps() : null;
return
Arrays.asList(Splitter.on(".").splitToList(entry.getKey()).get(0),
entry.getValue().getLogicColumn(),
entry.getValue().getCipherColumn(),
entry.getValue().getPlainColumn(),
encryptors.get(entry.getValue().getEncryptorName()).getType(),
Objects.nonNull(encryptProps) ?
Joiner.on(",").join(encryptProps.entrySet().stream()
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 3a297a2..023d8eb 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
@@ -88,7 +88,8 @@ public final class ReadwriteSplittingRulesQueryBackendHandler
extends SchemaRequ
@Override
public Collection<Object> getRowData() {
ReadwriteSplittingDataSourceRuleConfiguration ruleConfig = data.next();
- Properties loadBalancerProps =
loadBalancers.get(ruleConfig.getLoadBalancerName()).getProps();
+ Properties loadBalancerProps =
Objects.nonNull(loadBalancers.get(ruleConfig.getLoadBalancerName()))
+ ?
loadBalancers.get(ruleConfig.getLoadBalancerName()).getProps() : null;
return Arrays.asList(ruleConfig.getName(),
ruleConfig.getAutoAwareDataSourceName(),
ruleConfig.getWriteDataSourceName(),
Joiner.on(",").join(ruleConfig.getReadDataSourceNames()),
loadBalancers.get(ruleConfig.getLoadBalancerName()).getType(),
