From f2bd28422f3e0a79959369587be31ae0e73ed596 Mon Sep 17 00:00:00 2001 From: KomachiSion <263976490@qq.com> Date: Mon, 18 Nov 2019 10:04:36 +0800 Subject: [PATCH] rename packagecore. sync --> core.execute --- .../core/config/SyncConfiguration.java | 2 +- .../{sync => execute}/AbstractSyncRunner.java | 2 +- .../core/{sync => execute}/SyncExecutor.java | 10 +++---- .../core/{sync => execute}/SyncRunner.java | 8 +++--- .../channel/AckCallback.java | 4 +-- .../{sync => execute}/channel/Channel.java | 4 +-- .../channel/MemoryChannel.java | 4 +-- .../channel/RealtimeSyncChannel.java | 14 +++++----- .../metadata/ColumnMetaData.java | 2 +- .../{sync => execute}/metadata/JdbcUri.java | 2 +- .../reader/AbstractJdbcReader.java | 20 +++++++------- .../{sync => execute}/reader/JdbcReader.java | 2 +- .../{sync => execute}/reader/LogPosition.java | 2 +- .../{sync => execute}/reader/LogReader.java | 2 +- .../reader/NopLogPosition.java | 2 +- .../core/{sync => execute}/reader/Reader.java | 6 ++--- .../reader/ReaderFactory.java | 2 +- .../core/{sync => execute}/record/Column.java | 2 +- .../{sync => execute}/record/DataRecord.java | 4 +-- .../record/FinishedRecord.java | 4 +-- .../record/PlaceholderRecord.java | 4 +-- .../core/{sync => execute}/record/Record.java | 4 +-- .../util/DataSourceFactory.java | 2 +- .../util/DbMetaDataUtil.java | 4 +-- .../writer/AbstractJdbcWriter.java | 20 +++++++------- .../{sync => execute}/writer/SqlBuilder.java | 6 ++--- .../core/{sync => execute}/writer/Writer.java | 6 ++--- .../writer/WriterFactory.java | 2 +- .../core/job/SyncTaskController.java | 14 +++++----- .../core/job/SyncTaskProgress.java | 2 +- .../core/job/sync/HistoryDataSyncTask.java | 20 +++++++------- .../core/job/sync/RealtimeDataSyncTask.java | 26 +++++++++---------- .../core/job/sync/SyncTaskFactory.java | 4 +-- .../job/sync/executor/SyncJobExecutor.java | 6 ++--- .../executor/local/LocalSyncJobExecutor.java | 2 +- .../core/spi/ScalingEntry.java | 6 ++--- .../shardingscaling/mysql/BinlogPosition.java | 2 +- .../mysql/MySQLBinlogReader.java | 24 ++++++++--------- .../mysql/MySQLJdbcReader.java | 4 +-- .../mysql/MySQLScalingEntry.java | 6 ++--- .../shardingscaling/mysql/MySQLWriter.java | 2 +- .../postgresql/PostgreSQLJdbcReader.java | 2 +- .../postgresql/PostgreSQLScalingEntry.java | 6 ++--- .../postgresql/PostgreSQLWalReader.java | 8 +++--- .../postgresql/PostgreSQLWriter.java | 2 +- 45 files changed, 141 insertions(+), 141 deletions(-) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/AbstractSyncRunner.java (96%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/SyncExecutor.java (92%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/SyncRunner.java (88%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/channel/AckCallback.java (89%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/channel/Channel.java (91%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/channel/MemoryChannel.java (95%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/channel/RealtimeSyncChannel.java (92%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/metadata/ColumnMetaData.java (94%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/metadata/JdbcUri.java (97%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/AbstractJdbcReader.java (90%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/JdbcReader.java (95%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/LogPosition.java (94%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/LogReader.java (94%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/NopLogPosition.java (94%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/Reader.java (85%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/reader/ReaderFactory.java (98%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/record/Column.java (94%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/record/DataRecord.java (93%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/record/FinishedRecord.java (88%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/record/PlaceholderRecord.java (88%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/record/Record.java (88%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/util/DataSourceFactory.java (97%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/util/DbMetaDataUtil.java (97%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/writer/AbstractJdbcWriter.java (89%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/writer/SqlBuilder.java (96%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/writer/Writer.java (85%) rename sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/{sync => execute}/writer/WriterFactory.java (97%) diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/config/SyncConfiguration.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/config/SyncConfiguration.java index abde35b917..0fad128d4c 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/config/SyncConfiguration.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/config/SyncConfiguration.java @@ -17,7 +17,7 @@ package info.avalon566.shardingscaling.core.config; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/AbstractSyncRunner.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/AbstractSyncRunner.java similarity index 96% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/AbstractSyncRunner.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/AbstractSyncRunner.java index 7520729a1b..7beb424477 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/AbstractSyncRunner.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/AbstractSyncRunner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync; +package info.avalon566.shardingscaling.core.execute; import lombok.AccessLevel; import lombok.Getter; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncExecutor.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/SyncExecutor.java similarity index 92% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncExecutor.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/SyncExecutor.java index be490cee36..0f178029ed 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncExecutor.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/SyncExecutor.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync; +package info.avalon566.shardingscaling.core.execute; import info.avalon566.shardingscaling.core.exception.SyncExecuteException; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.reader.Reader; -import info.avalon566.shardingscaling.core.sync.writer.Writer; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.reader.Reader; +import info.avalon566.shardingscaling.core.execute.writer.Writer; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; @@ -63,7 +63,7 @@ public class SyncExecutor { /** * Execute. * - * @throws SyncExecuteException sync execute exception + * @throws SyncExecuteException execute execute exception */ public void execute() throws SyncExecuteException { List> futures = new ArrayList<>(syncRunners.size()); diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncRunner.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/SyncRunner.java similarity index 88% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncRunner.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/SyncRunner.java index 84e520195f..d93d854aa7 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncRunner.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/SyncRunner.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync; +package info.avalon566.shardingscaling.core.execute; /** - * sync runner. + * execute runner. * @author avalon566 */ public interface SyncRunner extends Runnable { /** - * Start run sync. + * Start run execute. */ void start(); /** - * Stop running sync. + * Stop running execute. */ void stop(); } diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/AckCallback.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/AckCallback.java similarity index 89% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/AckCallback.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/AckCallback.java index ddbc4269b0..64e89cd50d 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/AckCallback.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/AckCallback.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.channel; +package info.avalon566.shardingscaling.core.execute.channel; -import info.avalon566.shardingscaling.core.sync.record.Record; +import info.avalon566.shardingscaling.core.execute.record.Record; import java.util.List; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/Channel.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/Channel.java similarity index 91% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/Channel.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/Channel.java index fbea01f840..fc3087eeb7 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/Channel.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/Channel.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.channel; +package info.avalon566.shardingscaling.core.execute.channel; -import info.avalon566.shardingscaling.core.sync.record.Record; +import info.avalon566.shardingscaling.core.execute.record.Record; import java.util.List; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/MemoryChannel.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/MemoryChannel.java similarity index 95% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/MemoryChannel.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/MemoryChannel.java index d29dbbd898..e3b2387d0d 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/MemoryChannel.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/MemoryChannel.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.channel; +package info.avalon566.shardingscaling.core.execute.channel; import info.avalon566.shardingscaling.core.config.ScalingContext; -import info.avalon566.shardingscaling.core.sync.record.Record; +import info.avalon566.shardingscaling.core.execute.record.Record; import java.util.ArrayList; import java.util.LinkedList; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/RealtimeSyncChannel.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/RealtimeSyncChannel.java similarity index 92% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/RealtimeSyncChannel.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/RealtimeSyncChannel.java index 98e532f468..88e50c265b 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/RealtimeSyncChannel.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/channel/RealtimeSyncChannel.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.channel; +package info.avalon566.shardingscaling.core.execute.channel; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; -import info.avalon566.shardingscaling.core.sync.record.DataRecord; -import info.avalon566.shardingscaling.core.sync.record.FinishedRecord; -import info.avalon566.shardingscaling.core.sync.record.PlaceholderRecord; -import info.avalon566.shardingscaling.core.sync.record.Record; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.record.DataRecord; +import info.avalon566.shardingscaling.core.execute.record.FinishedRecord; +import info.avalon566.shardingscaling.core.execute.record.PlaceholderRecord; +import info.avalon566.shardingscaling.core.execute.record.Record; import java.util.Collections; import java.util.HashMap; @@ -34,7 +34,7 @@ import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; /** - * Realtime data sync channel. + * Realtime data execute channel. * * @author avalon566 */ diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/ColumnMetaData.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/metadata/ColumnMetaData.java similarity index 94% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/ColumnMetaData.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/metadata/ColumnMetaData.java index c3499eecfb..f81edc522f 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/ColumnMetaData.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/metadata/ColumnMetaData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.metadata; +package info.avalon566.shardingscaling.core.execute.metadata; import lombok.Data; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/JdbcUri.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/metadata/JdbcUri.java similarity index 97% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/JdbcUri.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/metadata/JdbcUri.java index 5be61fecd3..6d8bd14c8c 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/JdbcUri.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/metadata/JdbcUri.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.metadata; +package info.avalon566.shardingscaling.core.execute.metadata; import com.google.common.base.Strings; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/AbstractJdbcReader.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/AbstractJdbcReader.java similarity index 90% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/AbstractJdbcReader.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/AbstractJdbcReader.java index 1b5d5b58d6..7dbae9f734 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/AbstractJdbcReader.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/AbstractJdbcReader.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; import info.avalon566.shardingscaling.core.config.JdbcDataSourceConfiguration; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; import info.avalon566.shardingscaling.core.exception.SyncRunException; -import info.avalon566.shardingscaling.core.sync.AbstractSyncRunner; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.metadata.ColumnMetaData; -import info.avalon566.shardingscaling.core.sync.record.Column; -import info.avalon566.shardingscaling.core.sync.record.DataRecord; -import info.avalon566.shardingscaling.core.sync.record.FinishedRecord; -import info.avalon566.shardingscaling.core.sync.record.Record; -import info.avalon566.shardingscaling.core.sync.util.DataSourceFactory; -import info.avalon566.shardingscaling.core.sync.util.DbMetaDataUtil; +import info.avalon566.shardingscaling.core.execute.AbstractSyncRunner; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.metadata.ColumnMetaData; +import info.avalon566.shardingscaling.core.execute.record.Column; +import info.avalon566.shardingscaling.core.execute.record.DataRecord; +import info.avalon566.shardingscaling.core.execute.record.FinishedRecord; +import info.avalon566.shardingscaling.core.execute.record.Record; +import info.avalon566.shardingscaling.core.execute.util.DataSourceFactory; +import info.avalon566.shardingscaling.core.execute.util.DbMetaDataUtil; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/JdbcReader.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/JdbcReader.java similarity index 95% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/JdbcReader.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/JdbcReader.java index c015dd5ba9..b83ae33de2 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/JdbcReader.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/JdbcReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; import java.util.List; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogPosition.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/LogPosition.java similarity index 94% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogPosition.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/LogPosition.java index e181bd7c55..8e2704904e 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogPosition.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/LogPosition.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; import java.io.Serializable; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogReader.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/LogReader.java similarity index 94% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogReader.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/LogReader.java index ea8b0c990f..f05230da58 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogReader.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/LogReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; /** * Log reader. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/NopLogPosition.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/NopLogPosition.java similarity index 94% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/NopLogPosition.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/NopLogPosition.java index 6591ede1f6..b19d90450d 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/NopLogPosition.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/NopLogPosition.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; /** * Nop log position. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/Reader.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/Reader.java similarity index 85% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/Reader.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/Reader.java index 4528169757..85965c50cc 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/Reader.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/Reader.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.SyncRunner; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.SyncRunner; /** * Reader interface. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/ReaderFactory.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/ReaderFactory.java similarity index 98% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/ReaderFactory.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/ReaderFactory.java index 36808b7ffb..d78d97722c 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/ReaderFactory.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/reader/ReaderFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.reader; +package info.avalon566.shardingscaling.core.execute.reader; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; import info.avalon566.shardingscaling.core.spi.ScalingEntry; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Column.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/Column.java similarity index 94% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Column.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/Column.java index 20c9d5e053..8a7cfe9f45 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Column.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/Column.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.record; +package info.avalon566.shardingscaling.core.execute.record; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/DataRecord.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/DataRecord.java similarity index 93% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/DataRecord.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/DataRecord.java index b92d40b90e..ea9749bd11 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/DataRecord.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/DataRecord.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.record; +package info.avalon566.shardingscaling.core.execute.record; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; import lombok.Data; import java.util.ArrayList; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/FinishedRecord.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/FinishedRecord.java similarity index 88% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/FinishedRecord.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/FinishedRecord.java index 5420f6276a..2c781aed12 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/FinishedRecord.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/FinishedRecord.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.record; +package info.avalon566.shardingscaling.core.execute.record; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; /** * Finished record. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/PlaceholderRecord.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/PlaceholderRecord.java similarity index 88% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/PlaceholderRecord.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/PlaceholderRecord.java index e07e6b4392..24d88a5f1e 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/PlaceholderRecord.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/PlaceholderRecord.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.record; +package info.avalon566.shardingscaling.core.execute.record; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; /** * Placeholder record. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Record.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/Record.java similarity index 88% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Record.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/Record.java index f2f505b4f4..a109b7b8be 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Record.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/record/Record.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.record; +package info.avalon566.shardingscaling.core.execute.record; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DataSourceFactory.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/util/DataSourceFactory.java similarity index 97% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DataSourceFactory.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/util/DataSourceFactory.java index e2f1ec3d73..e92f8a1ff8 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DataSourceFactory.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/util/DataSourceFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.util; +package info.avalon566.shardingscaling.core.execute.util; import org.apache.commons.dbcp2.BasicDataSource; import info.avalon566.shardingscaling.core.config.DataSourceConfiguration; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DbMetaDataUtil.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/util/DbMetaDataUtil.java similarity index 97% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DbMetaDataUtil.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/util/DbMetaDataUtil.java index c7096155ad..5a34bd8bd6 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DbMetaDataUtil.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/util/DbMetaDataUtil.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.util; +package info.avalon566.shardingscaling.core.execute.util; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import info.avalon566.shardingscaling.core.sync.metadata.ColumnMetaData; +import info.avalon566.shardingscaling.core.execute.metadata.ColumnMetaData; import lombok.extern.slf4j.Slf4j; import javax.sql.DataSource; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/AbstractJdbcWriter.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/AbstractJdbcWriter.java similarity index 89% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/AbstractJdbcWriter.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/AbstractJdbcWriter.java index 1b717afbbc..5567491b70 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/AbstractJdbcWriter.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/AbstractJdbcWriter.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.writer; +package info.avalon566.shardingscaling.core.execute.writer; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; import info.avalon566.shardingscaling.core.exception.SyncRunException; -import info.avalon566.shardingscaling.core.sync.AbstractSyncRunner; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.metadata.ColumnMetaData; -import info.avalon566.shardingscaling.core.sync.record.Column; -import info.avalon566.shardingscaling.core.sync.record.DataRecord; -import info.avalon566.shardingscaling.core.sync.record.FinishedRecord; -import info.avalon566.shardingscaling.core.sync.record.Record; -import info.avalon566.shardingscaling.core.sync.util.DataSourceFactory; -import info.avalon566.shardingscaling.core.sync.util.DbMetaDataUtil; +import info.avalon566.shardingscaling.core.execute.AbstractSyncRunner; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.metadata.ColumnMetaData; +import info.avalon566.shardingscaling.core.execute.record.Column; +import info.avalon566.shardingscaling.core.execute.record.DataRecord; +import info.avalon566.shardingscaling.core.execute.record.FinishedRecord; +import info.avalon566.shardingscaling.core.execute.record.Record; +import info.avalon566.shardingscaling.core.execute.util.DataSourceFactory; +import info.avalon566.shardingscaling.core.execute.util.DbMetaDataUtil; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/SqlBuilder.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/SqlBuilder.java similarity index 96% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/SqlBuilder.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/SqlBuilder.java index 38301a0470..5fcaa80c6d 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/SqlBuilder.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/SqlBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.writer; +package info.avalon566.shardingscaling.core.execute.writer; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -25,8 +25,8 @@ import javax.sql.DataSource; import java.util.List; import java.util.concurrent.ExecutionException; -import info.avalon566.shardingscaling.core.sync.metadata.ColumnMetaData; -import info.avalon566.shardingscaling.core.sync.util.DbMetaDataUtil; +import info.avalon566.shardingscaling.core.execute.metadata.ColumnMetaData; +import info.avalon566.shardingscaling.core.execute.util.DbMetaDataUtil; /** * Sql builder. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/Writer.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/Writer.java similarity index 85% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/Writer.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/Writer.java index 9930e32395..cd2ad24227 100755 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/Writer.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/Writer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.writer; +package info.avalon566.shardingscaling.core.execute.writer; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.SyncRunner; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.SyncRunner; /** * Writer. diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/WriterFactory.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/WriterFactory.java similarity index 97% rename from sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/WriterFactory.java rename to sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/WriterFactory.java index 2d9ba6c1e3..c64b647f6c 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/WriterFactory.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/writer/WriterFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package info.avalon566.shardingscaling.core.sync.writer; +package info.avalon566.shardingscaling.core.execute.writer; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; import info.avalon566.shardingscaling.core.spi.ScalingEntry; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskController.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskController.java index 30d5cc4e02..b9ade06539 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskController.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskController.java @@ -25,10 +25,10 @@ import info.avalon566.shardingscaling.core.job.sync.executor.Event; import info.avalon566.shardingscaling.core.job.sync.executor.EventType; import info.avalon566.shardingscaling.core.job.sync.executor.SyncJobExecutor; import info.avalon566.shardingscaling.core.job.sync.executor.local.LocalSyncJobExecutor; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; -import info.avalon566.shardingscaling.core.sync.reader.ReaderFactory; -import info.avalon566.shardingscaling.core.sync.util.DataSourceFactory; -import info.avalon566.shardingscaling.core.sync.util.DbMetaDataUtil; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.ReaderFactory; +import info.avalon566.shardingscaling.core.execute.util.DataSourceFactory; +import info.avalon566.shardingscaling.core.execute.util.DbMetaDataUtil; import lombok.extern.slf4j.Slf4j; import javax.sql.DataSource; @@ -86,8 +86,8 @@ public final class SyncTaskController implements ReportCallback, Runnable { */ public SyncTaskProgress getProgress() { List result = syncJobExecutor.getProgresses(); - // if history data sync job, only return first migrate progress. - // if realtime data sync job, there only one migrate progress. + // if history data execute job, only return first migrate progress. + // if realtime data execute job, there only one migrate progress. return result.get(0); } @@ -108,7 +108,7 @@ public final class SyncTaskController implements ReportCallback, Runnable { } } if (finished) { - log.info("data sync finish"); + log.info("data execute finish"); if (STAGE_SYNC_HISTORY_DATA.equals(stage)) { stage = STAGE_SYNC_REALTIME_DATA; syncRealtimeData(startLogPosition); diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskProgress.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskProgress.java index e16a01f3a9..0bdae2e15b 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskProgress.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskProgress.java @@ -17,7 +17,7 @@ package info.avalon566.shardingscaling.core.job; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/HistoryDataSyncTask.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/HistoryDataSyncTask.java index 567adeeb14..37879bb8d9 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/HistoryDataSyncTask.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/HistoryDataSyncTask.java @@ -23,19 +23,19 @@ import info.avalon566.shardingscaling.core.job.sync.executor.Event; import info.avalon566.shardingscaling.core.job.sync.executor.EventType; import info.avalon566.shardingscaling.core.job.sync.executor.Reporter; import info.avalon566.shardingscaling.core.exception.SyncExecuteException; -import info.avalon566.shardingscaling.core.sync.SyncExecutor; -import info.avalon566.shardingscaling.core.sync.channel.MemoryChannel; -import info.avalon566.shardingscaling.core.sync.reader.NopLogPosition; -import info.avalon566.shardingscaling.core.sync.reader.Reader; -import info.avalon566.shardingscaling.core.sync.reader.ReaderFactory; -import info.avalon566.shardingscaling.core.sync.writer.Writer; -import info.avalon566.shardingscaling.core.sync.writer.WriterFactory; +import info.avalon566.shardingscaling.core.execute.SyncExecutor; +import info.avalon566.shardingscaling.core.execute.channel.MemoryChannel; +import info.avalon566.shardingscaling.core.execute.reader.NopLogPosition; +import info.avalon566.shardingscaling.core.execute.reader.Reader; +import info.avalon566.shardingscaling.core.execute.reader.ReaderFactory; +import info.avalon566.shardingscaling.core.execute.writer.Writer; +import info.avalon566.shardingscaling.core.execute.writer.WriterFactory; import lombok.extern.slf4j.Slf4j; import java.util.Collections; /** - * Table slice sync task. + * Table slice execute task. * * @author avalon566 * @author yangyi @@ -76,10 +76,10 @@ public class HistoryDataSyncTask implements SyncTask { final Writer writer = WriterFactory.newInstance(syncConfiguration.getWriterConfiguration()); try { new SyncExecutor(new MemoryChannel(), reader, Collections.singletonList(writer)).execute(); - log.info("{} table slice sync finish", syncConfiguration.getReaderConfiguration().getTableName()); + log.info("{} table slice execute finish", syncConfiguration.getReaderConfiguration().getTableName()); reporter.report(new Event(syncConfiguration.getTaskId(), EventType.FINISHED)); } catch (SyncExecuteException ex) { - log.error("{} table slice sync exception exit", syncConfiguration.getReaderConfiguration().getTableName()); + log.error("{} table slice execute exception exit", syncConfiguration.getReaderConfiguration().getTableName()); ex.logExceptions(); reporter.report(new Event(syncConfiguration.getTaskId(), EventType.EXCEPTION_EXIT)); } diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/RealtimeDataSyncTask.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/RealtimeDataSyncTask.java index 1f1d9e7f79..b94cb0549c 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/RealtimeDataSyncTask.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/RealtimeDataSyncTask.java @@ -23,15 +23,15 @@ import info.avalon566.shardingscaling.core.job.SyncTaskProgress; import info.avalon566.shardingscaling.core.job.sync.executor.Event; import info.avalon566.shardingscaling.core.job.sync.executor.EventType; import info.avalon566.shardingscaling.core.job.sync.executor.Reporter; -import info.avalon566.shardingscaling.core.sync.SyncExecutor; -import info.avalon566.shardingscaling.core.sync.channel.AckCallback; -import info.avalon566.shardingscaling.core.sync.channel.RealtimeSyncChannel; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; -import info.avalon566.shardingscaling.core.sync.reader.LogReader; -import info.avalon566.shardingscaling.core.sync.reader.ReaderFactory; -import info.avalon566.shardingscaling.core.sync.record.Record; -import info.avalon566.shardingscaling.core.sync.writer.Writer; -import info.avalon566.shardingscaling.core.sync.writer.WriterFactory; +import info.avalon566.shardingscaling.core.execute.SyncExecutor; +import info.avalon566.shardingscaling.core.execute.channel.AckCallback; +import info.avalon566.shardingscaling.core.execute.channel.RealtimeSyncChannel; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogReader; +import info.avalon566.shardingscaling.core.execute.reader.ReaderFactory; +import info.avalon566.shardingscaling.core.execute.record.Record; +import info.avalon566.shardingscaling.core.execute.writer.Writer; +import info.avalon566.shardingscaling.core.execute.writer.WriterFactory; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; @@ -39,7 +39,7 @@ import java.util.Collections; import java.util.List; /** - * Realtime data sync task. + * Realtime data execute task. * * @author avalon566 */ @@ -87,7 +87,7 @@ public class RealtimeDataSyncTask implements SyncTask { } /** - * Start to sync realtime data. + * Start to execute realtime data. */ @Override public final void run() { @@ -105,10 +105,10 @@ public class RealtimeDataSyncTask implements SyncTask { })); startReportRealtimeSyncPosition(); new SyncExecutor(channel, logReader, writers).execute(); - log.info("realtime data sync finish"); + log.info("realtime data execute finish"); reporter.report(new Event(syncConfiguration.getTaskId(), EventType.FINISHED)); } catch (SyncExecuteException ex) { - log.error("realtime data sync exception exit"); + log.error("realtime data execute exception exit"); ex.logExceptions(); reporter.report(new Event(syncConfiguration.getTaskId(), EventType.EXCEPTION_EXIT)); } diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/SyncTaskFactory.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/SyncTaskFactory.java index b247d9fc6e..c1d2ec17d2 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/SyncTaskFactory.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/SyncTaskFactory.java @@ -29,11 +29,11 @@ import info.avalon566.shardingscaling.core.job.sync.executor.local.LocalReporter public final class SyncTaskFactory { /** - * create sync job instance by sync configuration. + * create execute job instance by execute configuration. * * @param syncConfiguration value * @param reporter value - * @return sync job + * @return execute job */ public static SyncTask createSyncJobInstance(final SyncConfiguration syncConfiguration, final LocalReporter reporter) { if (SyncType.TableSlice.equals(syncConfiguration.getSyncType())) { diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/SyncJobExecutor.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/SyncJobExecutor.java index 8e31fb4590..f71454eb8f 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/SyncJobExecutor.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/SyncJobExecutor.java @@ -30,7 +30,7 @@ import java.util.List; public interface SyncJobExecutor { /** - * start sync jobs. + * start execute jobs. * * @param configs job configs * @param reportCallback report callback @@ -39,12 +39,12 @@ public interface SyncJobExecutor { Reporter start(List configs, ReportCallback reportCallback); /** - * stop all sync jobs. + * stop all execute jobs. */ void stop(); /** - * get all sync job migrate progresses. + * get all execute job migrate progresses. * * @return list of migrate progresses */ diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/local/LocalSyncJobExecutor.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/local/LocalSyncJobExecutor.java index 7a02da59df..3b389fe2fd 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/local/LocalSyncJobExecutor.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/local/LocalSyncJobExecutor.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * Local sync job executor. + * Local execute job executor. * * @author avalon566 */ diff --git a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/spi/ScalingEntry.java b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/spi/ScalingEntry.java index 81010aacc4..5c7408d978 100644 --- a/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/spi/ScalingEntry.java +++ b/sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/spi/ScalingEntry.java @@ -17,9 +17,9 @@ package info.avalon566.shardingscaling.core.spi; -import info.avalon566.shardingscaling.core.sync.reader.JdbcReader; -import info.avalon566.shardingscaling.core.sync.reader.LogReader; -import info.avalon566.shardingscaling.core.sync.writer.Writer; +import info.avalon566.shardingscaling.core.execute.reader.JdbcReader; +import info.avalon566.shardingscaling.core.execute.reader.LogReader; +import info.avalon566.shardingscaling.core.execute.writer.Writer; import org.apache.shardingsphere.spi.DatabaseTypeAwareSPI; /** diff --git a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/BinlogPosition.java b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/BinlogPosition.java index 3c22b87b47..66edc3373e 100644 --- a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/BinlogPosition.java +++ b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/BinlogPosition.java @@ -17,7 +17,7 @@ package info.avalon566.shardingscaling.mysql; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLBinlogReader.java b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLBinlogReader.java index b94288fdc4..b293c6c90d 100755 --- a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLBinlogReader.java +++ b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLBinlogReader.java @@ -18,23 +18,23 @@ package info.avalon566.shardingscaling.mysql; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; -import info.avalon566.shardingscaling.core.sync.AbstractSyncRunner; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; -import info.avalon566.shardingscaling.core.sync.reader.LogReader; -import info.avalon566.shardingscaling.core.sync.reader.NopLogPosition; -import info.avalon566.shardingscaling.core.sync.record.Column; -import info.avalon566.shardingscaling.core.sync.record.DataRecord; -import info.avalon566.shardingscaling.core.sync.metadata.JdbcUri; -import info.avalon566.shardingscaling.core.sync.record.FinishedRecord; -import info.avalon566.shardingscaling.core.sync.record.PlaceholderRecord; -import info.avalon566.shardingscaling.core.sync.record.Record; +import info.avalon566.shardingscaling.core.execute.AbstractSyncRunner; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogReader; +import info.avalon566.shardingscaling.core.execute.reader.NopLogPosition; +import info.avalon566.shardingscaling.core.execute.record.Column; +import info.avalon566.shardingscaling.core.execute.record.DataRecord; +import info.avalon566.shardingscaling.core.execute.metadata.JdbcUri; +import info.avalon566.shardingscaling.core.execute.record.FinishedRecord; +import info.avalon566.shardingscaling.core.execute.record.PlaceholderRecord; +import info.avalon566.shardingscaling.core.execute.record.Record; import info.avalon566.shardingscaling.mysql.binlog.event.AbstractBinlogEvent; import info.avalon566.shardingscaling.mysql.binlog.event.DeleteRowsEvent; import info.avalon566.shardingscaling.mysql.binlog.event.PlaceholderEvent; import info.avalon566.shardingscaling.mysql.binlog.event.UpdateRowsEvent; import info.avalon566.shardingscaling.mysql.binlog.event.WriteRowsEvent; -import info.avalon566.shardingscaling.core.sync.util.DataSourceFactory; +import info.avalon566.shardingscaling.core.execute.util.DataSourceFactory; import info.avalon566.shardingscaling.core.config.JdbcDataSourceConfiguration; import info.avalon566.shardingscaling.mysql.binlog.MySQLConnector; import lombok.Setter; diff --git a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLJdbcReader.java b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLJdbcReader.java index d6e5f47f45..1b3171a0d4 100755 --- a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLJdbcReader.java +++ b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLJdbcReader.java @@ -19,8 +19,8 @@ package info.avalon566.shardingscaling.mysql; import info.avalon566.shardingscaling.core.config.JdbcDataSourceConfiguration; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; -import info.avalon566.shardingscaling.core.sync.reader.AbstractJdbcReader; -import info.avalon566.shardingscaling.core.sync.metadata.JdbcUri; +import info.avalon566.shardingscaling.core.execute.reader.AbstractJdbcReader; +import info.avalon566.shardingscaling.core.execute.metadata.JdbcUri; import java.util.List; import java.util.Map; diff --git a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLScalingEntry.java b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLScalingEntry.java index d67e0b3131..b61841f30e 100644 --- a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLScalingEntry.java +++ b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLScalingEntry.java @@ -18,9 +18,9 @@ package info.avalon566.shardingscaling.mysql; import info.avalon566.shardingscaling.core.spi.ScalingEntry; -import info.avalon566.shardingscaling.core.sync.reader.JdbcReader; -import info.avalon566.shardingscaling.core.sync.reader.LogReader; -import info.avalon566.shardingscaling.core.sync.writer.Writer; +import info.avalon566.shardingscaling.core.execute.reader.JdbcReader; +import info.avalon566.shardingscaling.core.execute.reader.LogReader; +import info.avalon566.shardingscaling.core.execute.writer.Writer; /** * MySQL scaling entry. diff --git a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLWriter.java b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLWriter.java index b711a31f22..607bfa9776 100755 --- a/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLWriter.java +++ b/sharding-scaling-mysql/src/main/java/info/avalon566/shardingscaling/mysql/MySQLWriter.java @@ -18,7 +18,7 @@ package info.avalon566.shardingscaling.mysql; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; -import info.avalon566.shardingscaling.core.sync.writer.AbstractJdbcWriter; +import info.avalon566.shardingscaling.core.execute.writer.AbstractJdbcWriter; /** * MySQL writer. diff --git a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLJdbcReader.java b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLJdbcReader.java index 3f82def667..7da354c6f0 100755 --- a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLJdbcReader.java +++ b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLJdbcReader.java @@ -18,7 +18,7 @@ package info.avalon556.shardingscaling.postgresql; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; -import info.avalon566.shardingscaling.core.sync.reader.AbstractJdbcReader; +import info.avalon566.shardingscaling.core.execute.reader.AbstractJdbcReader; /** * PostgreSQL JDBC reader. diff --git a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLScalingEntry.java b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLScalingEntry.java index 13e039a2bf..60512f75a2 100644 --- a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLScalingEntry.java +++ b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLScalingEntry.java @@ -18,9 +18,9 @@ package info.avalon556.shardingscaling.postgresql; import info.avalon566.shardingscaling.core.spi.ScalingEntry; -import info.avalon566.shardingscaling.core.sync.reader.JdbcReader; -import info.avalon566.shardingscaling.core.sync.reader.LogReader; -import info.avalon566.shardingscaling.core.sync.writer.Writer; +import info.avalon566.shardingscaling.core.execute.reader.JdbcReader; +import info.avalon566.shardingscaling.core.execute.reader.LogReader; +import info.avalon566.shardingscaling.core.execute.writer.Writer; /** * PostgreSQL scaling entry. diff --git a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWalReader.java b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWalReader.java index 38b7c10836..80e5384f92 100755 --- a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWalReader.java +++ b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWalReader.java @@ -17,10 +17,10 @@ package info.avalon556.shardingscaling.postgresql; -import info.avalon566.shardingscaling.core.sync.AbstractSyncRunner; -import info.avalon566.shardingscaling.core.sync.channel.Channel; -import info.avalon566.shardingscaling.core.sync.reader.LogPosition; -import info.avalon566.shardingscaling.core.sync.reader.LogReader; +import info.avalon566.shardingscaling.core.execute.AbstractSyncRunner; +import info.avalon566.shardingscaling.core.execute.channel.Channel; +import info.avalon566.shardingscaling.core.execute.reader.LogPosition; +import info.avalon566.shardingscaling.core.execute.reader.LogReader; import lombok.Setter; /** diff --git a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWriter.java b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWriter.java index 1e7e6ca5c3..3ed15cb482 100755 --- a/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWriter.java +++ b/sharding-scaling-postgresql/src/main/java/info/avalon556/shardingscaling/postgresql/PostgreSQLWriter.java @@ -18,7 +18,7 @@ package info.avalon556.shardingscaling.postgresql; import info.avalon566.shardingscaling.core.config.RdbmsConfiguration; -import info.avalon566.shardingscaling.core.sync.writer.AbstractJdbcWriter; +import info.avalon566.shardingscaling.core.execute.writer.AbstractJdbcWriter; /** * postgreSQL writer. -- GitLab