You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/11/16 03:34:19 UTC
[shardingsphere] branch master updated (86c5a51 -> 85a4d38)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 86c5a51 Rename refreshSchema (#8166)
add 85a4d38 Extract scaling job service. (#8155)
No new revisions were added by this update.
Summary of changes:
.../src/main/resources/conf/server.yaml | 2 +-
.../scaling/web/HttpServerHandler.java | 87 ++++-----
.../src/main/resources/conf/server.yaml | 2 +-
.../scaling/fixture/FixtureNopManager.java | 5 +
.../scaling/web/HttpServerHandlerTest.java | 28 +--
.../scaling/web/HttpServerInitializerTest.java | 11 ++
.../shardingsphere-scaling-core/pom.xml | 6 +
.../scaling/core/ScalingJobController.java | 122 ------------
.../core/check/AbstractDataConsistencyChecker.java | 3 +-
.../scaling/core/config/JobConfiguration.java | 3 -
.../scaling/core/config/RuleConfiguration.java | 6 +-
.../scaling/core/config/ServerConfiguration.java | 2 +-
...ngSphereJDBCScalingDataSourceConfiguration.java | 23 ++-
.../scaling/core/constant/ScalingConstant.java | 35 ++++
.../scaling/core/datasource/DataSourceManager.java | 4 +-
.../scaling/core/datasource/DataSourceWrapper.java | 9 +-
.../executor/importer/DataRecordMerger.java | 20 +-
.../scaling/core/job/ScalingJobProgress.java | 15 +-
.../scaling/core/job/ShardingScalingJob.java | 39 ++--
.../job/position/FinishedInventoryPosition.java | 4 +
.../core/job/position/IncrementalPosition.java | 7 +
.../core/job/position/InventoryPosition.java | 7 +
.../core/job/position/InventoryPositionGroup.java | 81 ++++++++
.../job/position/PlaceholderInventoryPosition.java | 4 +
.../core/job/position/PrimaryKeyPosition.java | 2 +
.../resume/AbstractResumeBreakPointManager.java | 73 ++------
.../resume/RepositoryResumeBreakPointManager.java | 77 ++------
.../resume/ResumeBreakPointManagerFactory.java | 3 +-
.../job/preparer/ShardingScalingJobPreparer.java | 4 +-
.../task/inventory/InventoryDataScalingTask.java | 41 +----
.../inventory/InventoryDataSyncTaskProgress.java | 4 +-
.../core/schedule/ScalingTaskScheduler.java | 6 +-
.../core/service/AbstractScalingJobService.java | 72 ++++++++
.../core/service/RegistryRepositoryHolder.java | 85 +++++++++
.../scaling/core/service/ScalingJobService.java | 112 +++++++++++
.../core/service/ScalingJobServiceFactory.java | 33 ++--
.../service/impl/DistributedScalingJobService.java | 114 ++++++++++++
.../service/impl/StandaloneScalingJobService.java | 108 +++++++++++
.../scaling/core/utils/ProxyConfigurationUtil.java | 204 +++++++++++++++++++++
.../scaling/core/utils/ReflectionUtils.java | 31 ++--
.../scaling/core/utils/ScalingTaskUtil.java | 18 +-
.../scaling/core/utils/SyncConfigurationUtil.java | 13 +-
.../check/AbstractDataConsistencyCheckerTest.java | 3 -
.../core/datasource/DataSourceManagerTest.java | 3 -
.../scaling/core/fixture/FixtureNopManager.java | 6 +
.../core/fixture/FixtureRegistryRepository.java | 69 ++++++-
.../position/PlaceholderIncrementalPosition.java | 5 +
.../AbstractResumeBreakPointManagerTest.java | 2 +-
.../RepositoryResumeBreakPointManagerTest.java | 54 ++++--
.../preparer/resumer/SyncPositionResumerTest.java | 51 +-----
.../InventoryDataScalingTaskGroupTest.java | 11 +-
.../inventory/InventoryDataScalingTaskTest.java | 9 +-
.../impl/DistributedScalingJobServiceTest.java | 164 +++++++++++++++++
.../impl/StandaloneScalingJobServiceTest.java} | 75 ++++----
.../core/util/ScalingConfigurationUtil.java | 42 ++++-
.../test/resources/proxy_config-sharding_1.yaml | 55 +++---
.../test/resources/proxy_config-sharding_2.yaml | 59 +++---
.../scaling/mysql/MySQLBinlogDumper.java | 6 +-
.../scaling/mysql/MySQLDataConsistencyChecker.java | 5 +-
.../scaling/mysql/binlog/BinlogPosition.java | 3 +
.../scaling/mysql/BinlogPositionTest.java | 2 +-
.../scaling/mysql/MySQLPositionManagerTest.java | 2 +-
.../scaling/postgresql/wal/WalPosition.java | 4 +
63 files changed, 1516 insertions(+), 639 deletions(-)
delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/ScalingJobController.java
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/InventoryPositionGroup.java
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/AbstractScalingJobService.java
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/RegistryRepositoryHolder.java
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/ScalingJobService.java
copy shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/expr/BinaryOperationExpression.java => shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/ScalingJobServiceFactory.java (59%)
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/impl/DistributedScalingJobService.java
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/service/impl/StandaloneScalingJobService.java
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ProxyConfigurationUtil.java
copy shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/util/FieldValueUtil.java => shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ReflectionUtils.java (62%)
create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/DistributedScalingJobServiceTest.java
rename shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/{ScalingJobControllerTest.java => service/impl/StandaloneScalingJobServiceTest.java} (61%)
copy shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-sharding.yaml => shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/proxy_config-sharding_1.yaml (55%)
copy shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-sharding.yaml => shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/proxy_config-sharding_2.yaml (50%)