resolve conflicts

pingcap · Jan 28, 2023 · 06392da · 06392da
1 parent c7e0e4a
commit 06392da
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/br/pkg/lightning/restore/table_restore.go b/br/pkg/lightning/restore/table_restore.go
@@ -766,22 +766,14 @@ func (tr *TableRestore) postProcess(
 			if e != nil {
 				tr.logger.Error("collect remote duplicate keys failed", log.ShortError(e))
 				return false, e
-			} else {
-				hasDupe = hasDupe || hasRemoteDupe
 			}
-<<<<<<< HEAD
-			if err = rc.backend.ResolveDuplicateRows(ctx, tr.encTable, tr.tableName, rc.cfg.TikvImporter.DuplicateResolution); err != nil {
-				tr.logger.Error("resolve remote duplicate keys failed", log.ShortError(err))
-				return false, err
-=======
 			hasDupe = hasDupe || hasRemoteDupe
 
 			if hasDupe {
 				if err = rc.backend.ResolveDuplicateRows(ctx, tr.encTable, tr.tableName, rc.cfg.TikvImporter.DuplicateResolution); err != nil {
 					tr.logger.Error("resolve remote duplicate keys failed", log.ShortError(err))
 					return false, err
 				}
->>>>>>> 06e2b29551 (lightning: check hasDupe and tableID when resolve duplicate rows (#40696))
 			}
 		}