From fd9fe7c1e2416a4bfbde83948ee886cfa67bc9fc Mon Sep 17 00:00:00 2001
From: liaojianjun <36503113+Leavrth@users.noreply.github.com>
Date: Fri, 5 Nov 2021 17:11:04 +0800
Subject: [PATCH] tests: fix sync_diff configs for CI (#380)

---
 .../all_generate_column/conf/diff_config.toml | 31 +++++---------
 tests/e2e/conf/diff_config.toml               | 31 +++++---------
 tests/e2e_csv/conf/diff_config.toml           | 40 +++++--------------
 .../conf/diff_config.toml                     | 31 +++++---------
 tests/rows/conf/diff_config.toml              | 31 +++++---------
 tests/rows_extreme_int/conf/diff_config.toml  | 24 +++++------
 6 files changed, 61 insertions(+), 127 deletions(-)

diff --git a/tests/all_generate_column/conf/diff_config.toml b/tests/all_generate_column/conf/diff_config.toml
index 79aaecd4..a946e263 100644
--- a/tests/all_generate_column/conf/diff_config.toml
+++ b/tests/all_generate_column/conf/diff_config.toml
@@ -1,39 +1,28 @@
 # diff Configuration.
 
-log-level = "info"
-
-chunk-size = 1000
-
 check-thread-count = 4
 
-sample-percent = 100
+export-fix-sql = true
 
-use-checksum = true
+check-struct-only = false
 
-fix-sql-file = "fix.sql"
+[task]
+    output-dir = "./output"
 
-# tables need to check.
-[[check-tables]]
-schema = "all_generate_column"
-tables = ["~t.*"]
+    source-instances = ["mysql1"]
 
-[[table-config]]
-schema = "all_generate_column"
-table = "t"
+    target-instance = "tidb0"
 
-[[table-config.source-tables]]
-instance-id = "source-1"
-schema = "all_generate_column"
-table  = "t"
+    target-check-tables = ["all_generate_column.t"]
 
-[[source-db]]
+[data-sources]
+[data-sources.mysql1]
 host = "127.0.0.1"
 port = 3306
 user = "root"
 password = ""
-instance-id = "source-1"
 
-[target-db]
+[data-sources.tidb0]
 host = "127.0.0.1"
 port = 4000
 user = "root"
diff --git a/tests/e2e/conf/diff_config.toml b/tests/e2e/conf/diff_config.toml
index f5631a52..63faff05 100644
--- a/tests/e2e/conf/diff_config.toml
+++ b/tests/e2e/conf/diff_config.toml
@@ -1,39 +1,28 @@
 # diff Configuration.
 
-log-level = "info"
-
-chunk-size = 1000
-
 check-thread-count = 4
 
-sample-percent = 100
+export-fix-sql = true
 
-use-checksum = true
+check-struct-only = false
 
-fix-sql-file = "fix.sql"
+[task]
+    output-dir = "./output"
 
-# tables need to check.
-[[check-tables]]
-schema = "e2e"
-tables = ["~t.*"]
+    source-instances = ["mysql1"]
 
-[[table-config]]
-schema = "e2e"
-table = "t"
+    target-instance = "tidb0"
 
-[[table-config.source-tables]]
-instance-id = "source-1"
-schema = "e2e"
-table  = "t"
+    target-check-tables = ["e2e.t"]
 
-[[source-db]]
+[data-sources]
+[data-sources.mysql1]
 host = "127.0.0.1"
 port = 3306
 user = "root"
 password = ""
-instance-id = "source-1"
 
-[target-db]
+[data-sources.tidb0]
 host = "127.0.0.1"
 port = 4000
 user = "root"
diff --git a/tests/e2e_csv/conf/diff_config.toml b/tests/e2e_csv/conf/diff_config.toml
index f719bd85..911a102d 100644
--- a/tests/e2e_csv/conf/diff_config.toml
+++ b/tests/e2e_csv/conf/diff_config.toml
@@ -1,48 +1,28 @@
 # diff Configuration.
 
-log-level = "info"
-
-chunk-size = 1000
-
 check-thread-count = 4
 
-sample-percent = 100
-
-use-checksum = true
-
-fix-sql-file = "fix.sql"
+export-fix-sql = true
 
-# tables need to check.
-[[check-tables]]
-schema = "e2e_csv"
-tables = ["escape", "t"]
+check-struct-only = false
 
-[[table-config]]
-schema = "e2e_csv"
-table = "t"
+[task]
+    output-dir = "./output"
 
-[[table-config.source-tables]]
-instance-id = "source-1"
-schema = "e2e_csv"
-table  = "t"
+    source-instances = ["mysql1"]
 
-[[table-config]]
-schema = "e2e_csv"
-table = "escape"
+    target-instance = "tidb0"
 
-[[table-config.source-tables]]
-instance-id = "source-1"
-schema = "e2e_csv"
-table  = "escape"
+    target-check-tables = ["e2e_csv.escape", "e2e_csv.t"]
 
-[[source-db]]
+[data-sources]
+[data-sources.mysql1]
 host = "127.0.0.1"
 port = 3306
 user = "root"
 password = ""
-instance-id = "source-1"
 
-[target-db]
+[data-sources.tidb0]
 host = "127.0.0.1"
 port = 4000
 user = "root"
diff --git a/tests/ignore_generate_column/conf/diff_config.toml b/tests/ignore_generate_column/conf/diff_config.toml
index 99c1a986..8b4dc38e 100644
--- a/tests/ignore_generate_column/conf/diff_config.toml
+++ b/tests/ignore_generate_column/conf/diff_config.toml
@@ -1,39 +1,28 @@
 # diff Configuration.
 
-log-level = "info"
-
-chunk-size = 1000
-
 check-thread-count = 4
 
-sample-percent = 100
+export-fix-sql = true
 
-use-checksum = true
+check-struct-only = false
 
-fix-sql-file = "fix.sql"
+[task]
+    output-dir = "./output"
 
-# tables need to check.
-[[check-tables]]
-schema = "ignore_generate"
-tables = ["~t.*"]
+    source-instances = ["mysql1"]
 
-[[table-config]]
-schema = "ignore_generate"
-table = "t"
+    target-instance = "tidb0"
 
-[[table-config.source-tables]]
-instance-id = "source-1"
-schema = "ignore_generate"
-table  = "t"
+    target-check-tables = ["ignore_generate.t"]
 
-[[source-db]]
+[data-sources]
+[data-sources.mysql1]
 host = "127.0.0.1"
 port = 3306
 user = "root"
 password = ""
-instance-id = "source-1"
 
-[target-db]
+[data-sources.tidb0]
 host = "127.0.0.1"
 port = 4000
 user = "root"
diff --git a/tests/rows/conf/diff_config.toml b/tests/rows/conf/diff_config.toml
index 0d80f1ee..4d835c2f 100644
--- a/tests/rows/conf/diff_config.toml
+++ b/tests/rows/conf/diff_config.toml
@@ -1,39 +1,28 @@
 # diff Configuration.
 
-log-level = "info"
-
-chunk-size = 1000
-
 check-thread-count = 4
 
-sample-percent = 100
+export-fix-sql = true
 
-use-checksum = true
+check-struct-only = false
 
-fix-sql-file = "fix.sql"
+[task]
+    output-dir = "./output"
 
-# tables need to check.
-[[check-tables]]
-schema = "rows"
-tables = ["~t.*"]
+    source-instances = ["mysql1"]
 
-[[table-config]]
-schema = "rows"
-table = "t"
+    target-instance = "tidb0"
 
-[[table-config.source-tables]]
-instance-id = "source-1"
-schema = "rows"
-table  = "t"
+    target-check-tables = ["rows.t"]
 
-[[source-db]]
+[data-sources]
+[data-sources.mysql1]
 host = "127.0.0.1"
 port = 3306
 user = "root"
 password = ""
-instance-id = "source-1"
 
-[target-db]
+[data-sources.tidb0]
 host = "127.0.0.1"
 port = 4000
 user = "root"
diff --git a/tests/rows_extreme_int/conf/diff_config.toml b/tests/rows_extreme_int/conf/diff_config.toml
index 02f18541..1c9624ff 100644
--- a/tests/rows_extreme_int/conf/diff_config.toml
+++ b/tests/rows_extreme_int/conf/diff_config.toml
@@ -1,30 +1,28 @@
 # diff Configuration.
 
-log-level = "info"
+check-thread-count = 4
 
-chunk-size = 1000
+export-fix-sql = true
 
-check-thread-count = 4
+check-struct-only = false
 
-sample-percent = 100
+[task]
+    output-dir = "./output"
 
-use-checksum = true
+    source-instances = ["mysql1"]
 
-fix-sql-file = "fix.sql"
+    target-instance = "tidb0"
 
-# tables need to check.
-[[check-tables]]
-schema = "rei"
-tables = ["~t.*"]
+    target-check-tables = ["rei.t*"]
 
-[[source-db]]
+[data-sources]
+[data-sources.mysql1]
 host = "127.0.0.1"
 port = 3306
 user = "root"
 password = ""
-instance-id = "source-1"
 
-[target-db]
+[data-sources.tidb0]
 host = "127.0.0.1"
 port = 4000
 user = "root"