This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 949743f3e1b Improve swap yaml data to rule configuration in
readwrite-splitting (#26090)
949743f3e1b is described below
commit 949743f3e1bdb9c98a22265dfbd106af0c361a03
Author: ChenJiaHao <[email protected]>
AuthorDate: Wed Jun 7 18:03:53 2023 +0800
Improve swap yaml data to rule configuration in readwrite-splitting (#26090)
* Improve swap yaml data to rule configuration in readwrite-splitting
* Fix code style
---
...riteSplittingRuleConfigurationEventBuilder.java | 6 ++--
.../converter/ReadwriteSplittingNodeConverter.java | 30 ++++++++++++++++--
...ReadwriteSplittingRuleConfigurationSwapper.java | 20 ++++++++++--
.../ReadwriteSplittingNodeConverterTest.java | 14 ++++++---
...writeSplittingRuleConfigurationSwapperTest.java | 36 ++++++++++++++++++++--
5 files changed, 91 insertions(+), 15 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
index 7585731ef55..df689860622 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
@@ -49,9 +49,9 @@ public final class
ReadwriteSplittingRuleConfigurationEventBuilder implements Ru
if (groupName.isPresent() && !Strings.isNullOrEmpty(event.getValue()))
{
return createReadwriteSplittingConfigEvent(databaseName,
groupName.get(), event);
}
- Optional<String> loadBalanceName =
ReadwriteSplittingNodeConverter.getLoadBalanceName(event.getKey());
- if (loadBalanceName.isPresent() &&
!Strings.isNullOrEmpty(event.getValue())) {
- return createLoadBalanceEvent(databaseName, loadBalanceName.get(),
event);
+ Optional<String> loadBalancerName =
ReadwriteSplittingNodeConverter.getLoadBalancerName(event.getKey());
+ if (loadBalancerName.isPresent() &&
!Strings.isNullOrEmpty(event.getValue())) {
+ return createLoadBalanceEvent(databaseName,
loadBalancerName.get(), event);
}
return Optional.empty();
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
index 874f44c70cc..c6053d86399 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
@@ -70,6 +70,30 @@ public final class ReadwriteSplittingNodeConverter {
return matcher.find();
}
+ /**
+ * Is readwrite-splitting data sources path.
+ *
+ * @param rulePath rule path
+ * @return true or false
+ */
+ public static boolean isDataSourcePath(final String rulePath) {
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ DATA_SOURCES_NODE + "\\.*", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(rulePath);
+ return matcher.find();
+ }
+
+ /**
+ * Is readwrite-splitting load balancer path.
+ *
+ * @param rulePath rule path
+ * @return true or false
+ */
+ public static boolean isLoadBalancerPath(final String rulePath) {
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ LOAD_BALANCER_NODE + "\\.*", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(rulePath);
+ return matcher.find();
+ }
+
/**
* Get group name.
*
@@ -83,12 +107,12 @@ public final class ReadwriteSplittingNodeConverter {
}
/**
- * Get group name.
+ * Get load balancer name.
*
* @param rulePath rule path
- * @return group name
+ * @return load balancer name
*/
- public static Optional<String> getLoadBalanceName(final String rulePath) {
+ public static Optional<String> getLoadBalancerName(final String rulePath) {
Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ LOAD_BALANCER_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
index e46f319e026..4e3d43004dc 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapper.java
@@ -21,6 +21,7 @@ import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
+import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorithmConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfigurationSwapper;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
@@ -30,9 +31,11 @@ import
org.apache.shardingsphere.readwritesplitting.constant.ReadwriteSplittingO
import
org.apache.shardingsphere.readwritesplitting.metadata.converter.ReadwriteSplittingNodeConverter;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceRuleConfiguration;
-import java.util.Collections;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Map;
import java.util.Map.Entry;
/**
@@ -66,8 +69,19 @@ public final class
NewYamlReadwriteSplittingRuleConfigurationSwapper implements
@Override
public ReadwriteSplittingRuleConfiguration swapToObject(final
Collection<YamlDataNode> dataNodes) {
- // TODO
- return new
ReadwriteSplittingRuleConfiguration(Collections.emptyList(),
Collections.emptyMap());
+ Collection<ReadwriteSplittingDataSourceRuleConfiguration> dataSources
= new LinkedList<>();
+ Map<String, AlgorithmConfiguration> loadBalancerMap = new
LinkedHashMap<>(dataNodes.size(), 1F);
+ for (YamlDataNode each : dataNodes) {
+ if
(ReadwriteSplittingNodeConverter.isDataSourcePath(each.getKey())) {
+ ReadwriteSplittingNodeConverter.getGroupName(each.getKey())
+ .ifPresent(groupName ->
dataSources.add(swapToObject(groupName, YamlEngine.unmarshal(each.getValue(),
YamlReadwriteSplittingDataSourceRuleConfiguration.class))));
+ } else if
(ReadwriteSplittingNodeConverter.isLoadBalancerPath(each.getKey())) {
+
ReadwriteSplittingNodeConverter.getLoadBalancerName(each.getKey())
+ .ifPresent(
+ loadBalancerName ->
loadBalancerMap.put(loadBalancerName,
algorithmSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(),
YamlAlgorithmConfiguration.class))));
+ }
+ }
+ return new ReadwriteSplittingRuleConfiguration(dataSources,
loadBalancerMap);
}
private ReadwriteSplittingDataSourceRuleConfiguration swapToObject(final
String name, final YamlReadwriteSplittingDataSourceRuleConfiguration
yamlDataSourceRuleConfig) {
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverterTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverterTest.java
index 2f07f6a48f1..6de042f87e7 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverterTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverterTest.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ReadwriteSplittingNodeConverterTest {
@@ -38,8 +39,13 @@ class ReadwriteSplittingNodeConverterTest {
}
@Test
- void assertGetRuleTagNameByRulePath() {
-
assertTrue(ReadwriteSplittingNodeConverter.isReadwriteSplittingPath("/metadata/foo_db/rules/readwrite_splitting/group_0"));
+ void assertCheckIsTargetRuleByRulePath() {
+
assertTrue(ReadwriteSplittingNodeConverter.isReadwriteSplittingPath("/metadata/foo_db/rules/readwrite_splitting/data_sources/group_0"));
+
assertFalse(ReadwriteSplittingNodeConverter.isReadwriteSplittingPath("/metadata/foo_db/rules/foo/data_sources/group_0"));
+
assertTrue(ReadwriteSplittingNodeConverter.isDataSourcePath("/metadata/foo_db/rules/readwrite_splitting/data_sources/group_0"));
+
assertFalse(ReadwriteSplittingNodeConverter.isDataSourcePath("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random"));
+
assertTrue(ReadwriteSplittingNodeConverter.isLoadBalancerPath("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random"));
+
assertFalse(ReadwriteSplittingNodeConverter.isLoadBalancerPath("/metadata/foo_db/rules/readwrite_splitting/data_sources/group_0"));
}
@Test
@@ -50,8 +56,8 @@ class ReadwriteSplittingNodeConverterTest {
}
@Test
- void assertGetLoadBalanceNameByRulePath() {
- Optional<String> actual =
ReadwriteSplittingNodeConverter.getLoadBalanceName("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random");
+ void assertGetLoadBalancerNameByRulePath() {
+ Optional<String> actual =
ReadwriteSplittingNodeConverter.getLoadBalancerName("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("random"));
}
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
index 72aceb7eff5..add7dcdae55 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
@@ -21,16 +21,18 @@ import
org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
+import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
import org.junit.jupiter.api.Test;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Arrays;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.Properties;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
class NewYamlReadwriteSplittingRuleConfigurationSwapperTest {
@@ -55,4 +57,34 @@ class NewYamlReadwriteSplittingRuleConfigurationSwapperTest {
assertThat(iterator.next().getKey(), is("data_sources/group_0"));
assertThat(iterator.next().getKey(), is("load_balancers/random"));
}
+
+ @Test
+ void assertSwapToObjectEmpty() {
+ Collection<YamlDataNode> config = new LinkedList<>();
+ ReadwriteSplittingRuleConfiguration result =
swapper.swapToObject(config);
+ assertThat(result.getDataSources().size(), is(0));
+ assertThat(result.getLoadBalancers().size(), is(0));
+ }
+
+ @Test
+ void assertSwapToObject() {
+ Collection<YamlDataNode> config = new LinkedList<>();
+ config.add(new
YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/data_sources/group_0",
"loadBalancerName: random\n"
+ + "readDataSourceNames:\n"
+ + "- read_ds_0\n"
+ + "- read_ds_1\n"
+ + "transactionalReadQueryStrategy: DYNAMIC\n"
+ + "writeDataSourceName: write_ds\n"));
+ config.add(new
YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random",
"type: random\n"));
+ ReadwriteSplittingRuleConfiguration result =
swapper.swapToObject(config);
+ assertThat(result.getDataSources().size(), is(1));
+ assertThat(result.getDataSources().iterator().next().getName(),
is("group_0"));
+
assertThat(result.getDataSources().iterator().next().getWriteDataSourceName(),
is("write_ds"));
+
assertThat(result.getDataSources().iterator().next().getReadDataSourceNames().size(),
is(2));
+
assertThat(result.getDataSources().iterator().next().getLoadBalancerName(),
is("random"));
+
assertThat(result.getDataSources().iterator().next().getTransactionalReadQueryStrategy(),
is(TransactionalReadQueryStrategy.DYNAMIC));
+ assertThat(result.getLoadBalancers().size(), is(1));
+ assertThat(result.getLoadBalancers().get("random").getType(),
is("random"));
+ assertThat(result.getLoadBalancers().get("random").getProps().size(),
is(0));
+ }
}
