Move some code

Author: huangjunwen

replication/event.go

@@ -383,13 +383,20 @@ func (e *GTIDEvent) Decode(data []byte) error {
 }
 
 func (e *GTIDEvent) Dump(w io.Writer) {
+fmtTime := func(t time.Time) string {
+if t.IsZero() {
+return "N/A"
+}
+return t.Format(time.RFC3339Nano)
+}
+
 fmt.Fprintf(w, "Commit flag: %d\n", e.CommitFlag)
 u, _ := uuid.FromBytes(e.SID)
 fmt.Fprintf(w, "GTID_NEXT: %s:%d\n", u.String(), e.GNO)
 fmt.Fprintf(w, "LAST_COMMITTED: %d\n", e.LastCommitted)
 fmt.Fprintf(w, "SEQUENCE_NUMBER: %d\n", e.SequenceNumber)
-fmt.Fprintf(w, "Immediate commmit timestamp: %d (%s)\n", e.ImmediateCommitTimestamp, e.fmtTime(e.ImmediateCommitTime()))
-fmt.Fprintf(w, "Orignal commmit timestamp: %d (%s)\n", e.OriginalCommitTimestamp, e.fmtTime(e.OriginalCommitTime()))
+fmt.Fprintf(w, "Immediate commmit timestamp: %d (%s)\n", e.ImmediateCommitTimestamp, fmtTime(e.ImmediateCommitTime()))
+fmt.Fprintf(w, "Orignal commmit timestamp: %d (%s)\n", e.OriginalCommitTimestamp, fmtTime(e.OriginalCommitTime()))
 fmt.Fprintf(w, "Transaction length: %d\n", e.TransactionLength)
 fmt.Fprintf(w, "Immediate server version: %d\n", e.ImmediateServerVersion)
 fmt.Fprintf(w, "Orignal server version: %d\n", e.OriginalServerVersion)
@@ -399,27 +406,13 @@ func (e *GTIDEvent) Dump(w io.Writer) {
 // ImmediateCommitTime returns the commit time of this trx on the immediate server
 // or zero time if not available.
 func (e *GTIDEvent) ImmediateCommitTime() time.Time {
-return e.microsecTimestamp2Time(e.ImmediateCommitTimestamp)
+return microSecTimestampToTime(e.ImmediateCommitTimestamp)
 }
 
 // OriginalCommitTime returns the commit time of this trx on the original server
 // or zero time if not available.
 func (e *GTIDEvent) OriginalCommitTime() time.Time {
-return e.microsecTimestamp2Time(e.OriginalCommitTimestamp)
-}
-
-func (e *GTIDEvent) microsecTimestamp2Time(ts uint64) time.Time {
-if ts == 0 {
-return time.Time{}
-}
-return time.Unix(int64(ts/1000000), int64(ts%1000000)*1000)
-}
-
-func (e *GTIDEvent) fmtTime(t time.Time) string {
-if t.IsZero() {
-return "N/A"
-}
-return t.Format(time.RFC3339Nano)
+return microSecTimestampToTime(e.OriginalCommitTimestamp)
 }
 
 type BeginLoadQueryEvent struct {

replication/time.go

@@ -50,6 +50,13 @@ func formatBeforeUnixZeroTime(year, month, day, hour, minute, second, frac, dec
 return s[0 : len(s)-(6-dec)]
 }
 
+func microSecTimestampToTime(ts uint64) time.Time {
+if ts == 0 {
+return time.Time{}
+}
+return time.Unix(int64(ts/1000000), int64(ts%1000000)*1000)
+}
+
 func init() {
 fracTimeFormat = make([]string, 7)
 fracTimeFormat[0] = "2006-01-02 15:04:05"