tests: fix sync_diff configs for CI (#380)

pingcap · Nov 5, 2021 · fd9fe7c · fd9fe7c
1 parent 012e129
commit fd9fe7c
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 127 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"