Merge pull request #36 from KomachiSion/master

Move package and rename package for #33

sharding-scaling-bootstrap/src/main/java/info/avalon566/shardingscaling/Bootstrap.java

@@ -26,8 +26,8 @@ import info.avalon566.shardingscaling.core.config.ScalingConfiguration;
 import info.avalon566.shardingscaling.core.config.ScalingContext;
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
 import info.avalon566.shardingscaling.core.config.SyncType;
-import info.avalon566.shardingscaling.core.job.SyncTaskProgress;
-import info.avalon566.shardingscaling.core.job.ScalingJobController;
+import info.avalon566.shardingscaling.core.controller.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.controller.ScalingJobController;
 import info.avalon566.shardingscaling.utils.RuntimeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.PropertyConfigurator;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/config/RuleConfiguration.java

@@ -24,6 +24,7 @@ import java.util.List;
 
 /**
  * Rule configuration.
+ *
  * @author avalon566
  */
 @Data

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.executor.reader.LogPosition;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
@@ -37,7 +37,7 @@ public class SyncConfiguration {
     private final SyncType syncType;
 
     /**
-     * 单表写入并发度.
+     * The concurrency of writers.
      */
     private final int concurrency;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/config/SyncType.java

@@ -19,6 +19,7 @@ package info.avalon566.shardingscaling.core.config;
 
 /**
  * Sync type.
+ *
  * @author avalon566
  */
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/ReportCallback.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/controller/ReportCallback.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job;
+package info.avalon566.shardingscaling.core.controller;
 
-import info.avalon566.shardingscaling.core.job.sync.executor.Event;
+import info.avalon566.shardingscaling.core.execute.Event;
 
 /**
  * Report callback.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/ScalingJobController.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/controller/ScalingJobController.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job;
+package info.avalon566.shardingscaling.core.controller;
 
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskController.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/controller/SyncTaskController.java

@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job;
+package info.avalon566.shardingscaling.core.controller;
 
 import info.avalon566.shardingscaling.core.config.RdbmsConfiguration;
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
 import info.avalon566.shardingscaling.core.config.SyncType;
-import info.avalon566.shardingscaling.core.job.sync.RealtimeDataSyncTask;
-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.synctask.RealtimeDataSyncTask;
+import info.avalon566.shardingscaling.core.execute.Event;
+import info.avalon566.shardingscaling.core.execute.EventType;
+import info.avalon566.shardingscaling.core.execute.engine.SyncJobExecutor;
+import info.avalon566.shardingscaling.core.execute.engine.local.LocalSyncJobExecutor;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.ReaderFactory;
+import info.avalon566.shardingscaling.core.util.DataSourceFactory;
+import info.avalon566.shardingscaling.core.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<SyncTaskProgress> 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);

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/SyncTaskProgress.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/controller/SyncTaskProgress.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job;
+package info.avalon566.shardingscaling.core.controller;
 
-import info.avalon566.shardingscaling.core.sync.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/Event.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/Event.java

@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync.executor;
+package info.avalon566.shardingscaling.core.execute;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
 /**
  * Event.
+ *
  * @author avalon566
  */
 @Data

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/EventType.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/EventType.java

@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync.executor;
+package info.avalon566.shardingscaling.core.execute;
 
 /**
  * Event type.
+ *
  * @author avalon566
  */
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/Reporter.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/Reporter.java

@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync.executor;
+package info.avalon566.shardingscaling.core.execute;
 
 /**
  * Job Running reporter.
+ *
  * @author avalon566
  */
 public interface Reporter {

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncExecutor.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/engine/SyncExecutor.java

@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync;
+package info.avalon566.shardingscaling.core.execute.engine;
 
 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.executor.SyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.execute.executor.reader.Reader;
+import info.avalon566.shardingscaling.core.execute.executor.writer.Writer;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
@@ -63,7 +64,7 @@ public class SyncExecutor {
     /**
      * Execute.
      *
-     * @throws SyncExecuteException sync execute exception
+     * @throws SyncExecuteException execute execute exception
      */
     public void execute() throws SyncExecuteException {
         List<Future<?>> futures = new ArrayList<>(syncRunners.size());

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/SyncJobExecutor.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/engine/SyncJobExecutor.java

@@ -15,22 +15,24 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync.executor;
+package info.avalon566.shardingscaling.core.execute.engine;
 
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
-import info.avalon566.shardingscaling.core.job.ReportCallback;
-import info.avalon566.shardingscaling.core.job.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.controller.ReportCallback;
+import info.avalon566.shardingscaling.core.controller.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.execute.Reporter;
 
 import java.util.List;
 
 /**
  * Sync job executor, run in in process, k8s etc.
+ *
  * @author avalon566
  */
 public interface SyncJobExecutor {
 
     /**
-     * start sync jobs.
+     * start execute jobs.
      *
      * @param configs job configs
      * @param reportCallback report callback
@@ -39,12 +41,12 @@ public interface SyncJobExecutor {
     Reporter start(List<SyncConfiguration> 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
      */

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/local/LocalReporter.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/engine/local/LocalReporter.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync.executor.local;
+package info.avalon566.shardingscaling.core.execute.engine.local;
 
-import info.avalon566.shardingscaling.core.job.sync.executor.Event;
-import info.avalon566.shardingscaling.core.job.sync.executor.Reporter;
+import info.avalon566.shardingscaling.core.execute.Event;
+import info.avalon566.shardingscaling.core.execute.Reporter;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/executor/local/LocalSyncJobExecutor.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/engine/local/LocalSyncJobExecutor.java

@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync.executor.local;
+package info.avalon566.shardingscaling.core.execute.engine.local;
 
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
-import info.avalon566.shardingscaling.core.job.ReportCallback;
-import info.avalon566.shardingscaling.core.job.SyncTaskProgress;
-import info.avalon566.shardingscaling.core.job.sync.SyncTask;
-import info.avalon566.shardingscaling.core.job.sync.executor.Event;
-import info.avalon566.shardingscaling.core.job.sync.executor.Reporter;
-import info.avalon566.shardingscaling.core.job.sync.executor.SyncJobExecutor;
-import info.avalon566.shardingscaling.core.job.sync.SyncTaskFactory;
+import info.avalon566.shardingscaling.core.controller.ReportCallback;
+import info.avalon566.shardingscaling.core.controller.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.synctask.SyncTask;
+import info.avalon566.shardingscaling.core.execute.Event;
+import info.avalon566.shardingscaling.core.execute.Reporter;
+import info.avalon566.shardingscaling.core.execute.engine.SyncJobExecutor;
+import info.avalon566.shardingscaling.core.synctask.SyncTaskFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +32,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Local sync job executor.
+ * Local execute job executor.
  *
  * @author avalon566
  */

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/AbstractSyncRunner.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/AbstractSyncRunner.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync;
+package info.avalon566.shardingscaling.core.execute.executor;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -23,6 +23,7 @@ import lombok.Setter;
 
 /**
  * Abstract runner.
+ *
  * @author avalon566
  */
 public abstract class AbstractSyncRunner implements SyncRunner {

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/SyncRunner.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/SyncRunner.java

@@ -15,21 +15,22 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync;
+package info.avalon566.shardingscaling.core.execute.executor;
 
 /**
- * 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();
 }

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/AckCallback.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/channel/AckCallback.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.channel;
+package info.avalon566.shardingscaling.core.execute.executor.channel;
 
-import info.avalon566.shardingscaling.core.sync.record.Record;
+import info.avalon566.shardingscaling.core.execute.executor.record.Record;
 
 import java.util.List;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/Channel.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/channel/Channel.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.channel;
+package info.avalon566.shardingscaling.core.execute.executor.channel;
 
-import info.avalon566.shardingscaling.core.sync.record.Record;
+import info.avalon566.shardingscaling.core.execute.executor.record.Record;
 
 import java.util.List;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/MemoryChannel.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/channel/MemoryChannel.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.channel;
+package info.avalon566.shardingscaling.core.execute.executor.channel;
 
 import info.avalon566.shardingscaling.core.config.ScalingContext;
-import info.avalon566.shardingscaling.core.sync.record.Record;
+import info.avalon566.shardingscaling.core.execute.executor.record.Record;
 
 import java.util.ArrayList;
 import java.util.LinkedList;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/channel/RealtimeSyncChannel.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/channel/RealtimeSyncChannel.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.channel;
+package info.avalon566.shardingscaling.core.execute.executor.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.executor.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.record.DataRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.FinishedRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.PlaceholderRecord;
+import info.avalon566.shardingscaling.core.execute.executor.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
  */

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/AbstractJdbcReader.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/AbstractJdbcReader.java

@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.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.executor.AbstractSyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.metadata.ColumnMetaData;
+import info.avalon566.shardingscaling.core.execute.executor.record.Column;
+import info.avalon566.shardingscaling.core.execute.executor.record.DataRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.FinishedRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.Record;
+import info.avalon566.shardingscaling.core.util.DataSourceFactory;
+import info.avalon566.shardingscaling.core.util.DbMetaDataUtil;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/JdbcReader.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/JdbcReader.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.reader;
 
 import java.util.List;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogPosition.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/LogPosition.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.reader;
 
 import java.io.Serializable;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/LogReader.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/LogReader.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.reader;
 
 /**
  * Log reader.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/NopLogPosition.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/NopLogPosition.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.reader;
 
 /**
  * Nop log position.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/Reader.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/Reader.java

@@ -15,25 +15,28 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.reader;
 
-import info.avalon566.shardingscaling.core.sync.channel.Channel;
-import info.avalon566.shardingscaling.core.sync.SyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.execute.executor.SyncRunner;
 
 /**
  * Reader interface.
+ *
  * @author avalon566
  */
 public interface Reader extends SyncRunner {
 
     /**
      * Set channel.
+     *
      * @param channel channel
      */
     void setChannel(Channel channel);
 
     /**
      * Read Record to channel.
+     *
      * @param channel channel
      */
     void read(Channel channel);

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/reader/ReaderFactory.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/reader/ReaderFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.reader;
+package info.avalon566.shardingscaling.core.execute.executor.reader;
 
 import info.avalon566.shardingscaling.core.config.RdbmsConfiguration;
 import info.avalon566.shardingscaling.core.spi.ScalingEntry;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Column.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/record/Column.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.record;
+package info.avalon566.shardingscaling.core.execute.executor.record;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/DataRecord.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/record/DataRecord.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.record;
+package info.avalon566.shardingscaling.core.execute.executor.record;
 
-import info.avalon566.shardingscaling.core.sync.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -25,6 +25,7 @@ import java.util.List;
 
 /**
  * Data record.
+ *
  * @author avalon566
  */
 @Data
@@ -45,6 +46,7 @@ public class DataRecord extends Record {
 
     /**
      * Add a column to record.
+     *
      * @param data column
      */
     public void addColumn(final Column data) {
@@ -53,6 +55,7 @@ public class DataRecord extends Record {
 
     /**
      * Return column count.
+     *
      * @return count
      */
     public int getColumnCount() {
@@ -61,6 +64,7 @@ public class DataRecord extends Record {
 
     /**
      * Get column by index.
+     *
      * @param index of column
      * @return column
      */
@@ -70,6 +74,7 @@ public class DataRecord extends Record {
 
     /**
      * Get table name.
+     *
      * @return tableName
      */
     public String getTableName() {

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/FinishedRecord.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/record/FinishedRecord.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.record;
+package info.avalon566.shardingscaling.core.execute.executor.record;
 
-import info.avalon566.shardingscaling.core.sync.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
 
 /**
  * Finished record.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/PlaceholderRecord.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/record/PlaceholderRecord.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.record;
+package info.avalon566.shardingscaling.core.execute.executor.record;
 
-import info.avalon566.shardingscaling.core.sync.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
 
 /**
  * Placeholder record.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/record/Record.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/record/Record.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.record;
+package info.avalon566.shardingscaling.core.execute.executor.record;
 
-import info.avalon566.shardingscaling.core.sync.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/AbstractJdbcWriter.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/writer/AbstractJdbcWriter.java

@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.writer;
+package info.avalon566.shardingscaling.core.execute.executor.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.executor.AbstractSyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.metadata.ColumnMetaData;
+import info.avalon566.shardingscaling.core.execute.executor.record.Column;
+import info.avalon566.shardingscaling.core.execute.executor.record.DataRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.FinishedRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.Record;
+import info.avalon566.shardingscaling.core.util.DataSourceFactory;
+import info.avalon566.shardingscaling.core.util.DbMetaDataUtil;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/SqlBuilder.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/writer/SqlBuilder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.writer;
+package info.avalon566.shardingscaling.core.execute.executor.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.metadata.ColumnMetaData;
+import info.avalon566.shardingscaling.core.util.DbMetaDataUtil;
 
 /**
  * Sql builder.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/Writer.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/writer/Writer.java

@@ -15,25 +15,28 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.writer;
+package info.avalon566.shardingscaling.core.execute.executor.writer;
 
-import info.avalon566.shardingscaling.core.sync.channel.Channel;
-import info.avalon566.shardingscaling.core.sync.SyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.execute.executor.SyncRunner;
 
 /**
  * Writer.
+ *
  * @author avalon566
  */
 public interface Writer extends SyncRunner {
 
     /**
      * Set channel.
+     *
      * @param channel channel
      */
     void setChannel(Channel channel);
 
     /**
      * write data to channel.
+     *
      * @param channel channel
      */
     void write(Channel channel);

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/writer/WriterFactory.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/execute/executor/writer/WriterFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.writer;
+package info.avalon566.shardingscaling.core.execute.executor.writer;
 
 import info.avalon566.shardingscaling.core.config.RdbmsConfiguration;
 import info.avalon566.shardingscaling.core.spi.ScalingEntry;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/ColumnMetaData.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/metadata/ColumnMetaData.java

@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.metadata;
+package info.avalon566.shardingscaling.core.metadata;
 
 import lombok.Data;
 
 /**
  * Column meta data.
+ *
  * @author avalon566
  */
 @Data

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/metadata/JdbcUri.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/metadata/JdbcUri.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.metadata;
+package info.avalon566.shardingscaling.core.metadata;
 
 import com.google.common.base.Strings;
 

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.executor.reader.JdbcReader;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogReader;
+import info.avalon566.shardingscaling.core.execute.executor.writer.Writer;
 import org.apache.shardingsphere.spi.DatabaseTypeAwareSPI;
 
 /**

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/HistoryDataSyncTask.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/synctask/HistoryDataSyncTask.java

@@ -15,27 +15,27 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync;
+package info.avalon566.shardingscaling.core.synctask;
 
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
-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.controller.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.execute.Event;
+import info.avalon566.shardingscaling.core.execute.EventType;
+import info.avalon566.shardingscaling.core.execute.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.engine.SyncExecutor;
+import info.avalon566.shardingscaling.core.execute.executor.channel.MemoryChannel;
+import info.avalon566.shardingscaling.core.execute.executor.reader.NopLogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.Reader;
+import info.avalon566.shardingscaling.core.execute.executor.reader.ReaderFactory;
+import info.avalon566.shardingscaling.core.execute.executor.writer.Writer;
+import info.avalon566.shardingscaling.core.execute.executor.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));
         }

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/RealtimeDataSyncTask.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/synctask/RealtimeDataSyncTask.java

@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync;
+package info.avalon566.shardingscaling.core.synctask;
 
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
 import info.avalon566.shardingscaling.core.exception.SyncExecuteException;
-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.controller.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.execute.Event;
+import info.avalon566.shardingscaling.core.execute.EventType;
+import info.avalon566.shardingscaling.core.execute.Reporter;
+import info.avalon566.shardingscaling.core.execute.engine.SyncExecutor;
+import info.avalon566.shardingscaling.core.execute.executor.channel.AckCallback;
+import info.avalon566.shardingscaling.core.execute.executor.channel.RealtimeSyncChannel;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogReader;
+import info.avalon566.shardingscaling.core.execute.executor.reader.ReaderFactory;
+import info.avalon566.shardingscaling.core.execute.executor.record.Record;
+import info.avalon566.shardingscaling.core.execute.executor.writer.Writer;
+import info.avalon566.shardingscaling.core.execute.executor.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));
         }

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/SyncTask.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/synctask/SyncTask.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync;
+package info.avalon566.shardingscaling.core.synctask;
 
-import info.avalon566.shardingscaling.core.job.SyncTaskProgress;
+import info.avalon566.shardingscaling.core.controller.SyncTaskProgress;
 
 /**
  * Sync task interface.

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/job/sync/SyncTaskFactory.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/synctask/SyncTaskFactory.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.job.sync;
+package info.avalon566.shardingscaling.core.synctask;
 
 import info.avalon566.shardingscaling.core.config.SyncConfiguration;
 import info.avalon566.shardingscaling.core.config.SyncType;
-import info.avalon566.shardingscaling.core.job.sync.executor.local.LocalReporter;
+import info.avalon566.shardingscaling.core.execute.engine.local.LocalReporter;
 
 /**
  * Sync task factory.
@@ -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())) {

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DataSourceFactory.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/util/DataSourceFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.util;
+package info.avalon566.shardingscaling.core.util;
 
 import org.apache.commons.dbcp2.BasicDataSource;
 import info.avalon566.shardingscaling.core.config.DataSourceConfiguration;

sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/sync/util/DbMetaDataUtil.java → sharding-scaling-core/src/main/java/info/avalon566/shardingscaling/core/util/DbMetaDataUtil.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package info.avalon566.shardingscaling.core.sync.util;
+package info.avalon566.shardingscaling.core.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.metadata.ColumnMetaData;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.sql.DataSource;

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.executor.reader.LogPosition;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

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.executor.AbstractSyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogReader;
+import info.avalon566.shardingscaling.core.execute.executor.reader.NopLogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.record.Column;
+import info.avalon566.shardingscaling.core.execute.executor.record.DataRecord;
+import info.avalon566.shardingscaling.core.metadata.JdbcUri;
+import info.avalon566.shardingscaling.core.execute.executor.record.FinishedRecord;
+import info.avalon566.shardingscaling.core.execute.executor.record.PlaceholderRecord;
+import info.avalon566.shardingscaling.core.execute.executor.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.util.DataSourceFactory;
 import info.avalon566.shardingscaling.core.config.JdbcDataSourceConfiguration;
 import info.avalon566.shardingscaling.mysql.binlog.MySQLConnector;
 import lombok.Setter;

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.executor.reader.AbstractJdbcReader;
+import info.avalon566.shardingscaling.core.metadata.JdbcUri;
 
 import java.util.List;
 import java.util.Map;

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.executor.reader.JdbcReader;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogReader;
+import info.avalon566.shardingscaling.core.execute.executor.writer.Writer;
 
 /**
  * MySQL scaling entry.

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.executor.writer.AbstractJdbcWriter;
 
 /**
  * MySQL writer.

sharding-scaling-mysql/src/test/java/info/avalon566/shardingscaling/mysql/binlog/codec/MySQLBinlogEventPacketDecoderTest.java

@@ -64,7 +64,7 @@ public class MySQLBinlogEventPacketDecoderTest {
     @Test(expected = UnsupportedOperationException.class)
     public void assertDecodeWithReadError() {
         when(byteBuf.isReadable()).thenReturn(true);
-        binlogEventPacketDecoder.decode(null, byteBuf, null);
+        binlogEventPacketDecoder.decode(null, byteBuf, new ArrayList<Object>());
     }
     
     @Test

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.executor.reader.AbstractJdbcReader;
 
 /**
  * PostgreSQL JDBC reader.

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.executor.reader.JdbcReader;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogReader;
+import info.avalon566.shardingscaling.core.execute.executor.writer.Writer;
 
 /**
  * PostgreSQL scaling entry.

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.executor.AbstractSyncRunner;
+import info.avalon566.shardingscaling.core.execute.executor.channel.Channel;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogPosition;
+import info.avalon566.shardingscaling.core.execute.executor.reader.LogReader;
 import lombok.Setter;
 
 /**

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.executor.writer.AbstractJdbcWriter;
 
 /**
  * postgreSQL writer.