Fix Bug: issues-I4AU42

2025-09-10 14:09:06 +00:00 · 2021-09-20 12:46:36 +08:00
parent 057b655c7b
commit 12255c7c4b
19 changed files with 339 additions and 296 deletions
--- a/README.md
+++ b/README.md
@@ -387,7 +387,19 @@ bin/startup.sh
 
 ![admin_06.png](images/admin_06.png)

-## 四、文档博客
+## 四、常见问题解决
+
+### 1、执行启动脚本报错
+
+- （1）在Windows下，执行startup.cmd或datasync.cmd脚本报错
+
+> 解决办法：将脚本的内容复制后，删除原脚本文件，然后再创建一个同名脚本文件后，将原内容粘贴进去后，再执行脚本。
+
+- （2）在Linux下，执行startup.sh或datasync.sh脚本报错
+
+> 解决办法：用vi/vim工具打开脚本，然后命令模式下设置 ```set ff=unix```后，然后保存退出，再执行脚本。
+
+## 五、文档博客

 （1）https://blog.csdn.net/inrgihc/article/details/103739629

@@ -397,7 +409,7 @@ bin/startup.sh

 （4）https://blog.csdn.net/inrgihc/article/details/103738656

-## 五、问题反馈
+## 六、问题反馈

 如果您看到并使用了本工具，或您觉得本工具对您有价值，请为此项目**点个赞**，以表示对本项目的支持，多谢！如果您在使用时遇到了bug，欢迎在issue中反馈。也可扫描下方二维码入群讨论：（加好友请注明："程序交流"）

--- a/dbswitch-admin/pom.xml
+++ b/dbswitch-admin/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.gitee.dbswitch</groupId>
    <artifactId>dbswitch-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
  </parent>

  <artifactId>dbswitch-admin</artifactId>
@@ -54,6 +54,7 @@
    <dependency>
      <groupId>mysql</groupId>
      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.47</version>
      <scope>runtime</scope>
    </dependency>

--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/JobExecutorService.java
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/JobExecutorService.java
@@ -1,4 +1,3 @@
-package com.gitee.dbswitch.admin.service;
 // Copyright tang.  All rights reserved.
 // https://gitee.com/inrgihc/dbswitch
 //
@@ -8,6 +7,8 @@ package com.gitee.dbswitch.admin.service;
 // Date : 2020/1/2
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
+package com.gitee.dbswitch.admin.service;
+
 import cn.hutool.core.exceptions.ExceptionUtil;
 import com.gitee.dbswitch.admin.dao.AssignmentConfigDAO;
 import com.gitee.dbswitch.admin.dao.AssignmentJobDAO;
@@ -108,14 +109,21 @@ public class JobExecutorService extends QuartzJobBean implements InterruptableJo
    try {
      DbswichProperties properties = JsonUtil
          .toBeanObject(task.getContent(), DbswichProperties.class);
+      if (!assignmentConfigEntity.getFirstFlag()) {
+        properties.getTarget().setTargetDrop(false);
+        properties.getTarget().setChangeDataSynch(true);
+      }
+
      MainService mainService = new MainService(properties);
      mainService.run();

-      AssignmentConfigEntity config = new AssignmentConfigEntity();
-      config.setId(assignmentConfigEntity.getId());
-      config.setTargetDropTable(Boolean.FALSE);
-      config.setFirstFlag(Boolean.FALSE);
-      assignmentConfigDAO.updateSelective(config);
+      if (assignmentConfigEntity.getFirstFlag()) {
+        AssignmentConfigEntity config = new AssignmentConfigEntity();
+        config.setId(assignmentConfigEntity.getId());
+        config.setTargetDropTable(Boolean.FALSE);
+        config.setFirstFlag(Boolean.FALSE);
+        assignmentConfigDAO.updateSelective(config);
+      }

      assignmentJobEntity.setStatus(JobStatusEnum.PASS.getValue());
      log.info("Execute Assignment Success [taskId={}],Task Name: {}", task.getId(),
--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/type/SupportDbTypeEnum.java
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/type/SupportDbTypeEnum.java
@@ -17,7 +17,7 @@ import org.springframework.util.StringUtils;
@AllArgsConstructor
 public enum SupportDbTypeEnum {

-  MYSQL(1, "mysql", "com.mysql.cj.jdbc.Driver", "/* ping */ SELECT 1",
+  MYSQL(1, "mysql", "com.mysql.jdbc.Driver", "/* ping */ SELECT 1",
      "jdbc:mysql://{host}:{port>/{name}?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&tinyInt1isBit=false"),
  MARIADB(2, "mariadb", "org.mariadb.jdbc.Driver", "SELECT 1",
      "jdbc:mariadb://{host}:{port}/{name}?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&tinyInt1isBit=false"),
--- a/dbswitch-common/pom.xml
+++ b/dbswitch-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>dbswitch-common</artifactId>
--- a/dbswitch-core/pom.xml
+++ b/dbswitch-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>dbswitch-core</artifactId>
@@ -21,16 +21,19 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.47</version>
 		</dependency>

 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
+			<scope>runtime</scope>
 		</dependency>

 		<dependency>
 			<groupId>com.oracle.ojdbc</groupId>
 			<artifactId>ojdbc8</artifactId>
+			<scope>runtime</scope>
 		</dependency>

 		<!-- https://mvnrepository.com/artifact/com.oracle.database.nls/orai18n -->
@@ -38,12 +41,14 @@
 			<groupId>com.oracle.database.nls</groupId>
 			<artifactId>orai18n</artifactId>
 			<version>19.7.0.0</version>
+			<scope>runtime</scope>
 		</dependency>

 		<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>
 			<artifactId>sqljdbc4</artifactId>
 			<version>4.0</version>
+			<scope>runtime</scope>
 		</dependency>

 		<dependency>
@@ -97,12 +102,14 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
+			<scope>runtime</scope>
 		</dependency>

 		<dependency>
 			<groupId>com.ibm.db2.jcc</groupId>
 			<artifactId>db2jcc</artifactId>
 			<version>db2jcc4</version>
+			<scope>runtime</scope>
 		</dependency>

 		<dependency>
--- a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseMysqlImpl.java
+++ b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseMysqlImpl.java
@@ -36,7 +36,7 @@ import org.springframework.util.CollectionUtils;
 public class DatabaseMysqlImpl extends AbstractDatabase implements IDatabaseInterface {

 	public DatabaseMysqlImpl() {
-		super("com.mysql.cj.jdbc.Driver");
+		super("com.mysql.jdbc.Driver");
 	}
 	
 	public DatabaseMysqlImpl(String driverClassName) {
--- a/dbswitch-data/pom.xml
+++ b/dbswitch-data/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>dbswitch-data</artifactId>
@@ -22,6 +22,18 @@
 			<groupId>com.gitee.dbswitch</groupId>
 			<artifactId>dbswitch-core</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.47</version>
 		</dependency>

 		<dependency>
@@ -52,16 +64,6 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>

-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.ehcache</groupId>
 			<artifactId>sizeof</artifactId>
--- a/dbswitch-data/src/main/java/com/gitee/dbswitch/data/DataSyncApplication.java
+++ b/dbswitch-data/src/main/java/com/gitee/dbswitch/data/DataSyncApplication.java
@@ -11,6 +11,7 @@ package com.gitee.dbswitch.data;

 import com.gitee.dbswitch.data.config.DbswichProperties;
 import com.gitee.dbswitch.data.core.MainService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.WebApplicationType;
@@ -20,28 +21,28 @@ import org.springframework.context.ConfigurableApplicationContext;

 /**
 * DATA模块启动类
- * 
- * @author tang
 *
+ * @author tang
 */
+@Slf4j
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class DataSyncApplication {

-	public static void main(String[] args) {
-		SpringApplication springApplication = new SpringApplication(DataSyncApplication.class);
-		springApplication.setWebApplicationType(WebApplicationType.NONE);
-		springApplication.setBannerMode(Banner.Mode.OFF);
-		ConfigurableApplicationContext applicationContext = springApplication.run(args);
-		try {
-			DbswichProperties properties = applicationContext.getBean(DbswichProperties.class);
-			MainService mainService = new MainService(properties);
-			mainService.run();
-		}catch (Exception e){
+  public static void main(String[] args) {
+    SpringApplication springApplication = new SpringApplication(DataSyncApplication.class);
+    springApplication.setWebApplicationType(WebApplicationType.NONE);
+    springApplication.setBannerMode(Banner.Mode.OFF);
+    ConfigurableApplicationContext applicationContext = springApplication.run(args);
+    try {
+      DbswichProperties properties = applicationContext.getBean(DbswichProperties.class);
+      MainService mainService = new MainService(properties);
+      mainService.run();
+    } catch (Exception e) {
+      log.error("error:", e);
+    } finally {
+      applicationContext.close();
+    }

-		} finally {
-			applicationContext.close();
-		}
-
-	}
+  }

 }
--- a/dbswitch-data/src/main/java/com/gitee/dbswitch/data/core/MainService.java
+++ b/dbswitch-data/src/main/java/com/gitee/dbswitch/data/core/MainService.java
@@ -9,6 +9,18 @@
 /////////////////////////////////////////////////////////////
 package com.gitee.dbswitch.data.core;

+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gitee.dbswitch.core.model.TableDescription;
+import com.gitee.dbswitch.core.service.IMetaDataService;
+import com.gitee.dbswitch.core.service.impl.MigrationMetaDataServiceImpl;
+import com.gitee.dbswitch.data.config.DbswichProperties;
+import com.gitee.dbswitch.data.domain.PerfStat;
+import com.gitee.dbswitch.data.handler.MigrationHandler;
+import com.gitee.dbswitch.data.util.BytesUnitUtils;
+import com.gitee.dbswitch.data.util.DataSouceUtils;
+import com.gitee.dbswitch.data.util.JdbcTemplateUtils;
+import com.gitee.dbswitch.data.util.StrUtils;
+import com.zaxxer.hikari.HikariDataSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -17,20 +29,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
-import com.gitee.dbswitch.data.domain.PerfStat;
-import com.gitee.dbswitch.data.handler.MigrationHandler;
-import com.gitee.dbswitch.data.util.BytesUnitUtils;
-import com.gitee.dbswitch.data.util.DataSouceUtils;
-import com.gitee.dbswitch.data.util.StrUtils;
-import com.gitee.dbswitch.core.service.impl.MigrationMetaDataServiceImpl;
-import org.springframework.util.StopWatch;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitee.dbswitch.core.model.TableDescription;
-import com.gitee.dbswitch.core.service.IMetaDataService;
-import com.gitee.dbswitch.data.config.DbswichProperties;
-import com.gitee.dbswitch.data.util.JdbcTemplateUtils;
-import com.zaxxer.hikari.HikariDataSource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StopWatch;

 /**
 * 数据迁移主逻辑类
@@ -40,183 +40,195 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
 public class MainService {

-    /**
-     * JSON序列化工具
-     */
-    private final ObjectMapper jackson = new ObjectMapper();
+  /**
+   * JSON序列化工具
+   */
+  private final ObjectMapper jackson = new ObjectMapper();

-    /**
-     * 性能统计记录表
-     */
-    private final List<PerfStat> perfStats = new ArrayList<>();
+  /**
+   * 性能统计记录表
+   */
+  private final List<PerfStat> perfStats = new ArrayList<>();

-    /**
-     * 配置参数
-     */
-    private DbswichProperties properties;
+  /**
+   * 配置参数
+   */
+  private final DbswichProperties properties;

-    /**
-     * 构造函数
-     *
-     * @param properties 配置信息
-     */
-    public MainService(DbswichProperties properties){
-        this.properties=properties;
-    }
+  /**
+   * 构造函数
+   *
+   * @param properties 配置信息
+   */
+  public MainService(DbswichProperties properties) {
+    this.properties = properties;
+  }

-    /**
-     * 执行主逻辑
-     */
-    public void run() throws Exception {
-        StopWatch watch = new StopWatch();
-        watch.start();
+  /**
+   * 执行主逻辑
+   */
+  public void run() throws Exception {
+    StopWatch watch = new StopWatch();
+    watch.start();

-        log.info("dbswitch data service is started....");
+    log.info("dbswitch data service is started....");
+    //log.info("Application properties configuration \n{}", properties);

-        try {
-            //log.info("Application properties configuration \n{}", properties);
-            List<DbswichProperties.SourceDataSourceProperties> sourcesProperties = properties.getSource();
+    try (HikariDataSource targetDataSource = DataSouceUtils
+        .createTargetDataSource(properties.getTarget())) {
+      int sourcePropertiesIndex = 0;
+      int totalTableCount = 0;
+      List<DbswichProperties.SourceDataSourceProperties> sourcesProperties = properties.getSource();
+      for (DbswichProperties.SourceDataSourceProperties sourceProperties : sourcesProperties) {

-            HikariDataSource targetDataSource = DataSouceUtils.createTargetDataSource(properties.getTarget());
+        try (HikariDataSource sourceDataSource = DataSouceUtils
+            .createSourceDataSource(sourceProperties)) {
+          IMetaDataService sourceMetaDataService = new MigrationMetaDataServiceImpl();

-            int sourcePropertiesIndex = 0;
-            int totalTableCount = 0;
-            for (DbswichProperties.SourceDataSourceProperties sourceProperties : sourcesProperties) {
+          sourceMetaDataService
+              .setDatabaseConnection(JdbcTemplateUtils.getDatabaseProduceName(sourceDataSource));

-                try (HikariDataSource sourceDataSource = DataSouceUtils.createSourceDataSource(sourceProperties)) {
-                    IMetaDataService sourceMetaDataService = new MigrationMetaDataServiceImpl();
+          // 判断处理的策略：是排除还是包含
+          List<String> includes = StrUtils.stringToList(sourceProperties.getSourceIncludes());
+          log.info("Includes tables is :{}", jackson.writeValueAsString(includes));
+          List<String> filters = StrUtils.stringToList(sourceProperties.getSourceExcludes());
+          log.info("Filter tables is :{}", jackson.writeValueAsString(filters));

-                    sourceMetaDataService.setDatabaseConnection(JdbcTemplateUtils.getDatabaseProduceName(sourceDataSource));
+          boolean useExcludeTables = includes.isEmpty();
+          if (useExcludeTables) {
+            log.info("!!!! Use dbswitch.source[{}].source-excludes parameter to filter tables",
+                sourcePropertiesIndex);
+          } else {
+            log.info("!!!! Use dbswitch.source[{}].source-includes parameter to filter tables",
+                sourcePropertiesIndex);
+          }

-                    // 判断处理的策略：是排除还是包含
-                    List<String> includes = StrUtils.stringToList(sourceProperties.getSourceIncludes());
-                    log.info("Includes tables is :{}", jackson.writeValueAsString(includes));
-                    List<String> filters = StrUtils.stringToList(sourceProperties.getSourceExcludes());
-                    log.info("Filter tables is :{}", jackson.writeValueAsString(filters));
+          List<CompletableFuture<Void>> futures = new ArrayList<>();

-                    boolean useExcludeTables = includes.isEmpty();
-                    if (useExcludeTables) {
-                        log.info("!!!! Use dbswitch.source[{}].source-excludes parameter to filter tables", sourcePropertiesIndex);
-                    } else {
-                        log.info("!!!! Use dbswitch.source[{}].source-includes parameter to filter tables", sourcePropertiesIndex);
+          List<String> schemas = StrUtils.stringToList(sourceProperties.getSourceSchema());
+          log.info("Source schema names is :{}", jackson.writeValueAsString(schemas));
+
+          AtomicInteger numberOfFailures = new AtomicInteger(0);
+          AtomicLong totalBytesSize = new AtomicLong(0L);
+          final int indexInternal = sourcePropertiesIndex;
+          for (String schema : schemas) {
+            List<TableDescription> tableList = sourceMetaDataService
+                .queryTableList(sourceProperties.getUrl(),
+                    sourceProperties.getUsername(), sourceProperties.getPassword(), schema);
+            if (tableList.isEmpty()) {
+              log.warn("### Find source database table list empty for schema name is : {}", schema);
+            } else {
+              for (TableDescription td : tableList) {
+                String tableName = td.getTableName();
+
+                if (useExcludeTables) {
+                  if (!filters.contains(tableName)) {
+                    futures.add(
+                        makeFutureTask(td, indexInternal, sourceDataSource, targetDataSource,
+                            numberOfFailures, totalBytesSize));
+                  }
+                } else {
+                  if (includes.size() == 1 && (includes.get(0).contains("*") || includes.get(0)
+                      .contains("?"))) {
+                    if (Pattern.matches(includes.get(0), tableName)) {
+                      futures.add(
+                          makeFutureTask(td, indexInternal, sourceDataSource, targetDataSource,
+                              numberOfFailures, totalBytesSize));
                    }
-
-                    List<CompletableFuture<Void>> futures = new ArrayList<>();
-
-                    List<String> schemas = StrUtils.stringToList(sourceProperties.getSourceSchema());
-                    log.info("Source schema names is :{}", jackson.writeValueAsString(schemas));
-
-                    AtomicInteger numberOfFailures = new AtomicInteger(0);
-                    AtomicLong totalBytesSize = new AtomicLong(0L);
-                    final int indexInternal = sourcePropertiesIndex;
-                    for (String schema : schemas) {
-                        // 读取源库指定schema里所有的表
-                        List<TableDescription> tableList = sourceMetaDataService.queryTableList(sourceProperties.getUrl(),
-                                sourceProperties.getUsername(), sourceProperties.getPassword(), schema);
-                        if (tableList.isEmpty()) {
-                            log.warn("### Find source database table list empty for schema name is : {}", schema);
-                        } else {
-                            for (TableDescription td : tableList) {
-                                String tableName = td.getTableName();
-
-                                if (useExcludeTables) {
-                                    if (!filters.contains(tableName)) {
-                                        futures.add(makeFutureTask(td, indexInternal, sourceDataSource, targetDataSource, numberOfFailures, totalBytesSize));
-                                    }
-                                } else {
-                                    if (includes.size() == 1 && (includes.get(0).contains("*") || includes.get(0).contains("?"))) {
-                                        if (Pattern.matches(includes.get(0), tableName)) {
-                                            futures.add(makeFutureTask(td, indexInternal, sourceDataSource, targetDataSource, numberOfFailures, totalBytesSize));
-                                        }
-                                    } else if (includes.contains(tableName)) {
-                                        futures.add(makeFutureTask(td, indexInternal, sourceDataSource, targetDataSource, numberOfFailures, totalBytesSize));
-                                    }
-                                }
-
-                            }
-
-                        }
-
-                    }
-
-                    CompletableFuture.allOf(futures.toArray(new CompletableFuture[]{})).join();
-                    log.info("#### Complete data migration for the [ {} ] data source:\ntotal count={}\nfailure count={}\ntotal bytes size={}",
-                            sourcePropertiesIndex, futures.size(), numberOfFailures.get(), BytesUnitUtils.bytesSizeToHuman(totalBytesSize.get()));
-
-                    perfStats.add(new PerfStat(sourcePropertiesIndex, futures.size(), numberOfFailures.get(), totalBytesSize.get()));
-
-                    ++sourcePropertiesIndex;
-                    totalTableCount += futures.size();
+                  } else if (includes.contains(tableName)) {
+                    futures.add(
+                        makeFutureTask(td, indexInternal, sourceDataSource, targetDataSource,
+                            numberOfFailures, totalBytesSize));
+                  }
                }
+
+              }
+
            }
-            log.info("service run all success, total migrate table count={} ", totalTableCount);
-        } catch (Exception e) {
-            log.error("error:", e);
-            throw e;
-        } finally {
-            watch.stop();
-            log.info("total elipse = {} s", watch.getTotalTimeSeconds());

-            StringBuilder sb = new StringBuilder();
-            sb.append("===================================\n");
-            sb.append(String.format("total elipse time:\t %f s\n", watch.getTotalTimeSeconds()));
-            sb.append("-------------------------------------\n");
-            perfStats.forEach(st -> {
-                sb.append(st);
-                if(perfStats.size()>1){
-                    sb.append("-------------------------------------\n");
-                }
-            });
-            sb.append("===================================\n");
-            log.info("\n\n" + sb.toString());
+          }
+
+          CompletableFuture.allOf(futures.toArray(new CompletableFuture[]{})).join();
+          log.info(
+              "#### Complete data migration for the [ {} ] data source:\ntotal count={}\nfailure count={}\ntotal bytes size={}",
+              sourcePropertiesIndex, futures.size(), numberOfFailures.get(),
+              BytesUnitUtils.bytesSizeToHuman(totalBytesSize.get()));
+
+          perfStats.add(new PerfStat(sourcePropertiesIndex, futures.size(), numberOfFailures.get(),
+              totalBytesSize.get()));
+
+          ++sourcePropertiesIndex;
+          totalTableCount += futures.size();
        }
-    }
+      }
+      log.info("service run all success, total migrate table count={} ", totalTableCount);
+    } finally {
+      watch.stop();
+      log.info("total ellipse = {} s", watch.getTotalTimeSeconds());

-    /**
-     * 构造一个异步执行任务
-     *
-     * @param td               表描述上下文
-     * @param indexInternal    源端索引号
-     * @param sds              源端的DataSource数据源
-     * @param tds              目的端的DataSource数据源
-     * @param numberOfFailures 失败的数量
-     * @param totalBytesSize   同步的字节大小
-     * @return CompletableFuture<Void>
-     */
-    private CompletableFuture<Void> makeFutureTask(TableDescription td, Integer indexInternal,
-                                                   HikariDataSource sds, HikariDataSource tds,
-                                                   AtomicInteger numberOfFailures, AtomicLong totalBytesSize) {
-        return CompletableFuture.supplyAsync(getMigrateHandler(td, indexInternal, sds, tds))
-                .exceptionally(getExceptHandler(td, numberOfFailures))
-                .thenAccept(totalBytesSize::addAndGet);
+      StringBuilder sb = new StringBuilder();
+      sb.append("===================================\n");
+      sb.append(String.format("total ellipse time:\t %f s\n", watch.getTotalTimeSeconds()));
+      sb.append("-------------------------------------\n");
+      perfStats.forEach(st -> {
+        sb.append(st);
+        if (perfStats.size() > 1) {
+          sb.append("-------------------------------------\n");
+        }
+      });
+      sb.append("===================================\n");
+      log.info("\n\n" + sb.toString());
    }
+  }

-    /**
-     * 单表迁移处理方法
-     *
-     * @param td            表描述上下文
-     * @param indexInternal 源端索引号
-     * @param sds           源端的DataSource数据源
-     * @param tds           目的端的DataSource数据源
-     * @return Supplier<Long>
-     */
-    private Supplier<Long> getMigrateHandler(TableDescription td, Integer indexInternal, HikariDataSource sds, HikariDataSource tds) {
-        return () -> MigrationHandler.createInstance(td, properties, indexInternal, sds, tds).get();
-    }
+  /**
+   * 构造一个异步执行任务
+   *
+   * @param td               表描述上下文
+   * @param indexInternal    源端索引号
+   * @param sds              源端的DataSource数据源
+   * @param tds              目的端的DataSource数据源
+   * @param numberOfFailures 失败的数量
+   * @param totalBytesSize   同步的字节大小
+   * @return CompletableFuture<Void>
+   */
+  private CompletableFuture<Void> makeFutureTask(TableDescription td, Integer indexInternal,
+      HikariDataSource sds, HikariDataSource tds,
+      AtomicInteger numberOfFailures, AtomicLong totalBytesSize) {
+    return CompletableFuture.supplyAsync(getMigrateHandler(td, indexInternal, sds, tds))
+        .exceptionally(getExceptHandler(td, numberOfFailures))
+        .thenAccept(totalBytesSize::addAndGet);
+  }

-    /**
-     * 异常处理函数方法
-     *
-     * @param td               表描述上下文
-     * @param numberOfFailures 失败记录数
-     * @return Function<Throwable, Long>
-     */
-    private Function<Throwable, Long> getExceptHandler(TableDescription td, AtomicInteger numberOfFailures) {
-        return (e) -> {
-            log.error("Error migration for table: {}.{}, error message:", td.getSchemaName(), td.getTableName(), e);
-            numberOfFailures.incrementAndGet();
-            throw new RuntimeException(e);
-        };
-    }
+  /**
+   * 单表迁移处理方法
+   *
+   * @param td            表描述上下文
+   * @param indexInternal 源端索引号
+   * @param sds           源端的DataSource数据源
+   * @param tds           目的端的DataSource数据源
+   * @return Supplier<Long>
+   */
+  private Supplier<Long> getMigrateHandler(TableDescription td, Integer indexInternal,
+      HikariDataSource sds, HikariDataSource tds) {
+    return () -> MigrationHandler.createInstance(td, properties, indexInternal, sds, tds).get();
+  }
+
+  /**
+   * 异常处理函数方法
+   *
+   * @param td               表描述上下文
+   * @param numberOfFailures 失败记录数
+   * @return Function<Throwable, Long>
+   */
+  private Function<Throwable, Long> getExceptHandler(TableDescription td,
+      AtomicInteger numberOfFailures) {
+    return (e) -> {
+      log.error("Error migration for table: {}.{}, error message:", td.getSchemaName(),
+          td.getTableName(), e);
+      numberOfFailures.incrementAndGet();
+      throw new RuntimeException(e);
+    };
+  }

 }
--- a/dbswitch-dbchange/pom.xml
+++ b/dbswitch-dbchange/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>dbswitch-dbchange</artifactId>
--- a/dbswitch-dbcommon/pom.xml
+++ b/dbswitch-dbcommon/pom.xml
@@ -3,7 +3,7 @@
  <parent>
    <groupId>com.gitee.dbswitch</groupId>
    <artifactId>dbswitch-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
  </parent>
  
  <artifactId>dbswitch-dbcommon</artifactId>
--- a/dbswitch-dbsynch/pom.xml
+++ b/dbswitch-dbsynch/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.gitee.dbswitch</groupId>
    <artifactId>dbswitch-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
  </parent>

  <artifactId>dbswitch-dbsynch</artifactId>
--- a/dbswitch-dbwriter/pom.xml
+++ b/dbswitch-dbwriter/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>dbswitch-dbwriter</artifactId>
--- a/dbswitch-pgwriter/pom.xml
+++ b/dbswitch-pgwriter/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>
 	
 	<artifactId>dbswitch-pgwriter</artifactId>
--- a/dbswitch-sql/pom.xml
+++ b/dbswitch-sql/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>dbswitch-sql</artifactId>
--- a/package-tool/pom.xml
+++ b/package-tool/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.gitee.dbswitch</groupId>
 		<artifactId>dbswitch-parent</artifactId>
-		<version>1.6.0</version>
+		<version>1.6.1</version>
 	</parent>

 	<artifactId>package-tool</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -1,85 +1,85 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.2.0.RELEASE</version>
+    <relativePath/> <!-- lookup parent from repository -->
+  </parent>

-	<groupId>com.gitee.dbswitch</groupId>
-	<artifactId>dbswitch-parent</artifactId>
-	<version>1.6.0</version>
-	<packaging>pom</packaging>
-	<name>dbswitch</name>
-	<description>database switch project</description>
+  <groupId>com.gitee.dbswitch</groupId>
+  <artifactId>dbswitch-parent</artifactId>
+  <version>1.6.1</version>
+  <packaging>pom</packaging>
+  <name>dbswitch</name>
+  <description>database switch project</description>

-	<properties>
-		<java.version>1.8</java.version>
-		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<maven.test.skip>true</maven.test.skip>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-	</properties>
+  <properties>
+    <java.version>1.8</java.version>
+    <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+    <maven.test.skip>true</maven.test.skip>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  </properties>

-	<modules>
-		<module>dbswitch-common</module>
-		<module>dbswitch-core</module>
-		<module>dbswitch-pgwriter</module>
-		<module>dbswitch-dbwriter</module>
-		<module>dbswitch-dbcommon</module>
-		<module>dbswitch-dbchange</module>
-		<module>dbswitch-dbsynch</module>
-		<module>dbswitch-data</module>
-		<module>dbswitch-sql</module>
-		<module>dbswitch-admin</module>
-		<module>package-tool</module>
-	</modules>
+  <modules>
+    <module>dbswitch-common</module>
+    <module>dbswitch-core</module>
+    <module>dbswitch-pgwriter</module>
+    <module>dbswitch-dbwriter</module>
+    <module>dbswitch-dbcommon</module>
+    <module>dbswitch-dbchange</module>
+    <module>dbswitch-dbsynch</module>
+    <module>dbswitch-data</module>
+    <module>dbswitch-sql</module>
+    <module>dbswitch-admin</module>
+    <module>package-tool</module>
+  </modules>

-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+  </dependencies>

-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/*.xml</exclude>
-						<exclude>**/*.yml</exclude>
-						<exclude>**/*.properties</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<!-- 将依赖的jar包拷贝到target目录下 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target</outputDirectory>
-							<excludeTransitive>false</excludeTransitive>
-							<stripVersion>false</stripVersion>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*.xml</exclude>
+            <exclude>**/*.yml</exclude>
+            <exclude>**/*.properties</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <!-- 将依赖的jar包拷贝到target目录下 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target</outputDirectory>
+              <excludeTransitive>false</excludeTransitive>
+              <stripVersion>false</stripVersion>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>

 </project>
--- a/version.cmd
+++ b/version.cmd
@@ -1,6 +1,6 @@
@echo off

-set APP_VERSION=1.6.0
+set APP_VERSION=1.6.1

 echo "Clean Project ..."
 call mvn clean -f pom.xml