Cherry-pick 81356ab with conflicts

Author: vitess-bot[bot]

go/vt/vtctl/workflow/sequences.go

@@ -250,9 +250,27 @@ func (ts *trafficSwitcher) getCurrentSequenceValue(ctx context.Context, seq *seq
 	return currentVal, nil
 }
 
+<<<<<<< HEAD
 func (ts *trafficSwitcher) updateSequenceValue(ctx context.Context, seq *sequenceMetadata, currentMaxValue int64) error {
 	if err := seq.escapeValues(); err != nil {
 		return err
+=======
+func (ts *trafficSwitcher) updateSequenceValues(ctx context.Context, sequences []*sequenceMetadata, maxValues map[string]int64) error {
+	sequencesByShard := map[string][]*tabletmanagerdatapb.UpdateSequenceTablesRequest_SequenceMetadata{}
+	for _, seq := range sequences {
+		maxValue := maxValues[seq.backingTableName]
+		sequenceShard, ierr := ts.TopoServer().GetOnlyShard(ctx, seq.backingTableKeyspace)
+		if ierr != nil || sequenceShard == nil || sequenceShard.PrimaryAlias == nil {
+			return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "failed to get the primary tablet for keyspace %s: %v",
+				seq.backingTableKeyspace, ierr)
+		}
+		tabletAliasStr := topoproto.TabletAliasString(sequenceShard.PrimaryAlias)
+		sequencesByShard[tabletAliasStr] = append(sequencesByShard[tabletAliasStr], &tabletmanagerdatapb.UpdateSequenceTablesRequest_SequenceMetadata{
+			BackingTableName:   seq.backingTableName,
+			BackingTableDbName: seq.backingTableDBName,
+			MaxValue:           maxValue,
+		})
+>>>>>>> 81356abde1 (VReplication: Properly Handle Sequence Table Initialization For Empty Tables (#19226))
 	}
 	nextVal := currentMaxValue + 1
 	log.Infof("Updating sequence %s.%s to %d", seq.backingTableDBName, seq.backingTableName, nextVal)

go/vt/vtctl/workflow/sequences_test.go

@@ -89,16 +89,121 @@ func TestInitializeTargetSequences(t *testing.T) {
 		},
 	}
 
+<<<<<<< HEAD
 	env.tmc.expectVRQuery(200, "/select max.*", sqltypes.MakeTestResult(sqltypes.MakeTestFields("maxval", "int64"), "34"))
 	// Expect the insert query to be executed with 35 as a params, since we provide a maxID of 34 in the last query
 	env.tmc.expectVRQuery(100, "/insert into.*35.*", &sqltypes.Result{RowsAffected: 1})
+=======
+	type testCase struct {
+		name                  string
+		maxValueRequest       *getMaxValueForSequencesRequestResponse
+		updateSeqTableRequest *tabletmanagerdatapb.UpdateSequenceTablesRequest
+	}
 
-	err = sw.initializeTargetSequences(ctx, sequencesByBackingTable)
-	assert.NoError(t, err)
+	testCases := []testCase{
+		{
+			name: "initialize sequences",
+			maxValueRequest: &getMaxValueForSequencesRequestResponse{
+				req: &tabletmanagerdatapb.GetMaxValueForSequencesRequest{
+					Sequences: []*tabletmanagerdatapb.GetMaxValueForSequencesRequest_SequenceMetadata{
+						{
+							BackingTableName:        "my-seq1",
+							UsingColEscaped:         "`my-col`",
+							UsingTableNameEscaped:   fmt.Sprintf("`%s`", tableName),
+							UsingTableDbNameEscaped: "`vt_targetks`",
+						},
+						{
+							BackingTableName:        "my-seq2",
+							UsingColEscaped:         "`my-col-2`",
+							UsingTableNameEscaped:   fmt.Sprintf("`%s`", tableName2),
+							UsingTableDbNameEscaped: "`vt_targetks`",
+						},
+					},
+				},
+				res: &tabletmanagerdatapb.GetMaxValueForSequencesResponse{
+					MaxValuesBySequenceTable: map[string]int64{
+						"my-seq1": 34,
+						"my-seq2": 10,
+					},
+				},
+			},
+			updateSeqTableRequest: &tabletmanagerdatapb.UpdateSequenceTablesRequest{
+				Sequences: []*tabletmanagerdatapb.UpdateSequenceTablesRequest_SequenceMetadata{
+					{
+						BackingTableName:   "my-seq1",
+						BackingTableDbName: "vt_" + sourceKeyspaceName,
+						MaxValue:           34,
+					},
+					{
+						BackingTableName:   "my-seq2",
+						BackingTableDbName: "vt_" + sourceKeyspaceName,
+						MaxValue:           10,
+					},
+				},
+			},
+		},
+		{
+			name: "initialize sequences for empty tables",
+			maxValueRequest: &getMaxValueForSequencesRequestResponse{
+				req: &tabletmanagerdatapb.GetMaxValueForSequencesRequest{
+					Sequences: []*tabletmanagerdatapb.GetMaxValueForSequencesRequest_SequenceMetadata{
+						{
+							BackingTableName:        "my-seq1",
+							UsingColEscaped:         "`my-col`",
+							UsingTableNameEscaped:   fmt.Sprintf("`%s`", tableName),
+							UsingTableDbNameEscaped: "`vt_targetks`",
+						},
+						{
+							BackingTableName:        "my-seq2",
+							UsingColEscaped:         "`my-col-2`",
+							UsingTableNameEscaped:   fmt.Sprintf("`%s`", tableName2),
+							UsingTableDbNameEscaped: "`vt_targetks`",
+						},
+					},
+				},
+				res: &tabletmanagerdatapb.GetMaxValueForSequencesResponse{
+					MaxValuesBySequenceTable: map[string]int64{},
+				},
+			},
+			updateSeqTableRequest: &tabletmanagerdatapb.UpdateSequenceTablesRequest{
+				Sequences: []*tabletmanagerdatapb.UpdateSequenceTablesRequest_SequenceMetadata{
+					{
+						BackingTableName:   "my-seq1",
+						BackingTableDbName: "vt_" + sourceKeyspaceName,
+						MaxValue:           0,
+					},
+					{
+						BackingTableName:   "my-seq2",
+						BackingTableDbName: "vt_" + sourceKeyspaceName,
+						MaxValue:           0,
+					},
+				},
+			},
+		},
+	}
+>>>>>>> 81356abde1 (VReplication: Properly Handle Sequence Table Initialization For Empty Tables (#19226))
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			require.NotNil(t, tc.maxValueRequest)
+			require.NotNil(t, tc.updateSeqTableRequest)
+			env.tmc.expectGetMaxValueForSequencesRequest(200, tc.maxValueRequest)
+			env.tmc.expectUpdateSequenceTablesRequest(100, tc.updateSeqTableRequest)
 
+<<<<<<< HEAD
 	// Expect the queries to be cleared
 	assert.Emptyf(t, env.tmc.vrQueries[100], "expected no queries to be executed, found: %q", env.tmc.vrQueries[100])
 	assert.Empty(t, env.tmc.vrQueries[200], "expected no queries to be executed, found: %q", env.tmc.vrQueries[200])
+=======
+			err = sw.initializeTargetSequences(ctx, sequencesByBackingTable)
+			assert.NoError(t, err)
+
+			// Expect the requests to be cleared.
+			assert.Emptyf(t, env.tmc.updateSequenceTablesRequests, "expected no remaining UpdateSequenceTables requests")
+			assert.Emptyf(t, env.tmc.getMaxValueForSequencesRequests, "expected no remaining GetMaxValueForSequences requests")
+		})
+	}
+>>>>>>> 81356abde1 (VReplication: Properly Handle Sequence Table Initialization For Empty Tables (#19226))
 }
 
 func TestGetTargetSequenceMetadata(t *testing.T) {