From 07d6df7c38d5dbc2841547e403e6b884b035bd68 Mon Sep 17 00:00:00 2001
From: zhouxiongjia <719216473@qq.com>
Date: Tue, 7 Sep 2021 20:33:17 +0800
Subject: [PATCH] verify some parameters value and clarify mysql encoding

---
 .../java/com/gauss/common/db/sql/SqlTemplate.java   |  2 --
 .../java/com/gauss/controller/GaussController.java  | 13 ++++++-------
 .../java/com/gauss/controller/GaussInstance.java    |  6 ------
 .../extractor/db/DbOnceFullRecordExtractor.java     |  1 +
 src/main/resources/gauss.properties                 |  2 --
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gauss/common/db/sql/SqlTemplate.java b/src/main/java/com/gauss/common/db/sql/SqlTemplate.java
index e934ae9..f5f6fa4 100644
--- a/src/main/java/com/gauss/common/db/sql/SqlTemplate.java
+++ b/src/main/java/com/gauss/common/db/sql/SqlTemplate.java
@@ -59,8 +59,6 @@ public class SqlTemplate {
             switch (meta.getType()) {
                 case Types.BOOLEAN:
                 case Types.BIT:
-                    sb.append("convert(").append(meta.getName()).append(",int)");
-                    break;
                 case Types.CHAR:
                     sb.append("convert(").append(meta.getName()).append(",char)");
                     break;
diff --git a/src/main/java/com/gauss/controller/GaussController.java b/src/main/java/com/gauss/controller/GaussController.java
index 172441a..b027b7e 100644
--- a/src/main/java/com/gauss/controller/GaussController.java
+++ b/src/main/java/com/gauss/controller/GaussController.java
@@ -90,7 +90,9 @@ public class GaussController extends AbstractGaussLifeCycle {
         int statBufferSize = config.getInt("gauss.stat.buffer.size", 16384);
         int statPrintInterval = config.getInt("gauss.stat.print.interval", 5);
         query_dop = config.getInt("gauss.table.query_dop", 8);
-
+        if (query_dop <= 0 || query_dop >= 65) {
+            query_dop = 8;
+        }
         // enable concurrent
         boolean concurrent = config.getBoolean("gauss.table.concurrent.enable", false);
 
@@ -98,6 +100,9 @@ public class GaussController extends AbstractGaussLifeCycle {
         int threadSize = 1; // 默认1，代表串行
         if (concurrent) {
             threadSize = config.getInt("gauss.table.concurrent.size", 5); // 并行执行的table数
+            if (threadSize <= 0) {
+                threadSize = 5;
+            }
         }
 
         tableController = new TableController(tableMetas.size(), threadSize);
@@ -105,11 +110,6 @@ public class GaussController extends AbstractGaussLifeCycle {
         int retryTimes = config.getInt("gauss.table.retry.times", 3);
         int retryInterval = config.getInt("gauss.table.retry.interval", 1000);
 
-        int noUpdateThresoldDefault = -1;
-        if (threadSize < tableMetas.size()) { // 如果是非一次性并发跑，默认为3次noUpdate
-            noUpdateThresoldDefault = 3;
-        }
-        int noUpdateThresold = config.getInt("gauss.extractor.noupdate.thresold", noUpdateThresoldDefault);
         boolean useExtractorExecutor = config.getBoolean("gauss.extractor.concurrent.global", false);
         boolean useApplierExecutor = config.getBoolean("gauss.applier.concurrent.global", false);
         if (useExtractorExecutor) {
@@ -141,7 +141,6 @@ public class GaussController extends AbstractGaussLifeCycle {
             instance.setRetryInterval(retryInterval);
             instance.setTargetDbType(targetDbType);
             instance.setProgressTracer(progressTracer);
-            instance.setNoUpdateThresold(noUpdateThresold);
             instance.setThreadSize(config.getInt("gauss.extractor.concurrent.size", 300));
             instance.setExecutor(extractorExecutor);
             instances.add(instance);
diff --git a/src/main/java/com/gauss/controller/GaussInstance.java b/src/main/java/com/gauss/controller/GaussInstance.java
index 1695588..3af8ffe 100644
--- a/src/main/java/com/gauss/controller/GaussInstance.java
+++ b/src/main/java/com/gauss/controller/GaussInstance.java
@@ -69,8 +69,6 @@ public class GaussInstance extends AbstractGaussLifeCycle {
 
     private int retryInterval;
 
-    private int noUpdateThresold;
-
     private int noUpdateTimes = 0;
 
     private boolean concurrent = true;
@@ -376,10 +374,6 @@ public class GaussInstance extends AbstractGaussLifeCycle {
         this.progressTracer = progressTracer;
     }
 
-    public void setNoUpdateThresold(int noUpdateThresold) {
-        this.noUpdateThresold = noUpdateThresold;
-    }
-
     public void setThreadSize(int threadSize) {
         this.threadSize = threadSize;
     }
diff --git a/src/main/java/com/gauss/extractor/db/DbOnceFullRecordExtractor.java b/src/main/java/com/gauss/extractor/db/DbOnceFullRecordExtractor.java
index d0d44ef..60a6fd6 100644
--- a/src/main/java/com/gauss/extractor/db/DbOnceFullRecordExtractor.java
+++ b/src/main/java/com/gauss/extractor/db/DbOnceFullRecordExtractor.java
@@ -123,6 +123,7 @@ public class DbOnceFullRecordExtractor extends AbstractRecordExtractor {
         }
 
         public void run() {
+            jdbcTemplate.execute("SET NAMES utf8;");
             jdbcTemplate.execute(new ConnectionCallback() {
                 public Object doInConnection(Connection conn) throws SQLException, DataAccessException {
                     Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
diff --git a/src/main/resources/gauss.properties b/src/main/resources/gauss.properties
index 4dd9041..bd590e9 100644
--- a/src/main/resources/gauss.properties
+++ b/src/main/resources/gauss.properties
@@ -30,10 +30,8 @@ gauss.table.retry.times=3
 gauss.table.retry.interval=1000
 gauss.table.query_dop=8
 # gauss extractor
-gauss.extractor.dump=false
 gauss.extractor.concurrent.global=false
 gauss.extractor.concurrent.size=30
-gauss.extractor.noupdate.thresold=0
 # gauss applier
 gauss.applier.concurrent.enable=true
 gauss.applier.concurrent.global=false
-- 
Gitee