sink(ticdc): remove usless ReplicaID field (#6197)

ref #5928
pingcap · Jul 6, 2022 · 13264dd · 13264dd
1 parent 3054bfa
commit 13264dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 43 deletions.
diff --git a/cdc/model/sink.go b/cdc/model/sink.go
@@ -259,7 +259,6 @@ type RowChangedEvent struct {
 
 	TableInfoVersion uint64 `json:"table-info-version,omitempty" msg:"table-info-version"`
 
-	ReplicaID    uint64    `json:"replica-id" msg:"replica-id"`
 	Columns      []*Column `json:"columns" msg:"-"`
 	PreColumns   []*Column `json:"pre-columns" msg:"-"`
 	IndexColumns [][]int   `json:"-" msg:"index-columns"`

diff --git a/cdc/model/sink_gen.go b/cdc/model/sink_gen.go
diff --git a/cdc/sink/mysql/txn_cache.go b/cdc/sink/mysql/txn_cache.go
@@ -37,10 +37,9 @@ func (t *txnsWithTheSameCommitTs) Append(row *model.RowChangedEvent) {
 	var txn *model.SingleTableTxn
 	if len(t.txns) == 0 || row.SplitTxn || t.txns[len(t.txns)-1].StartTs < row.StartTs {
 		txn = &model.SingleTableTxn{
-			StartTs:   row.StartTs,
-			CommitTs:  row.CommitTs,
-			Table:     row.Table,
-			ReplicaID: row.ReplicaID,
+			StartTs:  row.StartTs,
+			CommitTs: row.CommitTs,
+			Table:    row.Table,
 		}
 		t.txns = append(t.txns, txn)
 	} else if t.txns[len(t.txns)-1].StartTs == row.StartTs {

diff --git a/cdc/sinkv2/eventsink/event_appender.go b/cdc/sinkv2/eventsink/event_appender.go
@@ -59,10 +59,9 @@ func (t *TxnEventAppender) Append(
 		// This means no txn is in the buffer.
 		if len(buffer) == 0 {
 			txn := &model.SingleTableTxn{
-				StartTs:   row.StartTs,
-				CommitTs:  row.CommitTs,
-				Table:     row.Table,
-				ReplicaID: row.ReplicaID,
+				StartTs:  row.StartTs,
+				CommitTs: row.CommitTs,
+				Table:    row.Table,
 			}
 			txn.Append(row)
 			buffer = append(buffer, txn)
@@ -91,10 +90,9 @@ func (t *TxnEventAppender) Append(
 			}
 
 			buffer = append(buffer, &model.SingleTableTxn{
-				StartTs:   row.StartTs,
-				CommitTs:  row.CommitTs,
-				Table:     row.Table,
-				ReplicaID: row.ReplicaID,
+				StartTs:  row.StartTs,
+				CommitTs: row.CommitTs,
+				Table:    row.Table,
 			})
 		}