diff --git a/asynq.go b/asynq.go index 86ddb9d..b55419c 100644 --- a/asynq.go +++ b/asynq.go @@ -12,10 +12,11 @@ import ( "net/url" "strconv" "strings" + "sync" "time" - "github.com/go-redis/redis/v8" "github.com/hibiken/asynq/internal/base" + "github.com/redis/go-redis/v9" ) // Task represents a unit of work to be performed. @@ -438,10 +439,11 @@ func (opt RedisClusterClientOpt) MakeRedisClient() interface{} { // // Three URI schemes are supported, which are redis:, rediss:, redis-socket:, and redis-sentinel:. // Supported formats are: -// redis://[:password@]host[:port][/dbnumber] -// rediss://[:password@]host[:port][/dbnumber] -// redis-socket://[:password@]path[?db=dbnumber] -// redis-sentinel://[:password@]host1[:port][,host2:[:port]][,hostN:[:port]][?master=masterName] +// +// redis://[:password@]host[:port][/dbnumber] +// rediss://[:password@]host[:port][/dbnumber] +// redis-socket://[:password@]path[?db=dbnumber] +// redis-sentinel://[:password@]host1[:port][,host2:[:port]][,hostN:[:port]][?master=masterName] func ParseRedisURI(uri string) (RedisConnOpt, error) { u, err := url.Parse(uri) if err != nil { @@ -545,3 +547,12 @@ func (w *ResultWriter) Write(data []byte) (n int, err error) { func (w *ResultWriter) TaskID() string { return w.id } + +var globalPrefixOnce sync.Once + +// SetGlobalPrefix sets the global prefix for all redis keys used by asynq. +func SetGlobalPrefix(prefix string) { + globalPrefixOnce.Do(func() { + base.GlobalPrefix = prefix + }) +} diff --git a/asynq_test.go b/asynq_test.go index 1147682..08afa82 100644 --- a/asynq_test.go +++ b/asynq_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" - "github.com/go-redis/redis/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hibiken/asynq/internal/log" h "github.com/hibiken/asynq/internal/testutil" + "github.com/redis/go-redis/v9" ) //============================================================================ diff --git a/client.go b/client.go index 7948036..c5b931e 100644 --- a/client.go +++ b/client.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/go-redis/redis/v8" "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/errors" "github.com/hibiken/asynq/internal/rdb" + "github.com/redis/go-redis/v9" ) // A Client is responsible for scheduling tasks. @@ -150,9 +150,9 @@ func (t deadlineOption) Value() interface{} { return time.Time(t) } // TTL duration must be greater than or equal to 1 second. // // Uniqueness of a task is based on the following properties: -// - Task Type -// - Task Payload -// - Queue Name +// - Task Type +// - Task Payload +// - Queue Name func Unique(ttl time.Duration) Option { return uniqueOption(ttl) } diff --git a/go.mod b/go.mod index 1a8aa53..ad2de2f 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,15 @@ module github.com/hibiken/asynq go 1.14 require ( - github.com/go-redis/redis/v8 v8.11.2 - github.com/golang/protobuf v1.4.2 + github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.6 github.com/google/uuid v1.2.0 - github.com/kr/pretty v0.1.0 // indirect + github.com/redis/go-redis/v9 v9.0.3 github.com/robfig/cron/v3 v3.0.1 github.com/spf13/cast v1.3.1 go.uber.org/goleak v1.1.12 - golang.org/x/sys v0.0.0-20210510120138-977fb7262007 + golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 - google.golang.org/protobuf v1.25.0 + google.golang.org/protobuf v1.26.0 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) diff --git a/go.sum b/go.sum index 2925acd..5434211 100644 --- a/go.sum +++ b/go.sum @@ -1,195 +1,82 @@ -cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= +github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w= +github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= +github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/go-redis/redis/v8 v8.11.2 h1:WqlSpAwz8mxDSMCvbyz1Mkiqe0LE5OY4j3lgkvu1Ts0= -github.com/go-redis/redis/v8 v8.11.2/go.mod h1:DLomh7y2e3ggQXQLd1YgmvIfecPJoFl7WU5SOQ/r06M= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k= +github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5 h1:dPmz1Snjq0kmkz159iL7S6WzdahUTHnHB5M56WFVifs= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.uber.org/goleak v0.10.0 h1:G3eWbSNIskeRqtsN/1uI5B+eP73y3JUuBsv9AZjehb4= -go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091 h1:DMyOG0U+gKfu8JZzg2UQe9MeaC1X+xQWlAKcRnjxjCw= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e h1:4nW4NLDYnU28ojHaHO8OVxFHk/aQ33U01a9cjED+pzE= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/inspector.go b/inspector.go index e583cf6..c47359c 100644 --- a/inspector.go +++ b/inspector.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/go-redis/redis/v8" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/errors" "github.com/hibiken/asynq/internal/rdb" + "github.com/redis/go-redis/v9" ) // Inspector is a client interface to inspect and mutate the state of diff --git a/inspector_test.go b/inspector_test.go index c406528..7b9b368 100644 --- a/inspector_test.go +++ b/inspector_test.go @@ -12,7 +12,6 @@ import ( "testing" "time" - "github.com/go-redis/redis/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" @@ -20,6 +19,7 @@ import ( "github.com/hibiken/asynq/internal/rdb" h "github.com/hibiken/asynq/internal/testutil" "github.com/hibiken/asynq/internal/timeutil" + "github.com/redis/go-redis/v9" ) func TestInspectorQueues(t *testing.T) { @@ -39,7 +39,7 @@ func TestInspectorQueues(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r) for _, qname := range tc.queues { - if err := r.SAdd(context.Background(), base.AllQueues, qname).Err(); err != nil { + if err := r.SAdd(context.Background(), base.AllQueues(), qname).Err(); err != nil { t.Fatalf("could not initialize all queue set: %v", err) } } @@ -138,8 +138,8 @@ func TestInspectorDeleteQueue(t *testing.T) { tc.qname, tc.force, err) continue } - if r.SIsMember(context.Background(), base.AllQueues, tc.qname).Val() { - t.Errorf("%q is a member of %q", tc.qname, base.AllQueues) + if r.SIsMember(context.Background(), base.AllQueues(), tc.qname).Val() { + t.Errorf("%q is a member of %q", tc.qname, base.AllQueues()) } } } @@ -429,7 +429,7 @@ func TestInspectorHistory(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r) - r.SAdd(context.Background(), base.AllQueues, tc.qname) + r.SAdd(context.Background(), base.AllQueues(), tc.qname) // populate last n days data for i := 0; i < tc.n; i++ { ts := now.Add(-time.Duration(i) * 24 * time.Hour) @@ -1138,7 +1138,7 @@ func TestInspectorListAggregatingTasks(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -1152,7 +1152,7 @@ func TestInspectorListAggregatingTasks(t *testing.T) { base.AllGroups("default"): {"group1", "group2"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-30 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, @@ -1196,7 +1196,7 @@ func TestInspectorListAggregatingTasks(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r) h.SeedTasks(t, r, fxt.tasks) - h.SeedRedisSet(t, r, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r, fxt.allGroups) h.SeedRedisZSets(t, r, fxt.groups) @@ -3445,7 +3445,7 @@ func TestInspectorGroups(t *testing.T) { fixtures := struct { tasks []*h.TaskSeedData allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -3458,7 +3458,7 @@ func TestInspectorGroups(t *testing.T) { base.AllGroups("default"): {"group1", "group2"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-10 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, diff --git a/internal/base/base.go b/internal/base/base.go index eea81b5..16ec563 100644 --- a/internal/base/base.go +++ b/internal/base/base.go @@ -14,11 +14,11 @@ import ( "sync" "time" - "github.com/go-redis/redis/v8" "github.com/golang/protobuf/ptypes" "github.com/hibiken/asynq/internal/errors" pb "github.com/hibiken/asynq/internal/proto" "github.com/hibiken/asynq/internal/timeutil" + "github.com/redis/go-redis/v9" "google.golang.org/protobuf/proto" ) @@ -31,14 +31,28 @@ const DefaultQueueName = "default" // DefaultQueue is the redis key for the default queue. var DefaultQueue = PendingKey(DefaultQueueName) -// Global Redis keys. -const ( - AllServers = "asynq:servers" // ZSET - AllWorkers = "asynq:workers" // ZSET - AllSchedulers = "asynq:schedulers" // ZSET - AllQueues = "asynq:queues" // SET - CancelChannel = "asynq:cancel" // PubSub channel -) +// GlobalPrefix is the prefix for all redis keys used by asynq. +var GlobalPrefix = "asynq" + +func AllServers() string { + return fmt.Sprintf("%s:servers", GlobalPrefix) // ZSET +} + +func AllWorkers() string { + return fmt.Sprintf("%s:workers", GlobalPrefix) // ZSET +} + +func AllSchedulers() string { + return fmt.Sprintf("%s:schedulers", GlobalPrefix) // ZSET +} + +func AllQueues() string { + return fmt.Sprintf("%s:queues", GlobalPrefix) // SET +} + +func CancelChannel() string { + return fmt.Sprintf("%s:cancel", GlobalPrefix) // PubSub channel +} // TaskState denotes the state of a task. type TaskState int @@ -104,7 +118,7 @@ func ValidateQueueName(qname string) error { // QueueKeyPrefix returns a prefix for all keys in the given queue. func QueueKeyPrefix(qname string) string { - return fmt.Sprintf("asynq:{%s}:", qname) + return fmt.Sprintf("%s:{%s}:", GlobalPrefix, qname) } // TaskKeyPrefix returns a prefix for task key. @@ -178,22 +192,22 @@ func FailedKey(qname string, t time.Time) string { // ServerInfoKey returns a redis key for process info. func ServerInfoKey(hostname string, pid int, serverID string) string { - return fmt.Sprintf("asynq:servers:{%s:%d:%s}", hostname, pid, serverID) + return fmt.Sprintf("%s:servers:{%s:%d:%s}", GlobalPrefix, hostname, pid, serverID) } // WorkersKey returns a redis key for the workers given hostname, pid, and server ID. func WorkersKey(hostname string, pid int, serverID string) string { - return fmt.Sprintf("asynq:workers:{%s:%d:%s}", hostname, pid, serverID) + return fmt.Sprintf("%s:workers:{%s:%d:%s}", GlobalPrefix, hostname, pid, serverID) } // SchedulerEntriesKey returns a redis key for the scheduler entries given scheduler ID. func SchedulerEntriesKey(schedulerID string) string { - return fmt.Sprintf("asynq:schedulers:{%s}", schedulerID) + return fmt.Sprintf("%s:schedulers:{%s}", GlobalPrefix, schedulerID) } // SchedulerHistoryKey returns a redis key for the scheduler's history for the given entry. func SchedulerHistoryKey(entryID string) string { - return fmt.Sprintf("asynq:scheduler_history:%s", entryID) + return fmt.Sprintf("%s:scheduler_history:%s", GlobalPrefix, entryID) } // UniqueKey returns a redis key with the given type, payload, and queue name. diff --git a/internal/rdb/inspect.go b/internal/rdb/inspect.go index 6deb4f1..4b8ae5d 100644 --- a/internal/rdb/inspect.go +++ b/internal/rdb/inspect.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "github.com/go-redis/redis/v8" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/errors" + "github.com/redis/go-redis/v9" "github.com/spf13/cast" ) // AllQueues returns a list of all queue names. func (r *RDB) AllQueues() ([]string, error) { - return r.client.SMembers(context.Background(), base.AllQueues).Result() + return r.client.SMembers(context.Background(), base.AllQueues()).Result() } // Stats represents a state of queues at a certain time. @@ -804,7 +804,7 @@ func (r *RDB) ListAggregating(qname, gname string, pgn Pagination) ([]*base.Task // Reports whether a queue with the given name exists. func (r *RDB) queueExists(qname string) (bool, error) { - return r.client.SIsMember(context.Background(), base.AllQueues, qname).Result() + return r.client.SIsMember(context.Background(), base.AllQueues(), qname).Result() } // KEYS[1] -> key for ids set (e.g. asynq:{}:scheduled) @@ -1829,7 +1829,7 @@ func (r *RDB) RemoveQueue(qname string, force bool) error { } switch n { case 1: - if err := r.client.SRem(context.Background(), base.AllQueues, qname).Err(); err != nil { + if err := r.client.SRem(context.Background(), base.AllQueues(), qname).Err(); err != nil { return errors.E(op, errors.Unknown, err) } return nil @@ -1852,7 +1852,7 @@ return keys`) // ListServers returns the list of server info. func (r *RDB) ListServers() ([]*base.ServerInfo, error) { now := r.clock.Now() - res, err := listServerKeysCmd.Run(context.Background(), r.client, []string{base.AllServers}, now.Unix()).Result() + res, err := listServerKeysCmd.Run(context.Background(), r.client, []string{base.AllServers()}, now.Unix()).Result() if err != nil { return nil, err } @@ -1886,7 +1886,7 @@ return keys`) func (r *RDB) ListWorkers() ([]*base.WorkerInfo, error) { var op errors.Op = "rdb.ListWorkers" now := r.clock.Now() - res, err := listWorkersCmd.Run(context.Background(), r.client, []string{base.AllWorkers}, now.Unix()).Result() + res, err := listWorkersCmd.Run(context.Background(), r.client, []string{base.AllWorkers()}, now.Unix()).Result() if err != nil { return nil, errors.E(op, errors.Unknown, err) } @@ -1921,7 +1921,7 @@ return keys`) // ListSchedulerEntries returns the list of scheduler entries. func (r *RDB) ListSchedulerEntries() ([]*base.SchedulerEntry, error) { now := r.clock.Now() - res, err := listSchedulerKeysCmd.Run(context.Background(), r.client, []string{base.AllSchedulers}, now.Unix()).Result() + res, err := listSchedulerKeysCmd.Run(context.Background(), r.client, []string{base.AllSchedulers()}, now.Unix()).Result() if err != nil { return nil, err } diff --git a/internal/rdb/inspect_test.go b/internal/rdb/inspect_test.go index 5987100..3d593eb 100644 --- a/internal/rdb/inspect_test.go +++ b/internal/rdb/inspect_test.go @@ -12,7 +12,6 @@ import ( "testing" "time" - "github.com/go-redis/redis/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" @@ -20,6 +19,7 @@ import ( "github.com/hibiken/asynq/internal/errors" h "github.com/hibiken/asynq/internal/testutil" "github.com/hibiken/asynq/internal/timeutil" + "github.com/redis/go-redis/v9" ) func TestAllQueues(t *testing.T) { @@ -38,7 +38,7 @@ func TestAllQueues(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) for _, qname := range tc.queues { - if err := r.client.SAdd(context.Background(), base.AllQueues, qname).Err(); err != nil { + if err := r.client.SAdd(context.Background(), base.AllQueues(), qname).Err(); err != nil { t.Fatalf("could not initialize all queue set: %v", err) } } @@ -73,11 +73,11 @@ func TestCurrentStats(t *testing.T) { allGroups map[string][]string pending map[string][]string active map[string][]string - scheduled map[string][]*redis.Z - retry map[string][]*redis.Z - archived map[string][]*redis.Z - completed map[string][]*redis.Z - groups map[string][]*redis.Z + scheduled map[string][]redis.Z + retry map[string][]redis.Z + archived map[string][]redis.Z + completed map[string][]redis.Z + groups map[string][]redis.Z processed map[string]int failed map[string]int processedTotal map[string]int @@ -111,7 +111,7 @@ func TestCurrentStats(t *testing.T) { base.ActiveKey("critical"): {}, base.ActiveKey("low"): {}, }, - scheduled: map[string][]*redis.Z{ + scheduled: map[string][]redis.Z{ base.ScheduledKey("default"): { {Member: m3.ID, Score: float64(now.Add(time.Hour).Unix())}, {Member: m4.ID, Score: float64(now.Unix())}, @@ -119,22 +119,22 @@ func TestCurrentStats(t *testing.T) { base.ScheduledKey("critical"): {}, base.ScheduledKey("low"): {}, }, - retry: map[string][]*redis.Z{ + retry: map[string][]redis.Z{ base.RetryKey("default"): {}, base.RetryKey("critical"): {}, base.RetryKey("low"): {}, }, - archived: map[string][]*redis.Z{ + archived: map[string][]redis.Z{ base.ArchivedKey("default"): {}, base.ArchivedKey("critical"): {}, base.ArchivedKey("low"): {}, }, - completed: map[string][]*redis.Z{ + completed: map[string][]redis.Z{ base.CompletedKey("default"): {}, base.CompletedKey("critical"): {}, base.CompletedKey("low"): {}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "sms:user1"): { {Member: m7.ID, Score: float64(now.Add(-3 * time.Second).Unix())}, }, @@ -205,7 +205,7 @@ func TestCurrentStats(t *testing.T) { base.ActiveKey("critical"): {}, base.ActiveKey("low"): {}, }, - scheduled: map[string][]*redis.Z{ + scheduled: map[string][]redis.Z{ base.ScheduledKey("default"): { {Member: m3.ID, Score: float64(now.Add(time.Hour).Unix())}, {Member: m4.ID, Score: float64(now.Unix())}, @@ -213,17 +213,17 @@ func TestCurrentStats(t *testing.T) { base.ScheduledKey("critical"): {}, base.ScheduledKey("low"): {}, }, - retry: map[string][]*redis.Z{ + retry: map[string][]redis.Z{ base.RetryKey("default"): {}, base.RetryKey("critical"): {}, base.RetryKey("low"): {}, }, - archived: map[string][]*redis.Z{ + archived: map[string][]redis.Z{ base.ArchivedKey("default"): {}, base.ArchivedKey("critical"): {}, base.ArchivedKey("low"): {}, }, - completed: map[string][]*redis.Z{ + completed: map[string][]redis.Z{ base.CompletedKey("default"): {}, base.CompletedKey("critical"): {}, base.CompletedKey("low"): {}, @@ -250,7 +250,7 @@ func TestCurrentStats(t *testing.T) { }, oldestPendingMessageEnqueueTime: map[string]time.Time{ "default": now.Add(-15 * time.Second), - "critical": time.Time{}, // zero value since there's no pending task in this queue + "critical": {}, // zero value since there's no pending task in this queue "low": now.Add(-30 * time.Second), }, paused: []string{"critical", "low"}, @@ -284,7 +284,7 @@ func TestCurrentStats(t *testing.T) { t.Fatal(err) } } - h.SeedRedisSet(t, r.client, base.AllQueues, tc.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), tc.allQueues) h.SeedRedisSets(t, r.client, tc.allGroups) h.SeedTasks(t, r.client, tc.tasks) h.SeedRedisLists(t, r.client, tc.pending) @@ -357,7 +357,7 @@ func TestHistoricalStats(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) - r.client.SAdd(context.Background(), base.AllQueues, tc.qname) + r.client.SAdd(context.Background(), base.AllQueues(), tc.qname) // populate last n days data for i := 0; i < tc.n; i++ { ts := now.Add(-time.Duration(i) * 24 * time.Hour) @@ -392,7 +392,6 @@ func TestHistoricalStats(t *testing.T) { } } } - } func TestRedisInfo(t *testing.T) { @@ -436,7 +435,7 @@ func TestGroupStats(t *testing.T) { fixtures := struct { tasks []*h.TaskSeedData allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -449,7 +448,7 @@ func TestGroupStats(t *testing.T) { base.AllGroups("default"): {"group1", "group2"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-10 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, @@ -487,7 +486,7 @@ func TestGroupStats(t *testing.T) { }, } - var sortGroupStatsOpt = cmp.Transformer( + sortGroupStatsOpt := cmp.Transformer( "SortGroupStats", func(in []*GroupStat) []*GroupStat { out := append([]*GroupStat(nil), in...) @@ -1509,7 +1508,6 @@ func TestListCompleted(t *testing.T) { continue } } - } func TestListCompletedPagination(t *testing.T) { @@ -1585,7 +1583,7 @@ func TestListAggregating(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -1598,7 +1596,7 @@ func TestListAggregating(t *testing.T) { base.AllGroups("default"): {"group1", "group2"}, base.AllGroups("custom"): {"group3"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-30 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, @@ -1639,7 +1637,7 @@ func TestListAggregating(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedTasks(t, r.client, fxt.tasks) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -1665,14 +1663,14 @@ func TestListAggregatingPagination(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{}, // will be populated below allQueues: []string{"default"}, allGroups: map[string][]string{ base.AllGroups("default"): {"mygroup"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ groupkey: {}, // will be populated below }, } @@ -1683,7 +1681,7 @@ func TestListAggregatingPagination(t *testing.T) { fxt.tasks = append(fxt.tasks, &h.TaskSeedData{ Msg: msg, State: base.TaskStateAggregating, }) - fxt.groups[groupkey] = append(fxt.groups[groupkey], &redis.Z{ + fxt.groups[groupkey] = append(fxt.groups[groupkey], redis.Z{ Member: msg.ID, Score: float64(now.Add(-time.Duration(100-i) * time.Second).Unix()), }) @@ -1753,7 +1751,7 @@ func TestListAggregatingPagination(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedTasks(t, r.client, fxt.tasks) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -1999,7 +1997,7 @@ func TestRunAggregatingTask(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -2011,7 +2009,7 @@ func TestRunAggregatingTask(t *testing.T) { base.AllGroups("default"): {"group1"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-25 * time.Second).Unix())}, @@ -2074,7 +2072,7 @@ func TestRunAggregatingTask(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) h.SeedTasks(t, r.client, fxt.tasks) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -2324,7 +2322,6 @@ func TestRunTaskError(t *testing.T) { } } } - } func TestRunAllScheduledTasks(t *testing.T) { @@ -2691,7 +2688,7 @@ func TestRunAllAggregatingTasks(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -2703,7 +2700,7 @@ func TestRunAllAggregatingTasks(t *testing.T) { base.AllGroups("default"): {"group1"}, base.AllGroups("custom"): {"group2"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-25 * time.Second).Unix())}, @@ -2767,7 +2764,7 @@ func TestRunAllAggregatingTasks(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) h.SeedTasks(t, r.client, fxt.tasks) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -3001,7 +2998,7 @@ func TestArchiveAggregatingTask(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -3013,7 +3010,7 @@ func TestArchiveAggregatingTask(t *testing.T) { base.AllGroups("default"): {"group1"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-25 * time.Second).Unix())}, @@ -3080,7 +3077,7 @@ func TestArchiveAggregatingTask(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) h.SeedTasks(t, r.client, fxt.tasks) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -3335,6 +3332,7 @@ func TestArchiveTaskError(t *testing.T) { } } } + func TestArchiveAllPendingTasks(t *testing.T) { r := setup(t) defer r.Close() @@ -3485,7 +3483,7 @@ func TestArchiveAllAggregatingTasks(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -3497,7 +3495,7 @@ func TestArchiveAllAggregatingTasks(t *testing.T) { base.AllGroups("default"): {"group1"}, base.AllGroups("custom"): {"group2"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-25 * time.Second).Unix())}, @@ -3566,7 +3564,7 @@ func TestArchiveAllAggregatingTasks(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) h.SeedTasks(t, r.client, fxt.tasks) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -4124,7 +4122,7 @@ func TestDeleteAggregatingTask(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -4136,7 +4134,7 @@ func TestDeleteAggregatingTask(t *testing.T) { base.AllGroups("default"): {"group1"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-25 * time.Second).Unix())}, @@ -4192,7 +4190,7 @@ func TestDeleteAggregatingTask(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) h.SeedTasks(t, r.client, fxt.tasks) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -4758,7 +4756,7 @@ func TestDeleteAllAggregatingTasks(t *testing.T) { tasks []*h.TaskSeedData allQueues []string allGroups map[string][]string - groups map[string][]*redis.Z + groups map[string][]redis.Z }{ tasks: []*h.TaskSeedData{ {Msg: m1, State: base.TaskStateAggregating}, @@ -4770,7 +4768,7 @@ func TestDeleteAllAggregatingTasks(t *testing.T) { base.AllGroups("default"): {"group1"}, base.AllGroups("custom"): {"group1"}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "group1"): { {Member: m1.ID, Score: float64(now.Add(-20 * time.Second).Unix())}, {Member: m2.ID, Score: float64(now.Add(-25 * time.Second).Unix())}, @@ -4827,7 +4825,7 @@ func TestDeleteAllAggregatingTasks(t *testing.T) { for _, tc := range tests { h.FlushDB(t, r.client) h.SeedTasks(t, r.client, fxt.tasks) - h.SeedRedisSet(t, r.client, base.AllQueues, fxt.allQueues) + h.SeedRedisSet(t, r.client, base.AllQueues(), fxt.allQueues) h.SeedRedisSets(t, r.client, fxt.allGroups) h.SeedRedisZSets(t, r.client, fxt.groups) @@ -5015,8 +5013,8 @@ func TestRemoveQueue(t *testing.T) { tc.qname, tc.force, err) continue } - if r.client.SIsMember(context.Background(), base.AllQueues, tc.qname).Val() { - t.Errorf("%q is a member of %q", tc.qname, base.AllQueues) + if r.client.SIsMember(context.Background(), base.AllQueues(), tc.qname).Val() { + t.Errorf("%q is a member of %q", tc.qname, base.AllQueues()) } keys := []string{ diff --git a/internal/rdb/rdb.go b/internal/rdb/rdb.go index 5d8b595..9798efa 100644 --- a/internal/rdb/rdb.go +++ b/internal/rdb/rdb.go @@ -11,11 +11,11 @@ import ( "math" "time" - "github.com/go-redis/redis/v8" "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/errors" "github.com/hibiken/asynq/internal/timeutil" + "github.com/redis/go-redis/v9" "github.com/spf13/cast" ) @@ -112,7 +112,7 @@ func (r *RDB) Enqueue(ctx context.Context, msg *base.TaskMessage) error { if err != nil { return errors.E(op, errors.Unknown, fmt.Sprintf("cannot encode message: %v", err)) } - if err := r.client.SAdd(ctx, base.AllQueues, msg.Queue).Err(); err != nil { + if err := r.client.SAdd(ctx, base.AllQueues(), msg.Queue).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } keys := []string{ @@ -152,7 +152,7 @@ func (r *RDB) Enqueue(ctx context.Context, msg *base.TaskMessage) error { var enqueueUniqueCmd = redis.NewScript(` local ok = redis.call("SET", KEYS[1], ARGV[1], "NX", "EX", ARGV[2]) if not ok then - return -1 + return -1 end if redis.call("EXISTS", KEYS[2]) == 1 then return 0 @@ -174,7 +174,7 @@ func (r *RDB) EnqueueUnique(ctx context.Context, msg *base.TaskMessage, ttl time if err != nil { return errors.E(op, errors.Internal, "cannot encode task message: %v", err) } - if err := r.client.SAdd(ctx, base.AllQueues, msg.Queue).Err(); err != nil { + if err := r.client.SAdd(ctx, base.AllQueues(), msg.Queue).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } keys := []string{ @@ -529,7 +529,7 @@ func (r *RDB) AddToGroup(ctx context.Context, msg *base.TaskMessage, groupKey st if err != nil { return errors.E(op, errors.Unknown, fmt.Sprintf("cannot encode message: %v", err)) } - if err := r.client.SAdd(ctx, base.AllQueues, msg.Queue).Err(); err != nil { + if err := r.client.SAdd(ctx, base.AllQueues(), msg.Queue).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } keys := []string{ @@ -591,7 +591,7 @@ func (r *RDB) AddToGroupUnique(ctx context.Context, msg *base.TaskMessage, group if err != nil { return errors.E(op, errors.Unknown, fmt.Sprintf("cannot encode message: %v", err)) } - if err := r.client.SAdd(ctx, base.AllQueues, msg.Queue).Err(); err != nil { + if err := r.client.SAdd(ctx, base.AllQueues(), msg.Queue).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } keys := []string{ @@ -648,7 +648,7 @@ func (r *RDB) Schedule(ctx context.Context, msg *base.TaskMessage, processAt tim if err != nil { return errors.E(op, errors.Unknown, fmt.Sprintf("cannot encode message: %v", err)) } - if err := r.client.SAdd(ctx, base.AllQueues, msg.Queue).Err(); err != nil { + if err := r.client.SAdd(ctx, base.AllQueues(), msg.Queue).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } keys := []string{ @@ -707,7 +707,7 @@ func (r *RDB) ScheduleUnique(ctx context.Context, msg *base.TaskMessage, process if err != nil { return errors.E(op, errors.Internal, fmt.Sprintf("cannot encode task message: %v", err)) } - if err := r.client.SAdd(ctx, base.AllQueues, msg.Queue).Err(); err != nil { + if err := r.client.SAdd(ctx, base.AllQueues(), msg.Queue).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } keys := []string{ @@ -1319,9 +1319,9 @@ func (r *RDB) ListLeaseExpired(cutoff time.Time, qnames ...string) ([]*base.Task // It returns a new expiration time if the operation was successful. func (r *RDB) ExtendLease(qname string, ids ...string) (expirationTime time.Time, err error) { expireAt := r.clock.Now().Add(LeaseDuration) - var zs []*redis.Z + var zs []redis.Z for _, id := range ids { - zs = append(zs, &redis.Z{Member: id, Score: float64(expireAt.Unix())}) + zs = append(zs, redis.Z{Member: id, Score: float64(expireAt.Unix())}) } // Use XX option to only update elements that already exist; Don't add new elements // TODO: Consider adding GT option to ensure we only "extend" the lease. Ceveat is that GT is supported from redis v6.2.0 or above. @@ -1367,10 +1367,10 @@ func (r *RDB) WriteServerState(info *base.ServerInfo, workers []*base.WorkerInfo } skey := base.ServerInfoKey(info.Host, info.PID, info.ServerID) wkey := base.WorkersKey(info.Host, info.PID, info.ServerID) - if err := r.client.ZAdd(ctx, base.AllServers, &redis.Z{Score: float64(exp.Unix()), Member: skey}).Err(); err != nil { + if err := r.client.ZAdd(ctx, base.AllServers(), redis.Z{Score: float64(exp.Unix()), Member: skey}).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "sadd", Err: err}) } - if err := r.client.ZAdd(ctx, base.AllWorkers, &redis.Z{Score: float64(exp.Unix()), Member: wkey}).Err(); err != nil { + if err := r.client.ZAdd(ctx, base.AllWorkers(), redis.Z{Score: float64(exp.Unix()), Member: wkey}).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "zadd", Err: err}) } return r.runScript(ctx, op, writeServerStateCmd, []string{skey, wkey}, args...) @@ -1389,10 +1389,10 @@ func (r *RDB) ClearServerState(host string, pid int, serverID string) error { ctx := context.Background() skey := base.ServerInfoKey(host, pid, serverID) wkey := base.WorkersKey(host, pid, serverID) - if err := r.client.ZRem(ctx, base.AllServers, skey).Err(); err != nil { + if err := r.client.ZRem(ctx, base.AllServers(), skey).Err(); err != nil { return errors.E(op, errors.Internal, &errors.RedisCommandError{Command: "zrem", Err: err}) } - if err := r.client.ZRem(ctx, base.AllWorkers, wkey).Err(); err != nil { + if err := r.client.ZRem(ctx, base.AllWorkers(), wkey).Err(); err != nil { return errors.E(op, errors.Internal, &errors.RedisCommandError{Command: "zrem", Err: err}) } return r.runScript(ctx, op, clearServerStateCmd, []string{skey, wkey}) @@ -1423,7 +1423,7 @@ func (r *RDB) WriteSchedulerEntries(schedulerID string, entries []*base.Schedule } exp := r.clock.Now().Add(ttl).UTC() key := base.SchedulerEntriesKey(schedulerID) - err := r.client.ZAdd(ctx, base.AllSchedulers, &redis.Z{Score: float64(exp.Unix()), Member: key}).Err() + err := r.client.ZAdd(ctx, base.AllSchedulers(), redis.Z{Score: float64(exp.Unix()), Member: key}).Err() if err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "zadd", Err: err}) } @@ -1435,7 +1435,7 @@ func (r *RDB) ClearSchedulerEntries(scheduelrID string) error { var op errors.Op = "rdb.ClearSchedulerEntries" ctx := context.Background() key := base.SchedulerEntriesKey(scheduelrID) - if err := r.client.ZRem(ctx, base.AllSchedulers, key).Err(); err != nil { + if err := r.client.ZRem(ctx, base.AllSchedulers(), key).Err(); err != nil { return errors.E(op, errors.Unknown, &errors.RedisCommandError{Command: "zrem", Err: err}) } if err := r.client.Del(ctx, key).Err(); err != nil { @@ -1448,7 +1448,7 @@ func (r *RDB) ClearSchedulerEntries(scheduelrID string) error { func (r *RDB) CancelationPubSub() (*redis.PubSub, error) { var op errors.Op = "rdb.CancelationPubSub" ctx := context.Background() - pubsub := r.client.Subscribe(ctx, base.CancelChannel) + pubsub := r.client.Subscribe(ctx, base.CancelChannel()) _, err := pubsub.Receive(ctx) if err != nil { return nil, errors.E(op, errors.Unknown, fmt.Sprintf("redis pubsub receive error: %v", err)) @@ -1461,7 +1461,7 @@ func (r *RDB) CancelationPubSub() (*redis.PubSub, error) { func (r *RDB) PublishCancelation(id string) error { var op errors.Op = "rdb.PublishCancelation" ctx := context.Background() - if err := r.client.Publish(ctx, base.CancelChannel, id).Err(); err != nil { + if err := r.client.Publish(ctx, base.CancelChannel(), id).Err(); err != nil { return errors.E(op, errors.Unknown, fmt.Sprintf("redis pubsub publish error: %v", err)) } return nil diff --git a/internal/rdb/rdb_test.go b/internal/rdb/rdb_test.go index 5094aa9..afa15e3 100644 --- a/internal/rdb/rdb_test.go +++ b/internal/rdb/rdb_test.go @@ -15,7 +15,6 @@ import ( "testing" "time" - "github.com/go-redis/redis/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" @@ -23,6 +22,7 @@ import ( "github.com/hibiken/asynq/internal/errors" h "github.com/hibiken/asynq/internal/testutil" "github.com/hibiken/asynq/internal/timeutil" + "github.com/redis/go-redis/v9" ) // variables used for package testing. @@ -118,8 +118,8 @@ func TestEnqueue(t *testing.T) { } // Check queue is in the AllQueues set. - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } } } @@ -199,8 +199,8 @@ func TestEnqueueUnique(t *testing.T) { if diff := cmp.Diff(tc.msg, gotPending[0]); diff != "" { t.Errorf("persisted data differed from the original input (-want, +got)\n%s", diff) } - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } // Check Pending list has task ID. @@ -236,8 +236,8 @@ func TestEnqueueUnique(t *testing.T) { } // Check queue is in the AllQueues set. - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } // Enqueue the second message, should fail. @@ -1228,8 +1228,8 @@ func TestAddToGroup(t *testing.T) { } // Check queue is in the AllQueues set. - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } } } @@ -1272,7 +1272,6 @@ func TestAddToGroupeTaskIdConflictError(t *testing.T) { continue } } - } func TestAddToGroupUnique(t *testing.T) { @@ -1339,8 +1338,8 @@ func TestAddToGroupUnique(t *testing.T) { } // Check queue is in the AllQueues set. - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } got := r.AddToGroupUnique(ctx, tc.msg, tc.groupKey, tc.ttl) @@ -1356,7 +1355,6 @@ func TestAddToGroupUnique(t *testing.T) { continue } } - } func TestAddToGroupUniqueTaskIdConflictError(t *testing.T) { @@ -1398,7 +1396,6 @@ func TestAddToGroupUniqueTaskIdConflictError(t *testing.T) { continue } } - } func TestSchedule(t *testing.T) { @@ -1453,8 +1450,8 @@ func TestSchedule(t *testing.T) { } // Check queue is in the AllQueues set. - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } } } @@ -1565,8 +1562,8 @@ func TestScheduleUnique(t *testing.T) { } // Check queue is in the AllQueues set. - if !r.client.SIsMember(context.Background(), base.AllQueues, tc.msg.Queue).Val() { - t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues) + if !r.client.SIsMember(context.Background(), base.AllQueues(), tc.msg.Queue).Val() { + t.Errorf("%q is not a member of SET %q", tc.msg.Queue, base.AllQueues()) } // Enqueue the second message, should fail. @@ -2797,10 +2794,10 @@ func TestWriteServerState(t *testing.T) { t.Errorf("TTL of %q was %v, want %v", skey, gotTTL, ttl) } // Check ServerInfo key was added to the set all server keys correctly. - gotServerKeys := r.client.ZRange(context.Background(), base.AllServers, 0, -1).Val() + gotServerKeys := r.client.ZRange(context.Background(), base.AllServers(), 0, -1).Val() wantServerKeys := []string{skey} if diff := cmp.Diff(wantServerKeys, gotServerKeys); diff != "" { - t.Errorf("%q contained %v, want %v", base.AllServers, gotServerKeys, wantServerKeys) + t.Errorf("%q contained %v, want %v", base.AllServers(), gotServerKeys, wantServerKeys) } // Check WorkersInfo was written correctly. @@ -2810,10 +2807,10 @@ func TestWriteServerState(t *testing.T) { t.Errorf("%q key exists", wkey) } // Check WorkersInfo key was added to the set correctly. - gotWorkerKeys := r.client.ZRange(context.Background(), base.AllWorkers, 0, -1).Val() + gotWorkerKeys := r.client.ZRange(context.Background(), base.AllWorkers(), 0, -1).Val() wantWorkerKeys := []string{wkey} if diff := cmp.Diff(wantWorkerKeys, gotWorkerKeys); diff != "" { - t.Errorf("%q contained %v, want %v", base.AllWorkers, gotWorkerKeys, wantWorkerKeys) + t.Errorf("%q contained %v, want %v", base.AllWorkers(), gotWorkerKeys, wantWorkerKeys) } } @@ -2887,10 +2884,10 @@ func TestWriteServerStateWithWorkers(t *testing.T) { t.Errorf("TTL of %q was %v, want %v", skey, gotTTL, ttl) } // Check ServerInfo key was added to the set correctly. - gotServerKeys := r.client.ZRange(context.Background(), base.AllServers, 0, -1).Val() + gotServerKeys := r.client.ZRange(context.Background(), base.AllServers(), 0, -1).Val() wantServerKeys := []string{skey} if diff := cmp.Diff(wantServerKeys, gotServerKeys); diff != "" { - t.Errorf("%q contained %v, want %v", base.AllServers, gotServerKeys, wantServerKeys) + t.Errorf("%q contained %v, want %v", base.AllServers(), gotServerKeys, wantServerKeys) } // Check WorkersInfo was written correctly. @@ -2918,10 +2915,10 @@ func TestWriteServerStateWithWorkers(t *testing.T) { t.Errorf("TTL of %q was %v, want %v", wkey, gotTTL, ttl) } // Check WorkersInfo key was added to the set correctly. - gotWorkerKeys := r.client.ZRange(context.Background(), base.AllWorkers, 0, -1).Val() + gotWorkerKeys := r.client.ZRange(context.Background(), base.AllWorkers(), 0, -1).Val() wantWorkerKeys := []string{wkey} if diff := cmp.Diff(wantWorkerKeys, gotWorkerKeys); diff != "" { - t.Errorf("%q contained %v, want %v", base.AllWorkers, gotWorkerKeys, wantWorkerKeys) + t.Errorf("%q contained %v, want %v", base.AllWorkers(), gotWorkerKeys, wantWorkerKeys) } } @@ -3014,15 +3011,15 @@ func TestClearServerState(t *testing.T) { if r.client.Exists(context.Background(), wkey).Val() != 0 { t.Errorf("Redis key %q exists", wkey) } - gotServerKeys := r.client.ZRange(context.Background(), base.AllServers, 0, -1).Val() + gotServerKeys := r.client.ZRange(context.Background(), base.AllServers(), 0, -1).Val() wantServerKeys := []string{otherSKey} if diff := cmp.Diff(wantServerKeys, gotServerKeys); diff != "" { - t.Errorf("%q contained %v, want %v", base.AllServers, gotServerKeys, wantServerKeys) + t.Errorf("%q contained %v, want %v", base.AllServers(), gotServerKeys, wantServerKeys) } - gotWorkerKeys := r.client.ZRange(context.Background(), base.AllWorkers, 0, -1).Val() + gotWorkerKeys := r.client.ZRange(context.Background(), base.AllWorkers(), 0, -1).Val() wantWorkerKeys := []string{otherWKey} if diff := cmp.Diff(wantWorkerKeys, gotWorkerKeys); diff != "" { - t.Errorf("%q contained %v, want %v", base.AllWorkers, gotWorkerKeys, wantWorkerKeys) + t.Errorf("%q contained %v, want %v", base.AllWorkers(), gotWorkerKeys, wantWorkerKeys) } } @@ -3122,7 +3119,7 @@ func TestAggregationCheck(t *testing.T) { desc string // initial data tasks []*h.TaskSeedData - groups map[string][]*redis.Z + groups map[string][]redis.Z allGroups map[string][]string // args @@ -3141,7 +3138,7 @@ func TestAggregationCheck(t *testing.T) { { desc: "with an empty group", tasks: []*h.TaskSeedData{}, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): {}, }, allGroups: map[string][]string{ @@ -3168,7 +3165,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg4, State: base.TaskStateAggregating}, {Msg: msg5, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-5 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3201,7 +3198,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg4, State: base.TaskStateAggregating}, {Msg: msg5, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-5 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3235,7 +3232,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg2, State: base.TaskStateAggregating}, {Msg: msg3, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-5 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3266,7 +3263,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg4, State: base.TaskStateAggregating}, {Msg: msg5, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-15 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3299,7 +3296,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg4, State: base.TaskStateAggregating}, {Msg: msg5, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-15 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3338,7 +3335,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg4, State: base.TaskStateAggregating}, {Msg: msg5, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-15 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3371,7 +3368,7 @@ func TestAggregationCheck(t *testing.T) { {Msg: msg4, State: base.TaskStateAggregating}, {Msg: msg5, State: base.TaskStateAggregating}, }, - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "mygroup"): { {Member: msg1.ID, Score: float64(now.Add(-15 * time.Minute).Unix())}, {Member: msg2.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, @@ -3473,8 +3470,8 @@ func TestDeleteAggregationSet(t *testing.T) { desc string // initial data tasks []*h.TaskSeedData - aggregationSets map[string][]*redis.Z - allAggregationSets map[string][]*redis.Z + aggregationSets map[string][]redis.Z + allAggregationSets map[string][]redis.Z // args ctx context.Context @@ -3494,14 +3491,14 @@ func TestDeleteAggregationSet(t *testing.T) { {Msg: m2, State: base.TaskStateAggregating}, {Msg: m3, State: base.TaskStateAggregating}, }, - aggregationSets: map[string][]*redis.Z{ + aggregationSets: map[string][]redis.Z{ base.AggregationSetKey("default", "mygroup", setID): { {Member: m1.ID, Score: float64(now.Add(-5 * time.Minute).Unix())}, {Member: m2.ID, Score: float64(now.Add(-4 * time.Minute).Unix())}, {Member: m3.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, }, }, - allAggregationSets: map[string][]*redis.Z{ + allAggregationSets: map[string][]redis.Z{ base.AllAggregationSets("default"): { {Member: base.AggregationSetKey("default", "mygroup", setID), Score: float64(now.Add(aggregationTimeout).Unix())}, }, @@ -3528,7 +3525,7 @@ func TestDeleteAggregationSet(t *testing.T) { {Msg: m2, State: base.TaskStateAggregating}, {Msg: m3, State: base.TaskStateAggregating}, }, - aggregationSets: map[string][]*redis.Z{ + aggregationSets: map[string][]redis.Z{ base.AggregationSetKey("default", "mygroup", setID): { {Member: m1.ID, Score: float64(now.Add(-5 * time.Minute).Unix())}, }, @@ -3537,7 +3534,7 @@ func TestDeleteAggregationSet(t *testing.T) { {Member: m3.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, }, }, - allAggregationSets: map[string][]*redis.Z{ + allAggregationSets: map[string][]redis.Z{ base.AllAggregationSets("default"): { {Member: base.AggregationSetKey("default", "mygroup", setID), Score: float64(now.Add(aggregationTimeout).Unix())}, {Member: base.AggregationSetKey("default", "mygroup", otherSetID), Score: float64(now.Add(aggregationTimeout).Unix())}, @@ -3602,8 +3599,8 @@ func TestDeleteAggregationSetError(t *testing.T) { desc string // initial data tasks []*h.TaskSeedData - aggregationSets map[string][]*redis.Z - allAggregationSets map[string][]*redis.Z + aggregationSets map[string][]redis.Z + allAggregationSets map[string][]redis.Z // args ctx context.Context @@ -3622,14 +3619,14 @@ func TestDeleteAggregationSetError(t *testing.T) { {Msg: m2, State: base.TaskStateAggregating}, {Msg: m3, State: base.TaskStateAggregating}, }, - aggregationSets: map[string][]*redis.Z{ + aggregationSets: map[string][]redis.Z{ base.AggregationSetKey("default", "mygroup", setID): { {Member: m1.ID, Score: float64(now.Add(-5 * time.Minute).Unix())}, {Member: m2.ID, Score: float64(now.Add(-4 * time.Minute).Unix())}, {Member: m3.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, }, }, - allAggregationSets: map[string][]*redis.Z{ + allAggregationSets: map[string][]redis.Z{ base.AllAggregationSets("default"): { {Member: base.AggregationSetKey("default", "mygroup", setID), Score: float64(now.Add(aggregationTimeout).Unix())}, }, @@ -3688,23 +3685,23 @@ func TestReclaimStaleAggregationSets(t *testing.T) { // Note: In this test, we're trying out a new way to test RDB by exactly describing how // keys and values are represented in Redis. tests := []struct { - groups map[string][]*redis.Z // map redis-key to redis-zset - aggregationSets map[string][]*redis.Z - allAggregationSets map[string][]*redis.Z + groups map[string][]redis.Z // map redis-key to redis-zset + aggregationSets map[string][]redis.Z + allAggregationSets map[string][]redis.Z qname string wantGroups map[string][]redis.Z wantAggregationSets map[string][]redis.Z wantAllAggregationSets map[string][]redis.Z }{ { - groups: map[string][]*redis.Z{ + groups: map[string][]redis.Z{ base.GroupKey("default", "foo"): {}, base.GroupKey("default", "bar"): {}, base.GroupKey("default", "qux"): { {Member: m4.ID, Score: float64(now.Add(-10 * time.Second).Unix())}, }, }, - aggregationSets: map[string][]*redis.Z{ + aggregationSets: map[string][]redis.Z{ base.AggregationSetKey("default", "foo", "set1"): { {Member: m1.ID, Score: float64(now.Add(-3 * time.Minute).Unix())}, {Member: m2.ID, Score: float64(now.Add(-4 * time.Minute).Unix())}, @@ -3713,7 +3710,7 @@ func TestReclaimStaleAggregationSets(t *testing.T) { {Member: m3.ID, Score: float64(now.Add(-1 * time.Minute).Unix())}, }, }, - allAggregationSets: map[string][]*redis.Z{ + allAggregationSets: map[string][]redis.Z{ base.AllAggregationSets("default"): { {Member: base.AggregationSetKey("default", "foo", "set1"), Score: float64(now.Add(-10 * time.Second).Unix())}, // set1 is expired {Member: base.AggregationSetKey("default", "bar", "set2"), Score: float64(now.Add(40 * time.Second).Unix())}, // set2 is not expired diff --git a/internal/testbroker/testbroker.go b/internal/testbroker/testbroker.go index 49275f8..656fdbc 100644 --- a/internal/testbroker/testbroker.go +++ b/internal/testbroker/testbroker.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/go-redis/redis/v8" "github.com/hibiken/asynq/internal/base" + "github.com/redis/go-redis/v9" ) var errRedisDown = errors.New("testutil: redis is down") diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go index 899dfb1..78a29e4 100644 --- a/internal/testutil/testutil.go +++ b/internal/testutil/testutil.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/go-redis/redis/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/timeutil" + "github.com/redis/go-redis/v9" ) // EquateInt64Approx returns a Comparer option that treats int64 values @@ -213,49 +213,49 @@ func FlushDB(tb testing.TB, r redis.UniversalClient) { // SeedPendingQueue initializes the specified queue with the given messages. func SeedPendingQueue(tb testing.TB, r redis.UniversalClient, msgs []*base.TaskMessage, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisList(tb, r, base.PendingKey(qname), msgs, base.TaskStatePending) } // SeedActiveQueue initializes the active queue with the given messages. func SeedActiveQueue(tb testing.TB, r redis.UniversalClient, msgs []*base.TaskMessage, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisList(tb, r, base.ActiveKey(qname), msgs, base.TaskStateActive) } // SeedScheduledQueue initializes the scheduled queue with the given messages. func SeedScheduledQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisZSet(tb, r, base.ScheduledKey(qname), entries, base.TaskStateScheduled) } // SeedRetryQueue initializes the retry queue with the given messages. func SeedRetryQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisZSet(tb, r, base.RetryKey(qname), entries, base.TaskStateRetry) } // SeedArchivedQueue initializes the archived queue with the given messages. func SeedArchivedQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisZSet(tb, r, base.ArchivedKey(qname), entries, base.TaskStateArchived) } // SeedLease initializes the lease set with the given entries. func SeedLease(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisZSet(tb, r, base.LeaseKey(qname), entries, base.TaskStateActive) } // SeedCompletedQueue initializes the completed set with the given entries. func SeedCompletedQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisZSet(tb, r, base.CompletedKey(qname), entries, base.TaskStateCompleted) } @@ -263,14 +263,14 @@ func SeedCompletedQueue(tb testing.TB, r redis.UniversalClient, entries []base.Z func SeedGroup(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname, gname string) { tb.Helper() ctx := context.Background() - r.SAdd(ctx, base.AllQueues, qname) + r.SAdd(ctx, base.AllQueues(), qname) r.SAdd(ctx, base.AllGroups(qname), gname) seedRedisZSet(tb, r, base.GroupKey(qname, gname), entries, base.TaskStateAggregating) } func SeedAggregationSet(tb testing.TB, r redis.UniversalClient, entries []base.Z, qname, gname, setID string) { tb.Helper() - r.SAdd(context.Background(), base.AllQueues, qname) + r.SAdd(context.Background(), base.AllQueues(), qname) seedRedisZSet(tb, r, base.AggregationSetKey(qname, gname, setID), entries, base.TaskStateAggregating) } @@ -377,7 +377,7 @@ func seedRedisZSet(tb testing.TB, c redis.UniversalClient, key string, for _, item := range items { msg := item.Message encoded := MustMarshal(tb, msg) - z := &redis.Z{Member: msg.ID, Score: float64(item.Score)} + z := redis.Z{Member: msg.ID, Score: float64(item.Score)} if err := c.ZAdd(context.Background(), key, z).Err(); err != nil { tb.Fatal(err) } @@ -570,7 +570,7 @@ func SeedTasks(tb testing.TB, r redis.UniversalClient, taskData []*TaskSeedData) } } -func SeedRedisZSets(tb testing.TB, r redis.UniversalClient, zsets map[string][]*redis.Z) { +func SeedRedisZSets(tb testing.TB, r redis.UniversalClient, zsets map[string][]redis.Z) { for key, zs := range zsets { // FIXME: How come we can't simply do ZAdd(ctx, key, zs...) here? for _, z := range zs { diff --git a/scheduler.go b/scheduler.go index 12c702c..276fb6b 100644 --- a/scheduler.go +++ b/scheduler.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/go-redis/redis/v8" "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/log" "github.com/hibiken/asynq/internal/rdb" + "github.com/redis/go-redis/v9" "github.com/robfig/cron/v3" ) diff --git a/server.go b/server.go index 4bf04e0..a3d090a 100644 --- a/server.go +++ b/server.go @@ -15,10 +15,10 @@ import ( "sync" "time" - "github.com/go-redis/redis/v8" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/log" "github.com/hibiken/asynq/internal/rdb" + "github.com/redis/go-redis/v9" ) // Server is responsible for task processing and task lifecycle management. diff --git a/server_test.go b/server_test.go index cfbf239..724b48a 100644 --- a/server_test.go +++ b/server_test.go @@ -19,7 +19,7 @@ import ( func TestServer(t *testing.T) { // https://github.com/go-redis/redis/issues/1029 - ignoreOpt := goleak.IgnoreTopFunction("github.com/go-redis/redis/v8/internal/pool.(*ConnPool).reaper") + ignoreOpt := goleak.IgnoreTopFunction("github.com/redis/go-redis/v9/internal/pool.(*ConnPool).reaper") defer goleak.VerifyNone(t, ignoreOpt) redisConnOpt := getRedisConnOpt(t) @@ -55,7 +55,7 @@ func TestServer(t *testing.T) { func TestServerRun(t *testing.T) { // https://github.com/go-redis/redis/issues/1029 - ignoreOpt := goleak.IgnoreTopFunction("github.com/go-redis/redis/v8/internal/pool.(*ConnPool).reaper") + ignoreOpt := goleak.IgnoreTopFunction("github.com/redis/go-redis/v9/internal/pool.(*ConnPool).reaper") defer goleak.VerifyNone(t, ignoreOpt) srv := NewServer(RedisClientOpt{Addr: ":6379"}, Config{LogLevel: testLogLevel}) diff --git a/subscriber.go b/subscriber.go index 3c1b1ea..7d5631f 100644 --- a/subscriber.go +++ b/subscriber.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/go-redis/redis/v8" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/log" + "github.com/redis/go-redis/v9" ) type subscriber struct { diff --git a/tools/asynq/cmd/cron.go b/tools/asynq/cmd/cron.go index 52bdc74..1e17374 100644 --- a/tools/asynq/cmd/cron.go +++ b/tools/asynq/cmd/cron.go @@ -11,7 +11,6 @@ import ( "sort" "time" - "github.com/MakeNowJust/heredoc/v2" "github.com/hibiken/asynq" "github.com/spf13/cobra" ) diff --git a/tools/asynq/cmd/dash.go b/tools/asynq/cmd/dash.go index 3ae0ed3..c54cadf 100644 --- a/tools/asynq/cmd/dash.go +++ b/tools/asynq/cmd/dash.go @@ -9,7 +9,6 @@ import ( "os" "time" - "github.com/MakeNowJust/heredoc/v2" "github.com/hibiken/asynq/tools/asynq/cmd/dash" "github.com/spf13/cobra" ) diff --git a/tools/asynq/cmd/dash/dash.go b/tools/asynq/cmd/dash/dash.go index b1e93f8..e014763 100644 --- a/tools/asynq/cmd/dash/dash.go +++ b/tools/asynq/cmd/dash/dash.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/gdamore/tcell/v2" "github.com/hibiken/asynq" ) diff --git a/tools/asynq/cmd/dash/draw.go b/tools/asynq/cmd/dash/draw.go index 6b43bc7..b597567 100644 --- a/tools/asynq/cmd/dash/draw.go +++ b/tools/asynq/cmd/dash/draw.go @@ -13,9 +13,7 @@ import ( "unicode" "unicode/utf8" - "github.com/gdamore/tcell/v2" "github.com/hibiken/asynq" - "github.com/mattn/go-runewidth" ) var ( diff --git a/tools/asynq/cmd/dash/fetch.go b/tools/asynq/cmd/dash/fetch.go index 6b2e576..1ed1cc8 100644 --- a/tools/asynq/cmd/dash/fetch.go +++ b/tools/asynq/cmd/dash/fetch.go @@ -7,7 +7,6 @@ package dash import ( "sort" - "github.com/gdamore/tcell/v2" "github.com/hibiken/asynq" ) diff --git a/tools/asynq/cmd/dash/key_event.go b/tools/asynq/cmd/dash/key_event.go index 83a21dc..1f66d89 100644 --- a/tools/asynq/cmd/dash/key_event.go +++ b/tools/asynq/cmd/dash/key_event.go @@ -8,7 +8,6 @@ import ( "os" "time" - "github.com/gdamore/tcell/v2" "github.com/hibiken/asynq" ) diff --git a/tools/asynq/cmd/dash/key_event_test.go b/tools/asynq/cmd/dash/key_event_test.go index cb60ab9..c02de7c 100644 --- a/tools/asynq/cmd/dash/key_event_test.go +++ b/tools/asynq/cmd/dash/key_event_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/gdamore/tcell/v2" "github.com/google/go-cmp/cmp" "github.com/hibiken/asynq" ) diff --git a/tools/asynq/cmd/queue.go b/tools/asynq/cmd/queue.go index 875dca5..00139e3 100644 --- a/tools/asynq/cmd/queue.go +++ b/tools/asynq/cmd/queue.go @@ -9,7 +9,6 @@ import ( "io" "os" - "github.com/MakeNowJust/heredoc/v2" "github.com/fatih/color" "github.com/hibiken/asynq" "github.com/hibiken/asynq/internal/errors" diff --git a/tools/asynq/cmd/root.go b/tools/asynq/cmd/root.go index 655e1eb..67aba8d 100644 --- a/tools/asynq/cmd/root.go +++ b/tools/asynq/cmd/root.go @@ -14,7 +14,6 @@ import ( "unicode" "unicode/utf8" - "github.com/MakeNowJust/heredoc/v2" "github.com/fatih/color" "github.com/go-redis/redis/v8" "github.com/hibiken/asynq" @@ -404,18 +403,22 @@ func getTLSConfig() *tls.Config { // cols is a list of headers and printRow specifies how to print rows. // // Example: -// type User struct { -// Name string -// Addr string -// Age int -// } +// +// type User struct { +// Name string +// Addr string +// Age int +// } +// // data := []*User{{"user1", "addr1", 24}, {"user2", "addr2", 42}, ...} // cols := []string{"Name", "Addr", "Age"} -// printRows := func(w io.Writer, tmpl string) { -// for _, u := range data { -// fmt.Fprintf(w, tmpl, u.Name, u.Addr, u.Age) -// } -// } +// +// printRows := func(w io.Writer, tmpl string) { +// for _, u := range data { +// fmt.Fprintf(w, tmpl, u.Name, u.Addr, u.Age) +// } +// } +// // printTable(cols, printRows) func printTable(cols []string, printRows func(w io.Writer, tmpl string)) { format := strings.Repeat("%v\t", len(cols)) + "\n" diff --git a/tools/asynq/cmd/stats.go b/tools/asynq/cmd/stats.go index 7cb1ccf..571824d 100644 --- a/tools/asynq/cmd/stats.go +++ b/tools/asynq/cmd/stats.go @@ -16,7 +16,6 @@ import ( "time" "unicode/utf8" - "github.com/MakeNowJust/heredoc/v2" "github.com/fatih/color" "github.com/hibiken/asynq/internal/rdb" "github.com/spf13/cobra" diff --git a/tools/asynq/cmd/task.go b/tools/asynq/cmd/task.go index d89ff95..d776f49 100644 --- a/tools/asynq/cmd/task.go +++ b/tools/asynq/cmd/task.go @@ -10,7 +10,6 @@ import ( "os" "time" - "github.com/MakeNowJust/heredoc/v2" "github.com/fatih/color" "github.com/hibiken/asynq" "github.com/spf13/cobra" diff --git a/tools/go.mod b/tools/go.mod index 562f819..f78f1b9 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -21,7 +21,7 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/gdamore/encoding v1.0.0 // indirect diff --git a/tools/go.sum b/tools/go.sum index 9acd7ba..a014a44 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -34,8 +34,9 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/x/go.mod b/x/go.mod index ca28fe3..2ac7d94 100644 --- a/x/go.mod +++ b/x/go.mod @@ -5,6 +5,6 @@ go 1.16 require ( github.com/go-redis/redis/v8 v8.11.4 github.com/google/uuid v1.3.0 - github.com/hibiken/asynq v0.21.0 github.com/prometheus/client_golang v1.11.0 + github.com/hibiken/asynq v0.21.0 ) diff --git a/x/go.sum b/x/go.sum index 66af4ba..09d61d8 100644 --- a/x/go.sum +++ b/x/go.sum @@ -66,8 +66,6 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hibiken/asynq v0.21.0 h1:uH9XogJhjq/S39E0/DEPWLZQ6hHJ73UiblZTe4RzHwA= -github.com/hibiken/asynq v0.21.0/go.mod h1:tyc63ojaW8SJ5SBm8mvI4DDONsguP5HE85EEl4Qr5Ig= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -126,6 +124,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/hibiken/asynq v0.0.2 h1:6fsdyMzVd88R2jgxYeD7tV4I1ZweT8t4BmUJkQbOEag= +github.com/hibiken/asynq v0.0.2/go.mod h1:vCPM/7PjR9zRON0uSxYRW7t8UaGMyMXz2HiH7YoV2cQ= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -139,11 +139,12 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.uber.org/goleak v0.10.0 h1:G3eWbSNIskeRqtsN/1uI5B+eP73y3JUuBsv9AZjehb4= -go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -152,7 +153,9 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -167,6 +170,7 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -178,6 +182,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -196,7 +201,9 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7qvEEgHo3otj+HB5CM7Q= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -214,6 +221,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -241,6 +249,7 @@ google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/l google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/x/rate/semaphore.go b/x/rate/semaphore.go index 5a422a5..6f03321 100644 --- a/x/rate/semaphore.go +++ b/x/rate/semaphore.go @@ -109,6 +109,7 @@ func (s *Semaphore) Close() error { return s.rc.Close() } +// TODO: change this func semaphoreKey(scope string) string { return fmt.Sprintf("asynq:sema:%s", scope) }