Update to avoid breaking the existing API

This commit is contained in:
Nishaad Ajani 2019-04-11 11:17:23 +08:00
parent a3f3d0ff71
commit 1c6d654675

View File

@ -12,11 +12,9 @@ import (
) )
var ( var (
curTime = time.Now() // Epoch is set to the twitter snowflake epoch of Nov 04 2010 01:42:54 UTC in milliseconds
// Epoch is set to the twitter snowflake epoch of Nov 04 2010 01:42:54 UTC
// You may customize this to set a different epoch for your application. // You may customize this to set a different epoch for your application.
// Note: add time.Duration to time.Now() to make sure we use the monotonic clock if available. Epoch int64 = 1288834974657
Epoch = curTime.Add(time.Date(2010, time.November, 4, 1, 42, 54, 0, time.UTC).Sub(curTime))
// NodeBits holds the number of bits to use for Node // NodeBits holds the number of bits to use for Node
// Remember, you have a total 22 bits to share between Node/Step // Remember, you have a total 22 bits to share between Node/Step
@ -79,10 +77,11 @@ var ErrInvalidBase32 = errors.New("invalid base32")
// A Node struct holds the basic information needed for a snowflake generator // A Node struct holds the basic information needed for a snowflake generator
// node // node
type Node struct { type Node struct {
mu sync.Mutex mu sync.Mutex
time time.Duration epoch time.Time
node int64 time time.Duration
step int64 node int64
step int64
nodeMax int64 nodeMax int64
nodeMask int64 nodeMask int64
@ -121,6 +120,10 @@ func NewNode(node int64) (*Node, error) {
return nil, errors.New("Node number must be between 0 and " + strconv.FormatInt(n.nodeMax, 10)) return nil, errors.New("Node number must be between 0 and " + strconv.FormatInt(n.nodeMax, 10))
} }
var curTime = time.Now()
// add time.Duration to curTime to make sure we use the monotonic clock if available
n.epoch = curTime.Add(time.Unix(Epoch/1000, (Epoch%1000)*1000000).Sub(curTime))
return &n, nil return &n, nil
} }
@ -129,14 +132,14 @@ func (n *Node) Generate() ID {
n.mu.Lock() n.mu.Lock()
now := time.Since(Epoch) now := time.Since(n.epoch)
if now-n.time < time.Millisecond { if now-n.time < time.Millisecond {
n.step = (n.step + 1) & n.stepMask n.step = (n.step + 1) & n.stepMask
if n.step == 0 { if n.step == 0 {
for now-n.time < time.Millisecond { for now-n.time < time.Millisecond {
now = time.Since(Epoch) now = time.Since(n.epoch)
} }
} }
} else { } else {
@ -269,10 +272,10 @@ func (f ID) IntBytes() [8]byte {
return b return b
} }
// Time returns an int64 unix timestamp in miliseconds of the snowflake ID time // Time returns an int64 unix timestamp in milliseconds of the snowflake ID time
// DEPRECATED: the below function will be removed in a future release. // DEPRECATED: the below function will be removed in a future release.
func (f ID) Time() int64 { func (f ID) Time() int64 {
return (int64(f) >> timeShift) + (Epoch.UnixNano() / 1000000) return (int64(f) >> timeShift) + Epoch
} }
// Node returns an int64 of the snowflake ID node number // Node returns an int64 of the snowflake ID node number