test: add codis integration test (OpenAtomFoundation#2502)

* add codis list test Co-authored-by: liuyuecai <[email protected]>
luky116 · Mar 14, 2024 · e89c8ef · e89c8ef
1 parent 08b394c
commit e89c8ef
Show file tree

Hide file tree

Showing 23 changed files with 2,882 additions and 36 deletions.
diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml
@@ -66,11 +66,13 @@ jobs:
         run: ./pikatests.sh all
 
         # master on port 9221, slave on port 9231, all with 2 db
-      - name: Start pika master and slave
+      - name: Start codis, pika master and pika slave
         working-directory: ${{ github.workspace }}/build
         run: |
           chmod +x ../tests/integration/start_master_and_slave.sh
           ../tests/integration/start_master_and_slave.sh
+          chmod +x ../tests/integration/start_codis.sh
+          ../tests/integration/start_codis.sh
 
       - name: Run Go E2E Tests
         working-directory: ${{ github.workspace }}/build
@@ -136,11 +138,13 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: ./pikatests.sh all
 
-      - name: Start pika master and slave
+      - name: Start codis, pika master and pika slave
         working-directory: ${{ github.workspace }}/build
         run: |
           chmod +x ../tests/integration/start_master_and_slave.sh
           ../tests/integration/start_master_and_slave.sh
+          chmod +x ../tests/integration/start_codis.sh
+          ../tests/integration/start_codis.sh
 
       - name: Run Go E2E Tests
         working-directory: ${{ github.workspace }}/build
@@ -196,11 +200,13 @@ jobs:
         run: |
           ./pikatests.sh all
 
-      - name: Start pika master and slave
+      - name: Start codis, pika master and pika slave
         working-directory: ${{ github.workspace }}/build
         run: |
           chmod +x ../tests/integration/start_master_and_slave.sh
           ../tests/integration/start_master_and_slave.sh
+          chmod +x ../tests/integration/start_codis.sh
+          ../tests/integration/start_codis.sh
 
       - name: Run Go E2E Tests
         working-directory: ${{ github.workspace }}/build

diff --git a/codis/go.mod b/codis/go.mod
@@ -18,6 +18,7 @@ require (
 	github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11
 	github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
 	github.com/spinlock/jemalloc-go v0.0.0-20201010032256-e81523fb8524
+	github.com/stretchr/testify v1.8.0
 	go.etcd.io/etcd/client/v2 v2.305.7
 	golang.org/x/net v0.17.0
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0
@@ -26,10 +27,13 @@ require (
 require (
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/codis/go.sum b/codis/go.sum
@@ -41,8 +41,11 @@ github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414/go.mod h1:gi+0
 github.com/spinlock/jemalloc-go v0.0.0-20201010032256-e81523fb8524 h1:U+dpuWn15gFCqZkqhpUd5a85X1Oe1Tb+DeGF3nn6Bvs=
 github.com/spinlock/jemalloc-go v0.0.0-20201010032256-e81523fb8524/go.mod h1:A/ik9Cf2cSgEVcmTWlvTfCxyFgoL1UP/WbevsdDeguc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
 go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
 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=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 gopkg.in/alexcesaro/statsd.v2 v2.0.0 h1:FXkZSCZIH17vLCO5sO2UucTHsH9pc+17F6pl3JVCwMc=
 gopkg.in/alexcesaro/statsd.v2 v2.0.0/go.mod h1:i0ubccKGzBVNBpdGV5MocxyA/XlLUJzA7SLonnE4drU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/codis/pkg/proxy/mapper.go b/codis/pkg/proxy/mapper.go
@@ -96,8 +96,8 @@ func init() {
 		{"DISCARD", FlagNotAllow},
 		{"DUMP", 0},
 		{"ECHO", 0},
-		{"EVAL", FlagWrite},
-		{"EVALSHA", FlagWrite},
+		{"EVAL", FlagNotAllow},
+		{"EVALSHA", FlagNotAllow},
 		{"EXEC", FlagNotAllow},
 		{"EXISTS", 0},
 		{"EXPIRE", FlagWrite},
@@ -161,7 +161,7 @@ func init() {
 		{"PFADD", FlagWrite},
 		{"PFCOUNT", 0},
 		{"PFDEBUG", FlagWrite},
-		{"PFMERGE", FlagWrite},
+		{"PFMERGE", FlagNotAllow},
 		{"PFSELFTEST", 0},
 		{"PING", 0},
 		{"POST", FlagNotAllow},
@@ -183,15 +183,15 @@ func init() {
 		{"RESTORE-ASKING", FlagWrite | FlagNotAllow},
 		{"ROLE", 0},
 		{"RPOP", FlagWrite},
-		{"RPOPLPUSH", FlagWrite},
+		{"RPOPLPUSH", FlagNotAllow},
 		{"RPUSH", FlagWrite},
 		{"RPUSHX", FlagWrite},
 		{"SADD", FlagWrite},
 		{"SAVE", FlagNotAllow},
 		{"SCAN", FlagMasterOnly | FlagNotAllow},
 		{"SCARD", 0},
 		{"SCRIPT", FlagNotAllow},
-		{"SDIFF", 0},
+		{"SDIFF", FlagNotAllow},
 		{"SDIFFSTORE", FlagWrite},
 		{"SELECT", 0},
 		{"SET", FlagWrite},
@@ -200,8 +200,8 @@ func init() {
 		{"SETNX", FlagWrite},
 		{"SETRANGE", FlagWrite},
 		{"SHUTDOWN", FlagNotAllow},
-		{"SINTER", 0},
-		{"SINTERSTORE", FlagWrite},
+		{"SINTER", FlagNotAllow},
+		{"SINTERSTORE", FlagNotAllow},
 		{"SISMEMBER", 0},
 		{"SLAVEOF", FlagNotAllow},
 		{"SLOTSCHECK", FlagNotAllow},
@@ -228,7 +228,7 @@ func init() {
 		{"SLOTSSCAN", FlagMasterOnly},
 		{"SLOWLOG", FlagNotAllow},
 		{"SMEMBERS", 0},
-		{"SMOVE", FlagWrite},
+		{"SMOVE", FlagNotAllow},
 		{"SORT", FlagWrite},
 		{"SPOP", FlagWrite},
 		{"SRANDMEMBER", 0},
@@ -237,8 +237,8 @@ func init() {
 		{"STRLEN", 0},
 		{"SUBSCRIBE", FlagNotAllow},
 		{"SUBSTR", 0},
-		{"SUNION", 0},
-		{"SUNIONSTORE", FlagWrite},
+		{"SUNION", FlagNotAllow},
+		{"SUNIONSTORE", FlagNotAllow},
 		{"SYNC", FlagNotAllow},
 		{"PCONFIG", 0},
 		{"TIME", FlagNotAllow},
@@ -253,7 +253,7 @@ func init() {
 		{"ZCARD", 0},
 		{"ZCOUNT", 0},
 		{"ZINCRBY", FlagWrite},
-		{"ZINTERSTORE", FlagWrite},
+		{"ZINTERSTORE", FlagNotAllow},
 		{"ZLEXCOUNT", 0},
 		{"ZRANGE", 0},
 		{"ZRANGEBYLEX", 0},
@@ -269,7 +269,7 @@ func init() {
 		{"ZREVRANK", 0},
 		{"ZSCAN", FlagMasterOnly},
 		{"ZSCORE", 0},
-		{"ZUNIONSTORE", FlagWrite},
+		{"ZUNIONSTORE", FlagNotAllow},
 	} {
 		opTable[i.Name] = i
 	}

diff --git a/tests/integration/acl_test.go b/tests/integration/acl_test.go
@@ -2,6 +2,7 @@ package pika_integration
 
 import (
 	"context"
+
 	. "github.com/bsm/ginkgo/v2"
 	. "github.com/bsm/gomega"
 	"github.com/redis/go-redis/v9"