fix the default value of duplicate-resolution (pingcap#6810)

Frank945946 · Nov 15, 2021 · a95004f · a95004f
1 parent 9d011e0
commit a95004f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tidb-lightning/tidb-lightning-configuration.md b/tidb-lightning/tidb-lightning-configuration.md
@@ -124,7 +124,7 @@ addr = "172.16.31.10:8287"
 #    inconsistent data in the target TiDB.
 #  - remove: records all duplicate records like the 'record' algorithm and remove all duplicate records to ensure a consistent
 #    state in the target TiDB.
-# duplicate-resolution = 'record'
+# duplicate-resolution = 'none'
 # The number of KV pairs sent in one request in the "local" backend.
 # send-kv-pairs = 32768
 # The directory of local KV sorting in the "local" backend. If the disk

diff --git a/tidb-lightning/tidb-lightning-error-resolution.md b/tidb-lightning/tidb-lightning-error-resolution.md
@@ -47,7 +47,7 @@ Unique/Primary key conflict in Local backend is handled separately, explained in
 
 ```toml
 [tikv-importer]
-duplicate-resolution = 'record'
+duplicate-resolution = 'none'
 ```
 
 Local backend imports data by first converting them to KV pairs, and ingest them into TiKV in batches. Unlike the TiDB backend, duplicate rows are not detected until the end of task. Therefore, duplicate errors in local backend is not controlled by `max-error`, but rather a separate configuration `duplicate-resolution`.