Skip to content

Commit 9c132a5

Browse files
luky116liuyuecai
luky116
and
liuyuecai
authored
test: add codis integration test (OpenAtomFoundation#2502)
* add codis list test Co-authored-by: liuyuecai <liuyuecai@360.cn>
1 parent 32a793b commit 9c132a5

23 files changed

Lines changed: 2882 additions & 36 deletions

‎.github/workflows/pika.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ jobs:
6666
run: ./pikatests.sh all
6767

6868
# master on port 9221, slave on port 9231, all with 2 db
69-
- name: Start pika master and slave
69+
- name: Start codis, pika master and pika slave
7070
working-directory: ${{ github.workspace }}/build
7171
run: |
7272
chmod +x ../tests/integration/start_master_and_slave.sh
7373
../tests/integration/start_master_and_slave.sh
74+
chmod +x ../tests/integration/start_codis.sh
75+
../tests/integration/start_codis.sh
7476
7577
- name: Run Go E2E Tests
7678
working-directory: ${{ github.workspace }}/build
@@ -136,11 +138,13 @@ jobs:
136138
working-directory: ${{ github.workspace }}
137139
run: ./pikatests.sh all
138140

139-
- name: Start pika master and slave
141+
- name: Start codis, pika master and pika slave
140142
working-directory: ${{ github.workspace }}/build
141143
run: |
142144
chmod +x ../tests/integration/start_master_and_slave.sh
143145
../tests/integration/start_master_and_slave.sh
146+
chmod +x ../tests/integration/start_codis.sh
147+
../tests/integration/start_codis.sh
144148
145149
- name: Run Go E2E Tests
146150
working-directory: ${{ github.workspace }}/build
@@ -196,11 +200,13 @@ jobs:
196200
run: |
197201
./pikatests.sh all
198202
199-
- name: Start pika master and slave
203+
- name: Start codis, pika master and pika slave
200204
working-directory: ${{ github.workspace }}/build
201205
run: |
202206
chmod +x ../tests/integration/start_master_and_slave.sh
203207
../tests/integration/start_master_and_slave.sh
208+
chmod +x ../tests/integration/start_codis.sh
209+
../tests/integration/start_codis.sh
204210
205211
- name: Run Go E2E Tests
206212
working-directory: ${{ github.workspace }}/build

‎codis/go.mod‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ require (
1818
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11
1919
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
2020
github.com/spinlock/jemalloc-go v0.0.0-20201010032256-e81523fb8524
21+
github.com/stretchr/testify v1.8.0
2122
go.etcd.io/etcd/client/v2 v2.305.7
2223
golang.org/x/net v0.17.0
2324
gopkg.in/alexcesaro/statsd.v2 v2.0.0
@@ -26,10 +27,13 @@ require (
2627
require (
2728
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
2829
github.com/coreos/go-semver v0.3.1 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
2931
github.com/json-iterator/go v1.1.12 // indirect
3032
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3133
github.com/modern-go/reflect2 v1.0.2 // indirect
3234
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
35+
github.com/pmezard/go-difflib v1.0.0 // indirect
3336
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
3437
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
38+
gopkg.in/yaml.v3 v3.0.1 // indirect
3539
)

‎codis/go.sum‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414/go.mod h1:gi+0
4141
github.com/spinlock/jemalloc-go v0.0.0-20201010032256-e81523fb8524 h1:U+dpuWn15gFCqZkqhpUd5a85X1Oe1Tb+DeGF3nn6Bvs=
4242
github.com/spinlock/jemalloc-go v0.0.0-20201010032256-e81523fb8524/go.mod h1:A/ik9Cf2cSgEVcmTWlvTfCxyFgoL1UP/WbevsdDeguc=
4343
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
44+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
4445
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
46+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
4547
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
48+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
4649
go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
4750
go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
4851
go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
@@ -53,6 +56,8 @@ golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
5356
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
5457
gopkg.in/alexcesaro/statsd.v2 v2.0.0 h1:FXkZSCZIH17vLCO5sO2UucTHsH9pc+17F6pl3JVCwMc=
5558
gopkg.in/alexcesaro/statsd.v2 v2.0.0/go.mod h1:i0ubccKGzBVNBpdGV5MocxyA/XlLUJzA7SLonnE4drU=
59+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5660
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
61+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5762
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5863
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎codis/pkg/proxy/mapper.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ func init() {
9696
{"DISCARD", FlagNotAllow},
9797
{"DUMP", 0},
9898
{"ECHO", 0},
99-
{"EVAL", FlagWrite},
100-
{"EVALSHA", FlagWrite},
99+
{"EVAL", FlagNotAllow},
100+
{"EVALSHA", FlagNotAllow},
101101
{"EXEC", FlagNotAllow},
102102
{"EXISTS", 0},
103103
{"EXPIRE", FlagWrite},
@@ -161,7 +161,7 @@ func init() {
161161
{"PFADD", FlagWrite},
162162
{"PFCOUNT", 0},
163163
{"PFDEBUG", FlagWrite},
164-
{"PFMERGE", FlagWrite},
164+
{"PFMERGE", FlagNotAllow},
165165
{"PFSELFTEST", 0},
166166
{"PING", 0},
167167
{"POST", FlagNotAllow},
@@ -183,15 +183,15 @@ func init() {
183183
{"RESTORE-ASKING", FlagWrite | FlagNotAllow},
184184
{"ROLE", 0},
185185
{"RPOP", FlagWrite},
186-
{"RPOPLPUSH", FlagWrite},
186+
{"RPOPLPUSH", FlagNotAllow},
187187
{"RPUSH", FlagWrite},
188188
{"RPUSHX", FlagWrite},
189189
{"SADD", FlagWrite},
190190
{"SAVE", FlagNotAllow},
191191
{"SCAN", FlagMasterOnly | FlagNotAllow},
192192
{"SCARD", 0},
193193
{"SCRIPT", FlagNotAllow},
194-
{"SDIFF", 0},
194+
{"SDIFF", FlagNotAllow},
195195
{"SDIFFSTORE", FlagWrite},
196196
{"SELECT", 0},
197197
{"SET", FlagWrite},
@@ -200,8 +200,8 @@ func init() {
200200
{"SETNX", FlagWrite},
201201
{"SETRANGE", FlagWrite},
202202
{"SHUTDOWN", FlagNotAllow},
203-
{"SINTER", 0},
204-
{"SINTERSTORE", FlagWrite},
203+
{"SINTER", FlagNotAllow},
204+
{"SINTERSTORE", FlagNotAllow},
205205
{"SISMEMBER", 0},
206206
{"SLAVEOF", FlagNotAllow},
207207
{"SLOTSCHECK", FlagNotAllow},
@@ -228,7 +228,7 @@ func init() {
228228
{"SLOTSSCAN", FlagMasterOnly},
229229
{"SLOWLOG", FlagNotAllow},
230230
{"SMEMBERS", 0},
231-
{"SMOVE", FlagWrite},
231+
{"SMOVE", FlagNotAllow},
232232
{"SORT", FlagWrite},
233233
{"SPOP", FlagWrite},
234234
{"SRANDMEMBER", 0},
@@ -237,8 +237,8 @@ func init() {
237237
{"STRLEN", 0},
238238
{"SUBSCRIBE", FlagNotAllow},
239239
{"SUBSTR", 0},
240-
{"SUNION", 0},
241-
{"SUNIONSTORE", FlagWrite},
240+
{"SUNION", FlagNotAllow},
241+
{"SUNIONSTORE", FlagNotAllow},
242242
{"SYNC", FlagNotAllow},
243243
{"PCONFIG", 0},
244244
{"TIME", FlagNotAllow},
@@ -253,7 +253,7 @@ func init() {
253253
{"ZCARD", 0},
254254
{"ZCOUNT", 0},
255255
{"ZINCRBY", FlagWrite},
256-
{"ZINTERSTORE", FlagWrite},
256+
{"ZINTERSTORE", FlagNotAllow},
257257
{"ZLEXCOUNT", 0},
258258
{"ZRANGE", 0},
259259
{"ZRANGEBYLEX", 0},
@@ -269,7 +269,7 @@ func init() {
269269
{"ZREVRANK", 0},
270270
{"ZSCAN", FlagMasterOnly},
271271
{"ZSCORE", 0},
272-
{"ZUNIONSTORE", FlagWrite},
272+
{"ZUNIONSTORE", FlagNotAllow},
273273
} {
274274
opTable[i.Name] = i
275275
}

‎tests/integration/acl_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package pika_integration
22

33
import (
44
"context"
5+
56
. "github.com/bsm/ginkgo/v2"
67
. "github.com/bsm/gomega"
78
"github.com/redis/go-redis/v9"

0 commit comments

Comments
 (0)