Fix conflicts

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
vitessio · Feb 15, 2025 · a0b8631 · a0b8631
1 parent 2116cf7
commit a0b8631
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/go/test/endtoend/vreplication/fk_test.go b/go/test/endtoend/vreplication/fk_test.go
@@ -130,20 +130,6 @@ func TestFKWorkflow(t *testing.T) {
 		<-ch
 	}
 	mt.Complete()
-<<<<<<< HEAD
-=======
-	vtgateConn, closeConn := getVTGateConn()
-	defer closeConn()
-
-	if withLoad {
-		t11Count := getRowCount(t, vtgateConn, "t11")
-		t12Count := getRowCount(t, vtgateConn, "t12")
-		require.Greater(t, t11Count, 1)
-		require.Greater(t, t12Count, 1)
-		require.Equal(t, t11Count, t12Count)
-	}
-
->>>>>>> 420342fddb (VReplication Atomic Copy Workflows: fix bugs around concurrent inserts (#17772))
 }
 
 func insertInitialFKData(t *testing.T) {

diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
@@ -85,17 +85,8 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 	rowsCopiedTicker := time.NewTicker(rowsCopiedUpdateInterval)
 	defer rowsCopiedTicker.Stop()
 
-<<<<<<< HEAD
 	parallelism := getInsertParallelism()
-	// For now do not support concurrent inserts for atomic copies.
-	if parallelism > 1 {
-		parallelism = 1
-		log.Infof("Disabling concurrent inserts for atomic copies")
-	}
-=======
-	parallelism := int(math.Max(1, float64(vc.vr.workflowConfig.ParallelInsertWorkers)))
 
->>>>>>> 420342fddb (VReplication Atomic Copy Workflows: fix bugs around concurrent inserts (#17772))
 	copyWorkerFactory := vc.newCopyWorkerFactory(parallelism)
 	var copyWorkQueue *vcopierCopyWorkQueue