Change RDB.CurrentStats to be multi-queue aware

internal/rdb/inspect_test.go

@@ -22,20 +22,29 @@ func TestCurrentStats(t *testing.T) {
 	m2 := h.NewTaskMessage("reindex", nil)
 	m3 := h.NewTaskMessage("gen_thumbnail", map[string]interface{}{"src": "some/path/to/img"})
 	m4 := h.NewTaskMessage("sync", nil)
+	m5 := h.NewTaskMessage("important_notification", nil)
+	m5.Queue = "critical"
+	m6 := h.NewTaskMessage("minor_notification", nil)
+	m6.Queue = "low"
 	now := time.Now()
 
 	tests := []struct {
-		enqueued   []*base.TaskMessage
+		enqueued   map[string][]*base.TaskMessage
 		inProgress []*base.TaskMessage
 		scheduled  []h.ZSetEntry
 		retry      []h.ZSetEntry
 		dead       []h.ZSetEntry
 		processed  int
 		failed     int
+		allQueues  []interface{}
 		want       *Stats
 	}{
 		{
-			enqueued:   []*base.TaskMessage{m1},
+			enqueued: map[string][]*base.TaskMessage{
+				base.DefaultQueueName: {m1},
+				"critical":            {m5},
+				"low":                 {m6},
+			},
 			inProgress: []*base.TaskMessage{m2},
 			scheduled: []h.ZSetEntry{
 				{Msg: m3, Score: now.Add(time.Hour).Unix()},
@@ -44,8 +53,9 @@ func TestCurrentStats(t *testing.T) {
 			dead:      []h.ZSetEntry{},
 			processed: 120,
 			failed:    2,
+			allQueues: []interface{}{base.DefaultQueue, base.QueueKey("critical"), base.QueueKey("low")},
 			want: &Stats{
-				Enqueued:   1,
+				Enqueued:   3,
 				InProgress: 1,
 				Scheduled:  2,
 				Retry:      0,
@@ -53,10 +63,13 @@ func TestCurrentStats(t *testing.T) {
 				Processed:  120,
 				Failed:     2,
 				Timestamp:  now,
+				Queues:     map[string]int{base.DefaultQueueName: 1, "critical": 1, "low": 1},
 			},
 		},
 		{
-			enqueued:   []*base.TaskMessage{},
+			enqueued: map[string][]*base.TaskMessage{
+				base.DefaultQueueName: {},
+			},
 			inProgress: []*base.TaskMessage{},
 			scheduled: []h.ZSetEntry{
 				{Msg: m3, Score: now.Unix()},
@@ -67,6 +80,7 @@ func TestCurrentStats(t *testing.T) {
 				{Msg: m2, Score: now.Add(-time.Hour).Unix()}},
 			processed: 90,
 			failed:    10,
+			allQueues: []interface{}{base.DefaultQueue},
 			want: &Stats{
 				Enqueued:   0,
 				InProgress: 0,
@@ -76,13 +90,16 @@ func TestCurrentStats(t *testing.T) {
 				Processed:  90,
 				Failed:     10,
 				Timestamp:  now,
+				Queues:     map[string]int{base.DefaultQueueName: 0},
 			},
 		},
 	}
 
 	for _, tc := range tests {
 		h.FlushDB(t, r.client) // clean up db before each test case
-		h.SeedEnqueuedQueue(t, r.client, tc.enqueued)
+		for qname, msgs := range tc.enqueued {
+			h.SeedEnqueuedQueue(t, r.client, msgs, qname)
+		}
 		h.SeedInProgressQueue(t, r.client, tc.inProgress)
 		h.SeedScheduledQueue(t, r.client, tc.scheduled)
 		h.SeedRetryQueue(t, r.client, tc.retry)
@@ -91,6 +108,7 @@ func TestCurrentStats(t *testing.T) {
 		failedKey := base.FailureKey(now)
 		r.client.Set(processedKey, tc.processed, 0)
 		r.client.Set(failedKey, tc.failed, 0)
+		r.client.SAdd(base.AllQueues, tc.allQueues...)
 
 		got, err := r.CurrentStats()
 		if err != nil {