cleanup

Author: alicebob

integration/stream_test.go

@@ -25,7 +25,7 @@ func TestStream(t *testing.T) {
 				"18446744073709551000-0",
 				"name", "Earth",
 			)
-			c.DoLoosely("XADD",
+			c.Do("XADD",
 				"planets",
 				"18446744073709551000-*",
 				"name", "Pluto",

stream.go

@@ -57,9 +57,7 @@ func newStreamKey() *streamKey {
 }
 
 // generateID doesn't lock the mutex
-func (s *streamKey) generateID(now time.Time) string {
-	ts := uint64(now.UnixMilli())
-
+func (s *streamKey) generateID(ts uint64) string {
 	next := fmt.Sprintf("%d-%d", ts, 0)
 	if s.lastAllocatedID != "" && streamCmp(s.lastAllocatedID, next) >= 0 {
 		last, _ := parseStreamID(s.lastAllocatedID)
@@ -238,13 +236,13 @@ func (s *streamKey) add(entryID string, values []string, now time.Time) (string,
 
 	switch {
 	case entryID == "" || entryID == "*":
-		entryID = s.generateID(now)
+		entryID = s.generateID(uint64(now.UnixMilli()))
 	default:
 		// "<timestamp>-*"
 		parts := strings.Split(entryID, "-")
 		if len(parts) == 2 && parts[1] == "*" {
-			if ts, err := strconv.Atoi(parts[0]); err == nil {
-				entryID = s.generateID(time.UnixMilli(int64(ts)))
+			if ts, err := strconv.ParseUint(parts[0], 10, 64); err == nil {
+				entryID = s.generateID(uint64(ts))
 			}
 		}
 	}