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 2020/11/20 11:36:04 UTC

[shardingsphere] branch master updated (21e15cf -> b8da1eb)

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 21e15cf  Use lambda expression to simplify some proxy codes (#8250)
     add b8da1eb  Refactoring Sync Position (#8247)

No new revisions were added by this update.

Summary of changes:
 .../scaling/fixture/FixtureH2ScalingEntry.java     |  7 +--
 .../scaling/fixture/FixtureNopManager.java         | 55 -----------------
 .../scaling/util/ScalingConfigurationUtil.java     |  4 +-
 .../scaling/web/HttpServerHandlerTest.java         |  4 +-
 .../executor/AbstractShardingScalingExecutor.java  |  5 +-
 .../executor/dumper/AbstractJDBCDumper.java        | 21 ++++---
 .../executor/importer/AbstractJDBCImporter.java    |  3 +-
 .../scaling/core/job/ShardingScalingJob.java       |  6 +-
 .../core/job/position/BasePositionManager.java     | 37 ------------
 .../job/position/FinishedInventoryPosition.java    | 41 -------------
 ...nventoryPosition.java => FinishedPosition.java} | 14 ++---
 .../core/job/position/IncrementalPosition.java     | 31 ----------
 .../core/job/position/InventoryPositionGroup.java  | 70 +++++++++++-----------
 .../job/position/InventoryPositionManager.java     | 28 ---------
 .../scaling/core/job/position/NopPosition.java     | 37 ------------
 .../job/position/PlaceholderInventoryPosition.java | 41 -------------
 .../core/job/position/PlaceholderPosition.java     | 56 +++++++++++++++++
 .../scaling/core/job/position/Position.java        | 11 +---
 .../scaling/core/job/position/PositionManager.java | 35 ++++++-----
 .../core/job/position/PositionManagerFactory.java  | 10 ++--
 .../core/job/position/PrimaryKeyPosition.java      | 54 ++++++++++-------
 .../resume/AbstractResumeBreakPointManager.java    | 24 ++++----
 .../position/resume/ResumeBreakPointManager.java   |  6 +-
 .../job/preparer/ShardingScalingJobPreparer.java   | 14 ++---
 .../job/preparer/resumer/SyncPositionResumer.java  | 28 ++++-----
 .../splitter/InventoryDataTaskSplitter.java        | 17 +++---
 .../core/job/preparer/utils/JobPrepareUtil.java    |  3 +-
 .../core/job/task/DefaultSyncTaskFactory.java      |  3 +-
 .../scaling/core/job/task/ScalingTask.java         |  5 +-
 .../scaling/core/job/task/SyncTaskFactory.java     |  3 +-
 .../incremental/IncrementalDataScalingTask.java    |  9 ++-
 .../task/inventory/InventoryDataScalingTask.java   | 12 ++--
 .../inventory/InventoryDataScalingTaskGroup.java   | 18 +++---
 .../core/schedule/ScalingTaskScheduler.java        | 10 ++--
 .../scaling/core/spi/ScalingEntry.java             |  5 +-
 .../scaling/core/utils/RdbmsConfigurationUtil.java |  5 +-
 .../scaling/core/utils/ScalingTaskUtil.java        |  8 +--
 .../executor/channel/DistributionChannelTest.java  | 16 ++---
 .../importer/AbstractJDBCImporterTest.java         |  8 +--
 .../executor/importer/AbstractSqlBuilderTest.java  |  4 +-
 .../executor/importer/DataRecordMergerTest.java    |  8 +--
 .../execute/executor/record/DataRecordTest.java    | 10 ++--
 .../core/fixture/FixtureH2ScalingEntry.java        |  7 +--
 .../scaling/core/fixture/FixtureNopManager.java    | 61 -------------------
 .../core/fixture/FixturePositionManager.java}      | 27 ++++-----
 .../position/PlaceholderIncrementalPosition.java   | 42 -------------
 .../job/position/PlaceholderPositionTest.java}     | 22 +++----
 .../core/job/position/PrimaryKeyPositionTest.java} | 27 ++++++---
 .../AbstractResumeBreakPointManagerTest.java       | 32 ++++------
 ...IncrementalPositionResumeBreakPointManager.java |  7 +--
 .../preparer/resumer/SyncPositionResumerTest.java  |  8 +--
 .../splitter/InventoryDataTaskSplitterTest.java    | 11 ++--
 .../IncrementalDataScalingTaskTest.java            |  9 ++-
 .../InventoryDataScalingTaskGroupTest.java         | 17 +-----
 .../inventory/InventoryDataScalingTaskTest.java    |  4 +-
 .../core/util/ScalingConfigurationUtil.java        |  4 +-
 .../scaling/mysql/MySQLScalingEntry.java           |  3 +-
 .../scaling/mysql/binlog/BinlogPosition.java       | 27 ++-------
 .../scaling/mysql/component/MySQLBinlogDumper.java | 13 ++--
 .../mysql/component/MySQLPositionManager.java      | 34 +++++------
 .../scaling/mysql/binlog/BinlogPositionTest.java   |  3 +-
 .../mysql/component/MySQLPositionManagerTest.java  |  3 +-
 .../mysql/component/MySQLSQLBuilderTest.java       |  4 +-
 .../scaling/postgresql/PostgreSQLScalingEntry.java |  3 +-
 .../component/PostgreSQLPositionManager.java       | 26 ++++----
 .../postgresql/component/PostgreSQLWalDumper.java  | 10 ++--
 .../scaling/postgresql/wal/WalPosition.java        | 20 ++-----
 .../component/PostgreSQLPositionManagerTest.java   |  9 ++-
 .../scaling/postgresql/wal/WalPositionTest.java    | 14 ++++-
 69 files changed, 423 insertions(+), 810 deletions(-)
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureNopManager.java
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/BasePositionManager.java
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/FinishedInventoryPosition.java
 rename shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/{InventoryPosition.java => FinishedPosition.java} (80%)
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/IncrementalPosition.java
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/InventoryPositionManager.java
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/NopPosition.java
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PlaceholderInventoryPosition.java
 create mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/PlaceholderPosition.java
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureNopManager.java
 copy shardingsphere-scaling/shardingsphere-scaling-core/src/{main/java/org/apache/shardingsphere/scaling/core/config/DumperConfiguration.java => test/java/org/apache/shardingsphere/scaling/core/fixture/FixturePositionManager.java} (66%)
 delete mode 100644 shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/PlaceholderIncrementalPosition.java
 copy shardingsphere-scaling/{shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalPositionTest.java => shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/PlaceholderPositionTest.java} (63%)
 copy shardingsphere-scaling/{shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalPositionTest.java => shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/PrimaryKeyPositionTest.java} (55%)