Merge pull request 'Update workflows' (#127) from atolstikhin/micro-store-redis:master into master

Reviewed-on: #127

.gitea/workflows/job_lint.yml

@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable' 
+    - name: setup deps
+      run: go get -v ./...
+    - name: run lint
+      uses: https://github.com/golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'

.gitea/workflows/job_test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup deps
+      run: go get -v ./...
+    - name: run test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -0,0 +1,53 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: checkout tests
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        filter: 'blob:none'
+        repository: unistack-org/micro-tests
+        path: micro-tests
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup go work
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests
+    - name: setup deps
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true

.github/workflows/build.yml

@@ -1,46 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: lint
-        uses: golangci/golangci-lint-action@v2
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.github/workflows/pr.yml

@@ -1,46 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: lint
-        uses: golangci/golangci-lint-action@v2
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.golangci.yml

@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true

go.mod

@@ -1,8 +1,14 @@
-module github.com/unistack-org/micro-store-redis/v3
+module go.unistack.org/micro-store-redis/v4
 
-go 1.16
+go 1.20
 
 require (
-	github.com/go-redis/redis/v8 v8.8.2
-	github.com/unistack-org/micro/v3 v3.3.17
+	github.com/redis/go-redis/v9 v9.2.1
+	go.unistack.org/micro/v4 v4.0.7
+)
+
+require (
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 )

go.sum

@@ -1,111 +1,12 @@
-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/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+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/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/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-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.8.2 h1:O/NcHqobw7SEptA0yA6up6spZVFtwE06SXM8rgLtsP8=
-github.com/go-redis/redis/v8 v8.8.2/go.mod h1:F7resOH5Kdug49Otu24RjHWwgK7u9AmtqWMnCV1iP5Y=
-github.com/golang/protobuf v1.2.0/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.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-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.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-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/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-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/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/unistack-org/micro/v3 v3.3.17 h1:WcyS7InP0DlS/JpRQGLh5sG6VstkdHJbgpMp+gmHmwg=
-github.com/unistack-org/micro/v3 v3.3.17/go.mod h1:022EOEZZ789hZY3yB5ZSMXU6jLiadBgcNB/cpediV3c=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
-go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
-go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg=
-go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=
-go.opentelemetry.io/otel/oteltest v0.19.0 h1:YVfA0ByROYqTwOxqHVZYZExzEpfZor+MU1rU+ip2v9Q=
-go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA=
-go.opentelemetry.io/otel/trace v0.19.0 h1:1ucYlenXIDA1OlHVLDZKX0ObXV5RLaq06DtUKz5e5zc=
-go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg=
-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/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-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/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 h1:0PC75Fz/kyMGhL0e1QnypqK2kQMqKt9csD1GnMJR+Zk=
-golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-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/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-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/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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-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.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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=
-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=
+github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
+github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=

options.go

@@ -1,18 +1,12 @@
 package redis
 
 import (
-	"github.com/go-redis/redis/v8"
-	"github.com/unistack-org/micro/v3/store"
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
 )
 
-type configKey struct{}
+type universalConfigKey struct{}
 
-func Config(c *redis.Options) store.Option {
-	return store.SetOption(configKey{}, c)
-}
-
-type clusterConfigKey struct{}
-
-func ClusterConfig(c *redis.ClusterOptions) store.Option {
-	return store.SetOption(clusterConfigKey{}, c)
+func UniversalConfig(c *redis.UniversalOptions) options.Option {
+	return options.ContextOption(universalConfigKey{}, c)
 }

redis.go

@@ -3,66 +3,74 @@ package redis
 import (
 	"context"
 	"fmt"
+	"reflect"
+	"strings"
 	"time"
 
-	"github.com/go-redis/redis/v8"
-	"github.com/unistack-org/micro/v3/store"
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/store"
 )
 
-type rkv struct {
+type Store struct {
 	opts store.Options
-	cli  redisClient
+	cli  redis.UniversalClient
 }
 
-type redisClient interface {
-	Get(ctx context.Context, key string) *redis.StringCmd
-	Del(ctx context.Context, keys ...string) *redis.IntCmd
-	Set(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.StatusCmd
-	Keys(ctx context.Context, pattern string) *redis.StringSliceCmd
-	Exists(ctx context.Context, keys ...string) *redis.IntCmd
-	Close() error
+func (r *Store) Connect(ctx context.Context) error {
+	return r.cli.Ping(ctx).Err()
 }
 
-func (r *rkv) Connect(ctx context.Context) error {
-	return nil
+func (r *Store) Init(opts ...options.Option) error {
+	return r.configure(opts...)
 }
 
-func (r *rkv) Init(opts ...store.Option) error {
-	for _, o := range opts {
-		o(&r.opts)
-	}
-
-	return r.configure()
+func (r *Store) Redis() redis.UniversalClient {
+	return r.cli
 }
 
-func (r *rkv) Disconnect(ctx context.Context) error {
+func (r *Store) Disconnect(ctx context.Context) error {
 	return r.cli.Close()
 }
 
-func (r *rkv) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
-	//options := store.NewReadOptions(opts...)
-	//if len(options.Table) == 0 {
-	//	options.Table = r.opts.Table
-	//}
-	rkey := fmt.Sprintf("%s%s", r.opts.Table, key)
-	st, err := r.cli.Exists(ctx, rkey).Result()
+func (r *Store) Exists(ctx context.Context, key string, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
+	options := store.NewExistsOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", r.opts.Namespace, key)
+	}
+	val, err := r.cli.Exists(ctx, key).Result()
 	if err != nil {
 		return err
 	}
-	if st == 0 {
+	if val == 0 {
 		return store.ErrNotFound
 	}
 	return nil
 }
 
-func (r *rkv) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
+func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
 	options := store.NewReadOptions(opts...)
-	if len(options.Table) == 0 {
-		options.Table = r.opts.Table
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", options.Namespace, key)
 	}
 
-	rkey := fmt.Sprintf("%s%s", options.Table, key)
-	buf, err := r.cli.Get(ctx, rkey).Bytes()
+	buf, err := r.cli.Get(ctx, key).Bytes()
 	if err != nil && err == redis.Nil {
 		return store.ErrNotFound
 	} else if err != nil {
@@ -71,122 +79,311 @@ func (r *rkv) Read(ctx context.Context, key string, val interface{}, opts ...sto
 	if buf == nil {
 		return store.ErrNotFound
 	}
-	/*
-			d, err := r.Client.TTL(rkey).Result()
-			if err != nil {
-				return nil, err
-			}
-
-			records = append(records, &store.Record{
-				Key:    key,
-				Value:  val,
-				Expiry: d,
-			})
-		}
-	*/
 	return r.opts.Codec.Unmarshal(buf, val)
 }
 
-func (r *rkv) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
-	options := store.NewDeleteOptions(opts...)
-	if len(options.Table) == 0 {
-		options.Table = r.opts.Table
+func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...options.Option) error {
+	if len(keys) == 1 {
+		vt := reflect.ValueOf(vals)
+		if vt.Kind() == reflect.Ptr {
+			vt = reflect.Indirect(vt)
+			return r.Read(ctx, keys[0], vt.Index(0).Interface(), opts...)
+		}
+	}
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
+	options := store.NewReadOptions(opts...)
+	rkeys := make([]string, 0, len(keys))
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	for _, key := range keys {
+		if options.Namespace != "" {
+			rkeys = append(rkeys, fmt.Sprintf("%s%s", options.Namespace, key))
+		} else {
+			rkeys = append(rkeys, key)
+		}
 	}
 
-	rkey := fmt.Sprintf("%s%s", options.Table, key)
-	return r.cli.Del(ctx, rkey).Err()
+	rvals, err := r.cli.MGet(ctx, rkeys...).Result()
+	if err != nil && err == redis.Nil {
+		return store.ErrNotFound
+	} else if err != nil {
+		return err
+	}
+	if len(rvals) == 0 {
+		return store.ErrNotFound
+	}
+
+	vv := reflect.ValueOf(vals)
+	vt := reflect.TypeOf(vals)
+	switch vv.Kind() {
+	case reflect.Ptr:
+		vv = reflect.Indirect(vv)
+		vt = vt.Elem()
+	}
+	if vv.Kind() != reflect.Slice {
+		return store.ErrNotFound
+	}
+	nvv := reflect.MakeSlice(vt, len(rvals), len(rvals))
+	vt = vt.Elem()
+	for idx := 0; idx < len(rvals); idx++ {
+		if rvals[idx] == nil {
+			continue
+		}
+
+		itm := nvv.Index(idx)
+		var buf []byte
+		switch b := rvals[idx].(type) {
+		case []byte:
+			buf = b
+		case string:
+			buf = []byte(b)
+		}
+		// special case for raw data
+		if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
+			itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
+		} else {
+			itm.Set(reflect.New(vt.Elem()))
+		}
+		if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
+			return err
+		}
+	}
+	vv.Set(nvv)
+	return nil
 }
 
-func (r *rkv) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
+func (r *Store) MDelete(ctx context.Context, keys []string, opts ...options.Option) error {
+	if len(keys) == 1 {
+		return r.Delete(ctx, keys[0], opts...)
+	}
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
+	options := store.NewDeleteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	if options.Namespace == "" {
+		return r.cli.Del(ctx, keys...).Err()
+	}
+	for idx := range keys {
+		keys[idx] = options.Namespace + keys[idx]
+	}
+	return r.cli.Del(ctx, keys...).Err()
+}
+
+func (r *Store) Delete(ctx context.Context, key string, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
+	options := store.NewDeleteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+	if options.Namespace == "" {
+		return r.cli.Del(ctx, key).Err()
+	}
+	return r.cli.Del(ctx, fmt.Sprintf("%s%s", options.Namespace, key)).Err()
+}
+
+func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...options.Option) error {
+	if len(keys) == 1 {
+		return r.Write(ctx, keys[0], vals[0], opts...)
+	}
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
 	options := store.NewWriteOptions(opts...)
-	if len(options.Table) == 0 {
-		options.Table = r.opts.Table
+	kvs := make([]string, 0, len(keys)*2)
+
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
 	}
 
-	rkey := fmt.Sprintf("%s%s", options.Table, key)
-	buf, err := r.opts.Codec.Marshal(val)
+	for idx, key := range keys {
+		if options.Namespace != "" {
+			kvs = append(kvs, fmt.Sprintf("%s%s", options.Namespace, key))
+		} else {
+			kvs = append(kvs, key)
+		}
+
+		switch vt := vals[idx].(type) {
+		case string:
+			kvs = append(kvs, vt)
+		case []byte:
+			kvs = append(kvs, string(vt))
+		default:
+			buf, err := r.opts.Codec.Marshal(vt)
+			if err != nil {
+				return err
+			}
+			kvs = append(kvs, string(buf))
+		}
+	}
+
+	cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
+		var err error
+		for idx := 0; idx < len(kvs); idx += 2 {
+			if _, err = pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
+				return err
+			}
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}
 
-	return r.cli.Set(ctx, rkey, buf, options.TTL).Err()
-}
-
-func (r *rkv) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
-	options := store.NewListOptions(opts...)
-	if len(options.Table) == 0 {
-		options.Table = r.opts.Table
+	for _, cmd := range cmds {
+		if err = cmd.Err(); err != nil {
+			return err
 		}
-
-	// TODO: add support for prefix/suffix/limit
-	keys, err := r.cli.Keys(ctx, "*").Result()
-	if err != nil {
-		return nil, err
-	}
-
-	return keys, nil
-}
-
-func (r *rkv) Options() store.Options {
-	return r.opts
-}
-
-func (r *rkv) Name() string {
-	return r.opts.Name
-}
-
-func (r *rkv) String() string {
-	return "redis"
-}
-
-func NewStore(opts ...store.Option) store.Store {
-	return &rkv{opts: store.NewOptions(opts...)}
-}
-
-func (r *rkv) configure() error {
-	var redisOptions *redis.Options
-	var redisClusterOptions *redis.ClusterOptions
-	var err error
-
-	nodes := r.opts.Nodes
-
-	if len(nodes) == 0 {
-		nodes = []string{"redis://127.0.0.1:6379"}
-	}
-
-	if r.opts.Context != nil {
-		if c, ok := r.opts.Context.Value(configKey{}).(*redis.Options); ok {
-			redisOptions = c
-		}
-
-		if c, ok := r.opts.Context.Value(clusterConfigKey{}).(*redis.ClusterOptions); ok {
-			redisClusterOptions = c
-		}
-	}
-
-	if redisOptions != nil && redisClusterOptions != nil {
-		return fmt.Errorf("must specify only one option Config or ClusterConfig")
-	}
-
-	if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
-		redisOptions, err = redis.ParseURL(nodes[0])
-		if err != nil {
-			//Backwards compatibility
-			redisOptions = &redis.Options{
-				Addr:     nodes[0],
-				Password: "", // no password set
-				DB:       0,  // use default DB
-			}
-		}
-	} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
-		redisClusterOptions = &redis.ClusterOptions{Addrs: nodes}
-	}
-
-	if redisOptions != nil {
-		r.cli = redis.NewClient(redisOptions)
-	} else if redisClusterOptions != nil {
-		r.cli = redis.NewClusterClient(redisClusterOptions)
 	}
 
 	return nil
 }
+
+func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
+
+	options := store.NewWriteOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+
+	var buf []byte
+	switch vt := val.(type) {
+	case string:
+		buf = []byte(vt)
+	case []byte:
+		buf = vt
+	default:
+		var err error
+		buf, err = r.opts.Codec.Marshal(val)
+		if err != nil {
+			return err
+		}
+	}
+
+	if options.Namespace != "" {
+		key = fmt.Sprintf("%s%s", options.Namespace, key)
+	}
+
+	return r.cli.Set(ctx, key, buf, options.TTL).Err()
+}
+
+func (r *Store) List(ctx context.Context, opts ...options.Option) ([]string, error) {
+	options := store.NewListOptions(opts...)
+	if len(options.Namespace) == 0 {
+		options.Namespace = r.opts.Namespace
+	}
+
+	rkey := fmt.Sprintf("%s%s*", options.Namespace, options.Prefix)
+	if options.Suffix != "" {
+		rkey += options.Suffix
+	}
+	if r.opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
+		defer cancel()
+	}
+	// TODO: add support for prefix/suffix/limit
+	keys, err := r.cli.Keys(ctx, rkey).Result()
+	if err != nil {
+		return nil, err
+	}
+	if options.Namespace == "" {
+		return keys, nil
+	}
+
+	nkeys := make([]string, 0, len(keys))
+	for _, key := range keys {
+		nkeys = append(nkeys, strings.TrimPrefix(key, options.Namespace))
+	}
+	return nkeys, nil
+}
+
+func (r *Store) Options() store.Options {
+	return r.opts
+}
+
+func (r *Store) Name() string {
+	return r.opts.Name
+}
+
+func (r *Store) String() string {
+	return "redis"
+}
+
+func NewStore(opts ...options.Option) *Store {
+	return &Store{opts: store.NewOptions(opts...)}
+}
+
+func (r *Store) configure(opts ...options.Option) error {
+	if r.cli != nil && len(opts) == 0 {
+		return nil
+	}
+
+	var redisUniversalOptions *redis.UniversalOptions
+	var err error
+
+	for _, o := range opts {
+		if err = o(r.opts); err != nil {
+			return err
+		}
+	}
+
+	if r.opts.Context != nil {
+		if c, ok := r.opts.Context.Value(universalConfigKey{}).(*redis.UniversalOptions); ok {
+			redisUniversalOptions = c
+			if r.opts.TLSConfig != nil {
+				redisUniversalOptions.TLSConfig = r.opts.TLSConfig
+			}
+		}
+	}
+
+	if redisUniversalOptions == nil && r.cli != nil {
+		return nil
+	}
+
+	if redisUniversalOptions == nil {
+		redisUniversalOptions = &redis.UniversalOptions{
+			Username:        "",
+			Password:        "", // no password set
+			DB:              0,  // use default DB
+			MaxRetries:      2,
+			MaxRetryBackoff: 256 * time.Millisecond,
+			DialTimeout:     1 * time.Second,
+			ReadTimeout:     1 * time.Second,
+			WriteTimeout:    1 * time.Second,
+			PoolTimeout:     1 * time.Second,
+			MinIdleConns:    10,
+			TLSConfig:       r.opts.TLSConfig,
+		}
+	}
+
+	if len(r.opts.Address) > 0 {
+		redisUniversalOptions.Addrs = r.opts.Address
+	} else if len(redisUniversalOptions.Addrs) == 0 {
+		redisUniversalOptions.Addrs = []string{"redis://127.0.0.1:6379"}
+	}
+
+	r.cli = redis.NewUniversalClient(redisUniversalOptions)
+
+	return nil
+}

redis_test.go

@@ -1,13 +1,15 @@
 package redis
 
 import (
+	"bytes"
 	"context"
 	"os"
 	"testing"
 	"time"
 
-	"github.com/go-redis/redis/v8"
-	"github.com/unistack-org/micro/v3/store"
+	"github.com/redis/go-redis/v9"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/store"
 )
 
 func Test_rkv_configure(t *testing.T) {
@@ -27,44 +29,54 @@ func Test_rkv_configure(t *testing.T) {
 		wantErr bool
 		want    wantValues
 	}{
-		{name: "No Url", fields: fields{options: store.Options{}, Client: nil},
+		{
+			name: "No Url", fields: fields{options: store.Options{}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
 				address:  "127.0.0.1:6379",
-			}},
-		{name: "legacy Url", fields: fields{options: store.Options{Nodes: []string{"127.0.0.1:6379"}}, Client: nil},
+			},
+		},
+		{
+			name: "legacy Url", fields: fields{options: store.Options{Address: []string{"127.0.0.1:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
 				address:  "127.0.0.1:6379",
-			}},
-		{name: "New Url", fields: fields{options: store.Options{Nodes: []string{"redis://127.0.0.1:6379"}}, Client: nil},
+			},
+		},
+		{
+			name: "New Url", fields: fields{options: store.Options{Address: []string{"redis://127.0.0.1:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "",
 				address:  "127.0.0.1:6379",
-			}},
-		{name: "Url with Pwd", fields: fields{options: store.Options{Nodes: []string{"redis://:password@redis:6379"}}, Client: nil},
+			},
+		},
+		{
+			name: "Url with Pwd", fields: fields{options: store.Options{Address: []string{"redis://:password@redis:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "",
 				password: "password",
 				address:  "redis:6379",
-			}},
-		{name: "Url with username and Pwd", fields: fields{options: store.Options{Nodes: []string{"redis://username:password@redis:6379"}}, Client: nil},
+			},
+		},
+		{
+			name: "Url with username and Pwd", fields: fields{options: store.Options{Address: []string{"redis://username:password@redis:6379"}}, Client: nil},
 			wantErr: false, want: wantValues{
 				username: "username",
 				password: "password",
 				address:  "redis:6379",
-			}},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			r := &rkv{
+			rc := &Store{
 				opts: tt.fields.options,
 				cli:  tt.fields.Client,
 			}
-			err := r.configure()
+			err := rc.configure()
 			if (err != nil) != tt.wantErr {
 				t.Errorf("configure() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -79,33 +91,143 @@ func Test_Store(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
 	}
-	r := new(rkv)
+	r := NewStore(options.Address(os.Getenv("STORE_NODES")))
 
-	//r.options = store.Options{Nodes: []string{"redis://:password@127.0.0.1:6379"}}
-	//r.options = store.Options{Nodes: []string{"127.0.0.1:6379"}}
-
-	r.opts = store.NewOptions(store.Nodes(os.Getenv("STORE_NODES")))
-
-	if err := r.configure(); err != nil {
+	if err := r.Init(); err != nil {
+		t.Fatal(err)
+	}
+	if err := r.Connect(ctx); err != nil {
 		t.Fatal(err)
 	}
 
 	key := "myTest"
+	tval := []byte("myValue")
 	var val []byte
-	err := r.Write(ctx, key, []byte("myValue"), store.WriteTTL(2*time.Minute))
+	err := r.Write(ctx, key, tval, store.WriteTTL(2*time.Minute))
 	if err != nil {
 		t.Fatalf("Write error: %v", err)
 	}
-	err = r.Read(ctx, key, val)
+	err = r.Read(ctx, key, &val)
 	if err != nil {
 		t.Fatalf("Read error: %v\n", err)
+	} else if !bytes.Equal(val, tval) {
+		t.Fatalf("read err: data not eq")
 	}
+	keys, err := r.List(ctx)
+	if err != nil {
+		t.Fatalf("List error: %v\n", err)
+	}
+	_ = keys
 	err = r.Delete(ctx, key)
 	if err != nil {
 		t.Fatalf("Delete error: %v\n", err)
 	}
-	_, err = r.List(ctx)
+	// t.Logf("%v", keys)
+}
+
+func Test_MRead(t *testing.T) {
+	ctx := context.Background()
+	var err error
+	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
+		t.Skip()
+	}
+	r := NewStore(options.Address(os.Getenv("STORE_NODES")))
+
+	if err = r.Init(); err != nil {
+		t.Fatal(err)
+	}
+	if err = r.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
+
+	key1 := "myTest1"
+	key2 := "myTest2"
+	tval1 := []byte("myValue1")
+	tval2 := []byte("myValue2")
+	var vals [][]byte
+	err = r.Write(ctx, key1, tval1, store.WriteTTL(2*time.Minute))
+	if err != nil {
+		t.Fatalf("Write error: %v", err)
+	}
+	err = r.Write(ctx, key2, tval2, store.WriteTTL(2*time.Minute))
+	if err != nil {
+		t.Fatalf("Write error: %v", err)
+	}
+	err = r.MRead(ctx, []string{key1, key2}, &vals)
+	if err != nil {
+		t.Fatalf("Read error: %v\n", err)
+	}
+	// t.Logf("%s", vals)
+	_ = vals
+	keys, err := r.List(ctx)
 	if err != nil {
 		t.Fatalf("List error: %v\n", err)
 	}
+	_ = keys
+	// t.Logf("%v", keys)
+	err = r.Delete(ctx, key1)
+	if err != nil {
+		t.Fatalf("Delete error: %v\n", err)
+	}
+	err = r.Delete(ctx, key2)
+	if err != nil {
+		t.Fatalf("Delete error: %v\n", err)
+	}
 }
+
+/*
+func Test_MReadCodec(t *testing.T) {
+	type mytype struct {
+		Key string `json:"name"`
+		Val string `json:"val"`
+	}
+	ctx := context.Background()
+	var err error
+	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
+		t.Skip()
+	}
+	r := NewStore(store.Nodes(os.Getenv("STORE_NODES")), store.Codec(jsoncodec.NewCodec()))
+
+	if err = r.Init(); err != nil {
+		t.Fatal(err)
+	}
+	if err = r.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
+
+	key1 := "myTest1"
+	key2 := "myTest2"
+	key3 := "myTest3"
+	tval1 := &mytype{Key: "key1", Val: "val1"}
+	tval2 := &mytype{Key: "key2", Val: "val2"}
+	var vals []*mytype
+	err = r.Write(ctx, key1, tval1, store.WriteTTL(2*time.Minute))
+	if err != nil {
+		t.Fatalf("Write error: %v", err)
+	}
+	err = r.Write(ctx, key2, tval2, store.WriteTTL(2*time.Minute))
+	if err != nil {
+		t.Fatalf("Write error: %v", err)
+	}
+	err = r.MRead(ctx, []string{key1, key3, key2}, &vals)
+	if err != nil {
+		t.Fatalf("Read error: %v\n", err)
+	}
+	if vals[0].Key != "key1" || vals[1] != nil || vals[2].Key != "key2" {
+		t.Fatalf("read err: struct not filled")
+	}
+	keys, err := r.List(ctx)
+	if err != nil {
+		t.Fatalf("List error: %v\n", err)
+	}
+	_ = keys
+	err = r.Delete(ctx, key1)
+	if err != nil {
+		t.Fatalf("Delete error: %v\n", err)
+	}
+	err = r.Delete(ctx, key2)
+	if err != nil {
+		t.Fatalf("Delete error: %v\n", err)
+	}
+}
+*/