CurrentTime in binlogevent is in nanoseconds, fixed

Signed-off-by: Rohit Nayak <[email protected]>
vitessio · Mar 23, 2021 · 2d356a6 · 2d356a6
1 parent 3dbae71
commit 2d356a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/go/vt/vtgate/vstream_manager.go b/go/vt/vtgate/vstream_manager.go
@@ -239,7 +239,7 @@ func (vs *vstream) computeSkew(streamID string, event *binlogdatapb.VEvent) bool
 	vs.skewMu.Lock()
 	defer vs.skewMu.Unlock()
 	// account for skew between this vtgate and the source mysql server
-	secondsInThePast := event.CurrentTime - event.Timestamp
+	secondsInThePast := event.CurrentTime/1e9 - event.Timestamp
 	vs.timestamps[streamID] = time.Now().Unix() - secondsInThePast
 
 	var minTs, maxTs int64

diff --git a/go/vt/vtgate/vstream_manager_test.go b/go/vt/vtgate/vstream_manager_test.go
@@ -56,13 +56,13 @@ func getVEvents(shard string, count, idx int64) []*binlogdatapb.VEvent {
 		vevents = append(vevents, &binlogdatapb.VEvent{
 			Type: binlogdatapb.VEventType_GTID, Gtid: fmt.Sprintf("gtid-%s-%d", shard, j),
 			Timestamp:   currentTime - j,
-			CurrentTime: currentTime,
+			CurrentTime: currentTime * 1e9,
 		})
 
 		vevents = append(vevents, &binlogdatapb.VEvent{
 			Type:        binlogdatapb.VEventType_COMMIT,
 			Timestamp:   currentTime - j,
-			CurrentTime: currentTime,
+			CurrentTime: currentTime * 1e9,
 		})
 	}
 	return vevents