Merge pull request #551 from ripienaar/consumer_find

Remove several incorrect invert matches in consumer find
nats-io · Jul 30, 2024 · 363a303 · 363a303
2 parents 7412cda + 8c11535
commit 363a303
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/consumer_query.go b/consumer_query.go
@@ -220,10 +220,6 @@ func (q *consumerQuery) matchDelivery(consumers []*Consumer) ([]*Consumer, error
 	return q.cbMatcher(consumers, q.lastDeliveryLimit > 0, func(consumer *Consumer) bool {
 		nfo, _ := consumer.LatestState()
 
-		if nfo.Delivered.Last == nil && q.invert {
-			return true
-		}
-
 		return nfo.Delivered.Last != nil && (!q.invert && time.Since(*nfo.Delivered.Last) < q.lastDeliveryLimit) || (q.invert && time.Since(nfo.Created) > q.ageLimit)
 	})
 }
@@ -232,10 +228,6 @@ func (q *consumerQuery) matchAge(consumers []*Consumer) ([]*Consumer, error) {
 	return q.cbMatcher(consumers, q.ageLimit > 0, func(consumer *Consumer) bool {
 		nfo, _ := consumer.LatestState()
 
-		if nfo.Created.IsZero() && q.invert {
-			return true
-		}
-
 		return !nfo.Created.IsZero() && (!q.invert && time.Since(nfo.Created) < q.ageLimit) || (q.invert && time.Since(nfo.Created) > q.ageLimit)
 	})
 }
@@ -244,10 +236,6 @@ func (q *consumerQuery) matchPending(consumers []*Consumer) ([]*Consumer, error)
 	return q.cbMatcher(consumers, q.pending > 0, func(consumer *Consumer) bool {
 		nfo, _ := consumer.LatestState()
 
-		if nfo.NumPending == 0 && q.invert {
-			return true
-		}
-
 		return nfo.NumPending > 0 && (!q.invert && nfo.NumPending < q.pending) || (q.invert && nfo.NumPending > q.pending)
 	})
 }
@@ -256,10 +244,6 @@ func (q *consumerQuery) matchAckPending(consumers []*Consumer) ([]*Consumer, err
 	return q.cbMatcher(consumers, q.ackPending > 0, func(consumer *Consumer) bool {
 		nfo, _ := consumer.LatestState()
 
-		if nfo.NumAckPending == 0 && q.invert {
-			return true
-		}
-
 		return nfo.NumAckPending > 0 && (!q.invert && nfo.NumAckPending < q.ackPending) || (q.invert && nfo.NumAckPending > q.ackPending)
 	})
 }
@@ -268,10 +252,6 @@ func (q *consumerQuery) matchWaiting(consumers []*Consumer) ([]*Consumer, error)
 	return q.cbMatcher(consumers, q.waiting > 0, func(consumer *Consumer) bool {
 		nfo, _ := consumer.LatestState()
 
-		if nfo.NumWaiting == 0 && q.invert {
-			return true
-		}
-
 		return nfo.NumWaiting > 0 && (!q.invert && nfo.NumWaiting < q.waiting) || (q.invert && nfo.NumWaiting > q.waiting)
 	})
 }