fix test

Signed-off-by: yisaer <disxiaofei@163.com> fix test Signed-off-by: yisaer <disxiaofei@163.com>
pingcap · May 21, 2021 · 8e32482 · 8e32482
1 parent 7f7643f
commit 8e32482
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/sessionctx/variable/varsutil.go b/sessionctx/variable/varsutil.go
@@ -26,6 +26,7 @@ import (
 	"github.com/pingcap/parser/charset"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/tidb/config"
+	"github.com/pingcap/tidb/store/tikv/oracle"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/collate"
 	"github.com/pingcap/tidb/util/timeutil"
@@ -461,7 +462,7 @@ func setSnapshotTS(s *SessionVars, sVal string) error {
 	}
 
 	t1, err := t.GoTime(s.TimeZone)
-	s.SnapshotTS = GoTimeToTS(t1)
+	s.SnapshotTS = oracle.GoTimeToTS(t1)
 	return err
 }
 
@@ -478,14 +479,13 @@ func setTxnReadTS(s *SessionVars, sVal string) error {
 	if err != nil {
 		return err
 	}
-	s.TxnReadTS = GoTimeToTS(t1)
+	s.TxnReadTS = oracle.GoTimeToTS(t1)
 	return err
 }
 
 // GoTimeToTS converts a Go time to uint64 timestamp.
 func GoTimeToTS(t time.Time) uint64 {
-	ts := (t.UnixNano() / int64(time.Millisecond)) << epochShiftBits
-	return uint64(ts)
+	return oracle.GoTimeToTS(t)
 }
 
 // serverGlobalVariable is used to handle variables that acts in server and global scope.