Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions uuid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -928,3 +928,25 @@ func TestVersion7MonotonicityStrict(t *testing.T) {
u1 = u2
}
}

func unixMilli(msec int64) time.Time {
return time.Unix(msec/1e3, (msec%1e3)*1e6)
}

func TestVersion7MaxTime(t *testing.T) {
timeNow = func() time.Time {
return unixMilli((1 << 48) - 1) // max time for uuid v7
}
defer func() {
timeNow = time.Now
}()

SetRand(fakeRand{})
defer SetRand(nil)

u := Must(NewV7())
want := "ffffffff-ffff-7000-8888-888888888888"
if u.String() != want {
t.Errorf("time overflow: got %q, want %q", u.String(), want)
}
}
7 changes: 4 additions & 3 deletions version7.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ func getV7Time() (milli, seq int64) {
timeMu.Lock()
defer timeMu.Unlock()

nano := timeNow().UnixNano()
milli = nano / nanoPerMilli
t := timeNow()
nano := t.Nanosecond()
milli = t.Unix()*1e3 + int64(nano/nanoPerMilli)
// Sequence number is between 0 and 3906 (nanoPerMilli>>8)
seq = (nano - milli*nanoPerMilli) >> 8
seq = int64(nano%nanoPerMilli) >> 8
now := milli<<12 + seq
if now <= lastV7time {
now = lastV7time + 1
Expand Down