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 994156c Refactor refresh federation meta data (#13922)
add 0c21f20 Separate sharding related code from scaling-core module part
2 (#13921)
No new revisions were added by this update.
Summary of changes:
.../ShardingSphereJDBCDataSourceConfiguration.java | 51 +++--------
.../typed/StandardJDBCDataSourceConfiguration.java | 60 +++++--------
.../typed/TypedDataSourceConfiguration.java | 52 +++++++++---
.../typed/TypedDataSourceConfigurationWrap.java | 33 +++++---
.../StandardJDBCTypedDataSourceCreator.java} | 32 +++----
.../creator/TypedDataSourceCreator.java} | 76 +++++++++--------
.../YamlDataSourceConfigurationSwapper.java | 15 ++++
...g.datasource.typed.TypedDataSourceConfiguration | 18 ----
...datasource.typed.creator.TypedDataSourceCreator | 2 +-
...rdingSphereJDBCDataSourceConfigurationTest.java | 2 +-
.../ShardingSphereJDBCTypedDataSourceCreator.java | 47 ++++++++++
...atasource.typed.creator.TypedDataSourceCreator} | 2 +-
.../migration/common/api/ScalingWorker.java | 5 +-
.../job/preparer/AbstractDataSourcePreparer.java | 10 +--
.../common/spi/RuleJobConfigurationPreparer.java | 56 ++++++++++++
.../scaling/core/api/impl/ScalingAPIImpl.java | 5 +-
.../scaling/core/config/JobConfiguration.java | 70 +++++++++++++++
.../scaling/core/config/RuleConfiguration.java | 9 ++
.../scaling/core/job/JobContext.java | 5 +-
.../ShardingRuleJobConfigurationPreparer.java} | 99 +++++++---------------
...gration.common.spi.RuleJobConfigurationPreparer | 2 +-
.../scaling/core/util/ResourceUtil.java | 13 ++-
.../component/MySQLDataSourcePreparerTest.java | 2 +-
.../test/mysql/env/ITEnvironmentContext.java | 8 +-
.../test/mysql/env/config/SourceConfiguration.java | 2 +-
25 files changed, 413 insertions(+), 263 deletions(-)
rename
{shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed}/ShardingSphereJDBCDataSourceConfiguration.java
(69%)
copy
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/{creator/DataSourceCreator.java
=> typed/creator/StandardJDBCTypedDataSourceCreator.java} (55%)
copy
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/{killer/DataSourceKiller.java
=> typed/creator/TypedDataSourceCreator.java} (63%)
delete mode 100644
shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration
copy
examples/example-core/config-utility/src/main/resources/META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
(88%)
rename
{shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/config/datasource
=>
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed}/ShardingSphereJDBCDataSourceConfigurationTest.java
(97%)
create mode 100644
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCTypedDataSourceCreator.java
rename
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration
=>
org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator}
(96%)
create mode 100644
shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/migration/common/spi/RuleJobConfigurationPreparer.java
rename
shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/{scaling/core/util/JobConfigurationUtil.java
=> sharding/schedule/ShardingRuleJobConfigurationPreparer.java} (81%)
copy
shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datanode.DataNodeBuilder
=>
shardingsphere-scaling/shardingsphere-scaling-core/src/main/resources/META-INF/services/org.apache.shardingsphere.migration.common.spi.RuleJobConfigurationPreparer
(90%)
