This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.


    from 5af65e0  Move sharding and encrypt rewrite test to rewrite test module 
(#10664)
     add 012fdc1  Merge readwrite-splitting to core module (#10665)

No new revisions were added by this update.

Summary of changes:
 .../shardingsphere-readwrite-splitting/pom.xml     |  4 +-
 .../shardingsphere-readwrite-splitting-api/pom.xml | 38 -------------------
 ...infra.yaml.swapper.YamlRuleConfigurationSwapper | 19 ----------
 .../pom.xml                                        | 10 +++--
 .../RandomReplicaLoadBalanceAlgorithm.java         |  2 +-
 .../RoundRobinReplicaLoadBalanceAlgorithm.java     |  2 +-
 ...rovidedReadwriteSplittingRuleConfiguration.java |  2 +-
 .../api/ReadwriteSplittingRuleConfiguration.java   |  0
 ...dwriteSplittingDataSourceRuleConfiguration.java |  0
 .../constant/ReadwriteSplittingOrder.java          |  2 +-
 .../route}/ReadwriteSplittingSQLRouter.java        | 10 ++---
 .../route}/impl/PrimaryVisitedManager.java         |  2 +-
 .../impl/ReadwriteSplittingDataSourceRouter.java   |  4 +-
 .../rule/ReadwriteSplittingDataSourceRule.java     |  2 +-
 .../rule/ReadwriteSplittingRule.java               |  4 +-
 ...rithmProvidedReadwriteSplittingRuleBuilder.java |  8 ++--
 .../biulder/ReadwriteSplittingRuleBuilder.java     |  6 +--
 ...ReadwriteSplittingRuleConfigurationChecker.java |  2 +-
 ...ReadwriteSplittingRuleConfigurationChecker.java |  6 +--
 ...ReadwriteSplittingRuleConfigurationChecker.java |  4 +-
 .../spi/ReplicaLoadBalanceAlgorithm.java           |  0
 .../YamlReadwriteSplittingRuleConfiguration.java   |  4 +-
 ...dwriteSplittingDataSourceRuleConfiguration.java |  2 +-
 .../ReadwriteSplittingRuleStatementConverter.java  |  6 +--
 ...eAlgorithmProviderConfigurationYamlSwapper.java | 10 ++---
 ...writeSplittingRuleConfigurationYamlSwapper.java |  8 ++--
 ...org.apache.shardingsphere.infra.route.SQLRouter | 35 ++++++++++++++++++
 ...ere.infra.rule.builder.scope.SchemaRuleBuilder} |  4 +-
 ...re.infra.rule.checker.RuleConfigurationChecker} |  4 +-
 ...nfra.yaml.swapper.YamlRuleConfigurationSwapper} |  4 +-
 ...writesplitting.spi.ReplicaLoadBalanceAlgorithm} |  3 +-
 .../RandomReplicaLoadBalanceAlgorithmTest.java     |  3 +-
 .../RoundRobinReplicaLoadBalanceAlgorithmTest.java |  3 +-
 .../route}/ReadwriteSplittingSQLRouterTest.java    |  7 ++--
 .../rule/ReadwriteSplittingDataSourceRuleTest.java |  7 ++--
 .../java}/rule/ReadwriteSplittingRuleTest.java     |  4 +-
 ...mProvidedReadwriteSplittingRuleBuilderTest.java |  6 +--
 .../biulder/ReadwriteSplittingRuleBuilderTest.java |  4 +-
 ...orithmProviderConfigurationYamlSwapperTest.java | 11 +++---
 ...eSplittingRuleConfigurationYamlSwapperTest.java |  9 +++--
 ...amlReadwriteSplittingRuleConfigurationTest.java |  4 +-
 .../src/main}/test/resources/logback-test.xml      |  0
 .../resources/yaml/readwrite-splitting-rule.yaml   |  0
 .../pom.xml                                        | 43 ----------------------
 .../pom.xml                                        |  2 +-
 ...dwriteSplittingRuleSpringbootConfiguration.java |  6 +--
 ...dwriteSplittingRuleSpringBootConfiguration.java |  2 +-
 .../ReadwriteSplittingSpringBootStarterTest.java   |  4 +-
 .../pom.xml                                        |  2 +-
 ...ReadwriteSplittingRuleBeanDefinitionParser.java |  2 +-
 .../ReadwriteSplittingSpringNamespaceTest.java     |  4 +-
 .../shardingsphere-jdbc-core/pom.xml               |  2 +-
 .../jdbc/adapter/AbstractConnectionAdapter.java    |  2 +-
 .../spring/boot/SpringBootStarterTest.java         |  6 +--
 .../shardingsphere/spring/SpringNamespaceTest.java |  2 +-
 ...GovernanceSpringBootReadwriteSplittingTest.java |  4 +-
 .../GovernanceReadwriteSplittingNamespaceTest.java |  8 ++--
 .../shardingsphere-proxy-backend/pom.xml           |  2 +-
 .../AlterReadwriteSplittingRuleBackendHandler.java |  2 +-
 ...CreateReadwriteSplittingRuleBackendHandler.java |  4 +-
 .../shardingsphere-proxy-common/pom.xml            |  2 +-
 .../proxy/config/ProxyConfigurationLoaderTest.java |  4 +-
 .../swapper/YamlProxyConfigurationSwapperTest.java |  2 +-
 .../frontend/command/CommandExecutorTask.java      |  2 +-
 .../netty/FrontendChannelInboundHandler.java       |  2 +-
 65 files changed, 160 insertions(+), 214 deletions(-)
 delete mode 100644 
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/pom.xml
 delete mode 100644 
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common
 => shardingsphere-readwrite-splitting-core}/pom.xml (85%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/algorithm/RandomReplicaLoadBalanceAlgorithm.java
 (95%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
 (96%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/algorithm/config/AlgorithmProvidedReadwriteSplittingRuleConfiguration.java
 (95%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-api
 => 
shardingsphere-readwrite-splitting-core}/src/main/java/org/apache/shardingsphere/readwritesplitting/api/ReadwriteSplittingRuleConfiguration.java
 (100%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-api
 => 
shardingsphere-readwrite-splitting-core}/src/main/java/org/apache/shardingsphere/readwritesplitting/api/rule/ReadwriteSplittingDataSourceRuleConfiguration.java
 (100%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/constant/ReadwriteSplittingOrder.java
 (94%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-route/src/main/java/org/apache/shardingsphere/readwritesplitting/route/engine
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route}/ReadwriteSplittingSQLRouter.java
 (89%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-route/src/main/java/org/apache/shardingsphere/readwritesplitting/route/engine
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route}/impl/PrimaryVisitedManager.java
 (96%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-route/src/main/java/org/apache/shardingsphere/readwritesplitting/route/engine
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route}/impl/ReadwriteSplittingDataSourceRouter.java
 (95%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/ReadwriteSplittingDataSourceRule.java
 (98%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/ReadwriteSplittingRule.java
 (96%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/biulder/AlgorithmProvidedReadwriteSplittingRuleBuilder.java
 (83%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/biulder/ReadwriteSplittingRuleBuilder.java
 (88%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
 (96%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/checker/AlgorithmProvidedReadwriteSplittingRuleConfigurationChecker.java
 (84%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/rule/checker/ReadwriteSplittingRuleConfigurationChecker.java
 (90%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-api
 => 
shardingsphere-readwrite-splitting-core}/src/main/java/org/apache/shardingsphere/readwritesplitting/spi/ReplicaLoadBalanceAlgorithm.java
 (100%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/yaml/config/YamlReadwriteSplittingRuleConfiguration.java
 (89%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/yaml/config/rule/YamlReadwriteSplittingDataSourceRuleConfiguration.java
 (94%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/yaml/converter/ReadwriteSplittingRuleStatementConverter.java
 (93%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/yaml/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapper.java
 (89%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting}/yaml/swapper/ReadwriteSplittingRuleConfigurationYamlSwapper.java
 (92%)
 create mode 100644 
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.route.SQLRouter
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/resources/META-INF/services/org.apache.shardingsphere.readwritesplitting.spi.ReplicaLoadBalanceAlgorithm
 => 
shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.SchemaRuleBuilder}
 (80%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.scope.SchemaRuleBuilder
 => 
shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker}
 (78%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
 => 
shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper}
 (77%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-route/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.route.SQLRouter
 => 
shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.readwritesplitting.spi.ReplicaLoadBalanceAlgorithm}
 (81%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/algorithm/RandomReplicaLoadBalanceAlgorithmTest.java
 (94%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/algorithm/RoundRobinReplicaLoadBalanceAlgorithmTest.java
 (94%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-route/src/test/java/org/apache/shardingsphere/readwritesplitting/route/engine
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java/route}/ReadwriteSplittingSQLRouterTest.java
 (97%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/rule/ReadwriteSplittingDataSourceRuleTest.java
 (93%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/rule/ReadwriteSplittingRuleTest.java
 (96%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/rule/biulder/AlgorithmProvidedReadwriteSplittingRuleBuilderTest.java
 (89%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/rule/biulder/ReadwriteSplittingRuleBuilderTest.java
 (93%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common/yaml
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
 (88%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common/yaml
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/swapper/ReadwriteSplittingRuleConfigurationYamlSwapperTest.java
 (94%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src/test/java/org/apache/shardingsphere/readwritesplitting/common/yaml
 => 
shardingsphere-readwrite-splitting-core/src/main/test/java}/swapper/YamlRootRuleConfigurationsForYamlReadwriteSplittingRuleConfigurationTest.java
 (95%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src
 => 
shardingsphere-readwrite-splitting-core/src/main}/test/resources/logback-test.xml
 (100%)
 rename 
shardingsphere-features/shardingsphere-readwrite-splitting/{shardingsphere-readwrite-splitting-common/src
 => 
shardingsphere-readwrite-splitting-core/src/main}/test/resources/yaml/readwrite-splitting-rule.yaml
 (100%)
 delete mode 100644 
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-route/pom.xml

Reply via email to