You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/02/19 11:15:11 UTC

[shardingsphere] branch master updated (313c3c4 -> 6c7937d)

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

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


    from 313c3c4  Refactor InventoryTaskSplitterTest (#9438)
     add 6c7937d  Keep local YAML data source configuration consist with registry center (#9440)

No new revisions were added by this update.

Summary of changes:
 .../EncryptSQLRewriterParameterizedTest.java       |  4 +-
 .../resources/yaml/encrypt/query-with-cipher.yaml  | 12 +++--
 .../resources/yaml/encrypt/query-with-plain.yaml   | 12 +++--
 .../src/test/resources/yaml/ha-rule.yaml           | 56 +++++++++++++---------
 .../test/resources/yaml/replica-query-rule.yaml    | 56 +++++++++++++---------
 .../src/test/resources/yaml/shadow-rule.yaml       | 24 ++++++----
 .../MixSQLRewriterParameterizedTest.java           |  4 +-
 .../ShardingSQLRewriterParameterizedTest.java      |  4 +-
 .../test/resources/yaml/mix/query-with-cipher.yaml | 12 +++--
 .../test/resources/yaml/mix/query-with-plain.yaml  | 12 +++--
 .../resources/yaml/sharding/sharding-rule.yaml     | 12 +++--
 .../governance/core/config/ConfigCenter.java       |  6 +--
 .../metadata/DataSourceChangedListener.java        |  4 +-
 .../yaml/config/YamlConfigurationConverter.java    | 12 ++---
 .../config/YamlDataSourceConfigurationWrap.java    |  4 +-
 .../YamlDataSourceRuleConfigurationWrap.java       |  1 +
 .../yaml/config/YamlDataSourceConfiguration.java   |  3 +-
 .../yaml/config/YamlRootRuleConfigurations.java    |  3 +-
 .../YamlDataSourceConfigurationSwapper.java        | 26 ++++++++--
 .../YamlDataSourceConfigurationSwapperTest.java    | 14 +++---
 .../yaml/YamlShardingSphereDataSourceFactory.java  |  9 +++-
 ...lGovernanceShardingSphereDataSourceFactory.java |  7 ++-
 .../configWithReplicaQueryDataSourceWithProps.yaml | 42 +++++++++-------
 ...nfigWithReplicaQueryDataSourceWithoutProps.yaml | 42 +++++++++-------
 .../sharding/configWithDataSourceWithProps.yaml    | 28 ++++++-----
 .../sharding/configWithDataSourceWithoutProps.yaml | 28 ++++++-----
 .../configWithDataSourceWithProps.yaml             | 56 ++++++++++++----------
 .../configWithDataSourceWithoutProps.yaml          | 56 ++++++++++++----------
 .../configWithDataSourceWithoutRules.yaml          | 56 ++++++++++++----------
 .../src/test/resources/yaml/unit/sharding.yaml     | 24 ++++++----
 .../scaling/core/util/JobConfigurationUtil.java    |  2 +-
 31 files changed, 373 insertions(+), 258 deletions(-)
 rename {shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core => shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra}/yaml/config/YamlDataSourceConfiguration.java (89%)
 rename shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java => shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/swapper/YamlDataSourceConfigurationSwapper.java (62%)
 rename shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java => shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java (77%)