Merge branch 'parallel-vplayer' of github.com:planetscale/vitess into…

… parallel-vplayer

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>

config/mycnf/mysql8026.cnf

@@ -40,3 +40,9 @@ super-read-only
 # Replication parameters to ensure reparents are fast.
 replica_net_timeout = 8
 
+
+binlog_transaction_dependency_tracking=WRITESET
+slave_preserve_commit_order=ON
+slave_parallel_type=LOGICAL_CLOCK
+transaction_write_set_extraction=XXHASH64
+

go/vt/vttablet/tabletserver/vstreamer/vstreamer.go

@@ -84,7 +84,7 @@ type vstreamer struct {
 	format         mysql.BinlogFormat
 	pos            replication.Position
 	stopPos        string
-	lastCommitted  int64
+	commitParent   int64
 	sequenceNumber int64
 	eventGTID      replication.GTID
 
@@ -470,21 +470,22 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 		})
 		vs.eventGTID = nil
 	case ev.IsGTID():
-		gtid, hasBegin, lastCommitted, sequenceNumber, err := ev.GTID(vs.format)
+		gtid, hasBegin, commitParent, sequenceNumber, err := ev.GTID(vs.format)
 		if err != nil {
 			return nil, fmt.Errorf("can't get GTID from binlog event: %v, event data: %#v", err, ev)
 		}
 		if hasBegin {
 			vevents = append(vevents, &binlogdatapb.VEvent{
 				Type:           binlogdatapb.VEventType_BEGIN,
-				LastCommitted:  lastCommitted,
+				CommitParent:   commitParent,
 				SequenceNumber: sequenceNumber,
 			})
 		}
 		vs.pos = replication.AppendGTID(vs.pos, gtid)
-		vs.lastCommitted = lastCommitted
+		vs.commitParent = commitParent
 		vs.sequenceNumber = sequenceNumber
 		vs.eventGTID = gtid
+		log.Errorf("DEBUG: GTID: %v, seq_no: %d, commit_parent: %d", gtid, sequenceNumber, commitParent)
 	case ev.IsXID():
 		vevents = append(vevents, &binlogdatapb.VEvent{
 			Type: binlogdatapb.VEventType_GTID,
@@ -725,7 +726,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent, bufferAndTransmit func(vev
 		vevent.Timestamp = int64(ev.Timestamp())
 		vevent.CurrentTime = time.Now().UnixNano()
 		vevent.SequenceNumber = vs.sequenceNumber
-		vevent.LastCommitted = vs.lastCommitted
+		vevent.CommitParent = vs.commitParent
 		if vs.eventGTID != nil {
 			vevent.EventGtid = vs.eventGTID.String()
 		}

proto/binlogdata.proto

@@ -480,9 +480,9 @@ message VEvent {
   bool throttled = 24;
   // ThrottledReason is a human readable string that explains why the stream is throttled
   string throttled_reason = 25;
-  // For GTID events, the sequence number of the most recent transaction this event depends on / conflicts with.
-  int64 last_committed = 26;
-  // For GTID events, the sequence number of this transaction.
+  // For GTID events, the sequence number of the most recent transaction this event depends on.
+  int64 commit_parent = 26;
+  // For GTID events, the sequence number (logical clock) value of this transaction.
   int64 sequence_number = 27;
   // EventGTID is decorated by VPlayer. It is the specific GTID (not the GTID set) for this event.
   string event_gtid = 28;