lightning: mask pre-deduplication for local backend (#44702)

ref #41629
pingcap · Jun 15, 2023 · b4db489 · b4db489
1 parent beccd05
commit b4db489
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/br/pkg/lightning/config/config.go b/br/pkg/lightning/config/config.go
@@ -1203,6 +1203,8 @@ func (cfg *Config) AdjustCommon() (bool, error) {
 		}
 		cfg.TikvImporter.DuplicateResolution = DupeResAlgNone
 	case BackendLocal:
+		// force turn off pre-dedup for local backend
+		cfg.TikvImporter.OnDuplicate = ""
 		if cfg.TikvImporter.RegionSplitBatchSize <= 0 {
 			return mustHaveInternalConnections, common.ErrInvalidConfig.GenWithStack("`tikv-importer.region-split-batch-size` got %d, should be larger than 0", cfg.TikvImporter.RegionSplitBatchSize)
 		}

diff --git a/br/pkg/lightning/config/config_test.go b/br/pkg/lightning/config/config_test.go
@@ -1006,18 +1006,18 @@ func TestAdjustOnDuplicate(t *testing.T) {
 	cfg.TikvImporter.Backend = config.BackendLocal
 	cfg.TikvImporter.OnDuplicate = config.ReplaceOnDup
 	require.NoError(t, cfg.Adjust(ctx))
-	require.Equal(t, config.ReplaceOnDup, cfg.TikvImporter.OnDuplicate)
+	require.Equal(t, "", cfg.TikvImporter.OnDuplicate)
 
 	cfg.TikvImporter.Backend = config.BackendLocal
 	cfg.TikvImporter.OnDuplicate = config.ReplaceOnDup
 	cfg.TikvImporter.IncrementalImport = true
-	require.ErrorContains(t, cfg.Adjust(ctx), "tikv-importer.on-duplicate cannot be used with tikv-importer.incremental-import")
+	require.NoError(t, cfg.Adjust(ctx))
 
 	cfg.TikvImporter.Backend = config.BackendLocal
 	cfg.TikvImporter.OnDuplicate = config.ReplaceOnDup
 	cfg.TikvImporter.IncrementalImport = false
 	cfg.TikvImporter.DuplicateResolution = config.DupeResAlgRemove
-	require.ErrorContains(t, cfg.Adjust(ctx), "tikv-importer.on-duplicate cannot be used with tikv-importer.duplicate-resolution")
+	require.NoError(t, cfg.Adjust(ctx))
 }
 
 func TestAdjustMaxErrorRecords(t *testing.T) {