From ef0c390642385a9d41c00ed806aa8ffb5ead5565 Mon Sep 17 00:00:00 2001 From: Ken Hibino Date: Fri, 26 Feb 2021 15:32:25 -0800 Subject: [PATCH] Update all variants of RDB.RunAll methods --- internal/rdb/inspect.go | 10 +++++----- internal/rdb/inspect_test.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/rdb/inspect.go b/internal/rdb/inspect.go index 1aa6c58..691c038 100644 --- a/internal/rdb/inspect.go +++ b/internal/rdb/inspect.go @@ -513,12 +513,12 @@ func (r *RDB) removeAndRun(zset, qkey, id string) (int64, error) { } var removeAndRunAllCmd = redis.NewScript(` -local msgs = redis.call("ZRANGE", KEYS[1], 0, -1) -for _, msg in ipairs(msgs) do - redis.call("LPUSH", KEYS[2], msg) - redis.call("ZREM", KEYS[1], msg) +local ids = redis.call("ZRANGE", KEYS[1], 0, -1) +for _, id in ipairs(ids) do + redis.call("LPUSH", KEYS[2], id) + redis.call("ZREM", KEYS[1], id) end -return table.getn(msgs)`) +return table.getn(ids)`) func (r *RDB) removeAndRunAll(zset, qkey string) (int64, error) { res, err := removeAndRunAllCmd.Run(r.client, []string{zset, qkey}).Result() diff --git a/internal/rdb/inspect_test.go b/internal/rdb/inspect_test.go index 9abe434..c55e4a3 100644 --- a/internal/rdb/inspect_test.go +++ b/internal/rdb/inspect_test.go @@ -1511,7 +1511,7 @@ func TestRunAllRetryTasks(t *testing.T) { } } -func TestRunAllDeadTasks(t *testing.T) { +func TestRunAllArchivedTasks(t *testing.T) { r := setup(t) defer r.Close() t1 := h.NewTaskMessage("send_email", nil)