Changeset 242 in code

Timestamp:

Apr 7, 2020, 12:45:08 PM (5 years ago)

Author:

contact

Message:

Make Ring.NewConsumer seq argument mandatory

There's no point in supporting a nil argument anymore.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• ring.go (modified) (2 diffs)

trunk/downstream.go

@@ -662 +662 @@
 
         dc.forEachNetwork(func(net *network) {
-                var seqPtr *uint64
-                if sendHistory {
-                        seq, ok := net.history[dc.clientName]
-                        if ok {
-                                seqPtr = &seq
-                        }
-                }
-
-                consumer := net.ring.NewConsumer(seqPtr)
+                seq, ok := net.history[dc.clientName]
+                if !sendHistory || !ok {
+                        return
+                }
+
+                consumer := net.ring.NewConsumer(seq)
 
                 // TODO: this means all history is lost when trying to send it while the

trunk/ring.go

@@ -32 +32 @@
 }
 
+// Cur returns the current history sequence number.
 func (r *Ring) Cur() uint64 {
         return r.cur
@@ -38 +39 @@
 // NewConsumer creates a new ring buffer consumer.
 //
-// If seq is nil, the consumer will get messages starting from the last
-// producer message. If seq is non-nil, the consumer will get messages starting
-// from the specified history sequence number (see RingConsumer.Close).
-//
-// The consumer can only be used from a single goroutine.
-func (r *Ring) NewConsumer(seq *uint64) *RingConsumer {
-        consumer := &RingConsumer{ring: r}
-
-        if seq != nil {
-                consumer.cur = *seq
-        } else {
-                consumer.cur = r.cur
-        }
+// The consumer will get messages starting from the specified history sequence
+// number (see Ring.Cur).
+func (r *Ring) NewConsumer(seq uint64) *RingConsumer {
+        consumer := &RingConsumer{ring: r, cur: seq}
         r.consumers = append(r.consumers, consumer)
-
         return consumer
 }