Compare commits
No commits in common. "v3" and "v3.10.1" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
.idea
|
|
||||||
19
go.mod
19
go.mod
@ -1,19 +1,10 @@
|
|||||||
module go.unistack.org/micro-store-redis/v3
|
module go.unistack.org/micro-store-redis/v3
|
||||||
|
|
||||||
go 1.22
|
go 1.16
|
||||||
|
|
||||||
toolchain go1.22.4
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2
|
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||||
github.com/redis/go-redis/v9 v9.6.2
|
github.com/go-redis/redis/v8 v8.11.5
|
||||||
go.unistack.org/micro/v3 v3.10.97
|
go.unistack.org/micro/v3 v3.10.18
|
||||||
)
|
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
|
||||||
github.com/google/go-cmp v0.6.0 // indirect
|
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1 // indirect
|
|
||||||
google.golang.org/protobuf v1.35.1 // indirect
|
|
||||||
)
|
)
|
||||||
|
|||||||
138
go.sum
138
go.sum
@ -1,20 +1,122 @@
|
|||||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||||
|
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
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 h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
||||||
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2 h1:oBlErygFka9FAVfowzW7sRUfB7n31YX0aFzfaOflM3w=
|
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||||
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2/go.mod h1:jYLUE5tC8UsFnpSclhEjZlFLMMtHH4jTfFMnshNWkoo=
|
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
|
||||||
github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
|
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
|
||||||
github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
|
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
|
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
|
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||||
go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
|
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||||
go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
|
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
||||||
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
|
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||||
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||||
|
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
|
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
|
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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
|
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||||
|
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
|
||||||
|
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
||||||
|
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
|
||||||
|
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
||||||
|
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.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
|
||||||
|
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
||||||
|
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
||||||
|
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
|
||||||
|
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.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
||||||
|
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
|
||||||
|
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
|
||||||
|
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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
|
go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE=
|
||||||
|
go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
|
||||||
|
go.unistack.org/micro/v3 v3.10.18 h1:iz193N8eZKGrKPXuX6XMsGIRHMqdvUaZSfb9mzwlUYM=
|
||||||
|
go.unistack.org/micro/v3 v3.10.18/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
|
||||||
|
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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
|
||||||
|
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
|
||||||
|
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
|
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-20191204072324-ce4227a45e2e/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/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/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/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
|
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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
|
||||||
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
|
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=
|
||||||
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
|
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/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.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
55
options.go
55
options.go
@ -1,67 +1,18 @@
|
|||||||
package redis
|
package redis
|
||||||
|
|
||||||
import (
|
import (
|
||||||
goredis "github.com/redis/go-redis/v9"
|
"github.com/go-redis/redis/v8"
|
||||||
"go.unistack.org/micro/v3/logger"
|
|
||||||
"go.unistack.org/micro/v3/meter"
|
|
||||||
"go.unistack.org/micro/v3/store"
|
"go.unistack.org/micro/v3/store"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type configKey struct{}
|
type configKey struct{}
|
||||||
|
|
||||||
func Config(c *goredis.Options) store.Option {
|
func Config(c *redis.Options) store.Option {
|
||||||
return store.SetOption(configKey{}, c)
|
return store.SetOption(configKey{}, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
type clusterConfigKey struct{}
|
type clusterConfigKey struct{}
|
||||||
|
|
||||||
func ClusterConfig(c *goredis.ClusterOptions) store.Option {
|
func ClusterConfig(c *redis.ClusterOptions) store.Option {
|
||||||
return store.SetOption(clusterConfigKey{}, c)
|
return store.SetOption(clusterConfigKey{}, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
type universalConfigKey struct{}
|
|
||||||
|
|
||||||
func UniversalConfig(c *goredis.UniversalOptions) store.Option {
|
|
||||||
return store.SetOption(universalConfigKey{}, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
labelHost = "redis_host"
|
|
||||||
labelName = "redis_name"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Options struct holds wrapper options
|
|
||||||
type Options struct {
|
|
||||||
Logger logger.Logger
|
|
||||||
Meter meter.Meter
|
|
||||||
Tracer tracer.Tracer
|
|
||||||
RedisHost string
|
|
||||||
RedisName string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Option func signature
|
|
||||||
type Option func(*Options)
|
|
||||||
|
|
||||||
// NewOptions create new Options struct from provided option slice
|
|
||||||
func NewOptions(opts ...Option) Options {
|
|
||||||
options := Options{
|
|
||||||
Logger: logger.DefaultLogger,
|
|
||||||
Meter: meter.DefaultMeter,
|
|
||||||
Tracer: tracer.DefaultTracer,
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, o := range opts {
|
|
||||||
o(&options)
|
|
||||||
}
|
|
||||||
|
|
||||||
options.Meter = options.Meter.Clone(
|
|
||||||
meter.Labels(
|
|
||||||
labelHost, options.RedisHost,
|
|
||||||
labelName, options.RedisName),
|
|
||||||
)
|
|
||||||
|
|
||||||
options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))
|
|
||||||
|
|
||||||
return options
|
|
||||||
}
|
|
||||||
|
|||||||
771
redis.go
771
redis.go
@ -1,267 +1,131 @@
|
|||||||
package redis
|
package redis // import "go.unistack.org/micro-store-redis/v3"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
goredis "github.com/redis/go-redis/v9"
|
"github.com/go-redis/redis/v8"
|
||||||
"go.unistack.org/micro/v3/semconv"
|
|
||||||
"go.unistack.org/micro/v3/store"
|
"go.unistack.org/micro/v3/store"
|
||||||
pool "go.unistack.org/micro/v3/util/xpool"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
type rkv struct {
|
||||||
DefaultPathSeparator = "/"
|
|
||||||
|
|
||||||
DefaultUniversalOptions = &goredis.UniversalOptions{
|
|
||||||
Username: "",
|
|
||||||
Password: "", // no password set
|
|
||||||
MaxRetries: 2,
|
|
||||||
MaxRetryBackoff: 256 * time.Millisecond,
|
|
||||||
DialTimeout: 1 * time.Second,
|
|
||||||
ReadTimeout: 1 * time.Second,
|
|
||||||
WriteTimeout: 1 * time.Second,
|
|
||||||
PoolTimeout: 1 * time.Second,
|
|
||||||
MinIdleConns: 10,
|
|
||||||
}
|
|
||||||
|
|
||||||
DefaultClusterOptions = &goredis.ClusterOptions{
|
|
||||||
Username: "",
|
|
||||||
Password: "", // no password set
|
|
||||||
MaxRetries: 2,
|
|
||||||
MaxRetryBackoff: 256 * time.Millisecond,
|
|
||||||
DialTimeout: 1 * time.Second,
|
|
||||||
ReadTimeout: 1 * time.Second,
|
|
||||||
WriteTimeout: 1 * time.Second,
|
|
||||||
PoolTimeout: 1 * time.Second,
|
|
||||||
MinIdleConns: 10,
|
|
||||||
}
|
|
||||||
|
|
||||||
DefaultOptions = &goredis.Options{
|
|
||||||
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,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
type Store struct {
|
|
||||||
opts store.Options
|
opts store.Options
|
||||||
cli goredis.UniversalClient
|
cli redisClient
|
||||||
done chan struct{}
|
|
||||||
pool *pool.StringsPool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Connect(ctx context.Context) error {
|
type redisClient interface {
|
||||||
if r.cli == nil {
|
Get(ctx context.Context, key string) *redis.StringCmd
|
||||||
return store.ErrNotConnected
|
Del(ctx context.Context, keys ...string) *redis.IntCmd
|
||||||
}
|
Set(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.StatusCmd
|
||||||
err := r.cli.Ping(ctx).Err()
|
Keys(ctx context.Context, pattern string) *redis.StringSliceCmd
|
||||||
setSpanError(ctx, err)
|
MGet(ctx context.Context, keys ...string) *redis.SliceCmd
|
||||||
return err
|
MSet(ctx context.Context, kv ...interface{}) *redis.StatusCmd
|
||||||
|
Exists(ctx context.Context, keys ...string) *redis.IntCmd
|
||||||
|
Ping(ctx context.Context) *redis.StatusCmd
|
||||||
|
Close() error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Init(opts ...store.Option) error {
|
func (r *rkv) Connect(ctx context.Context) error {
|
||||||
|
return r.cli.Ping(ctx).Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *rkv) Init(opts ...store.Option) error {
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&r.opts)
|
o(&r.opts)
|
||||||
}
|
}
|
||||||
|
|
||||||
err := r.configure()
|
return r.configure()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *rkv) Disconnect(ctx context.Context) error {
|
||||||
|
return r.cli.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *rkv) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
if r.opts.Timeout > 0 {
|
||||||
|
var cancel context.CancelFunc
|
||||||
|
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
||||||
|
defer cancel()
|
||||||
|
}
|
||||||
|
val, err := r.cli.Exists(ctx, key).Result()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if val == 0 {
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) Client() *goredis.Client {
|
|
||||||
if c, ok := r.cli.(*goredis.Client); ok {
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) UniversalClient() goredis.UniversalClient {
|
|
||||||
return r.cli
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) ClusterClient() *goredis.ClusterClient {
|
|
||||||
if c, ok := r.cli.(*goredis.ClusterClient); ok {
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) Disconnect(ctx context.Context) error {
|
|
||||||
var err error
|
|
||||||
select {
|
|
||||||
case <-r.done:
|
|
||||||
return err
|
|
||||||
default:
|
|
||||||
if r.cli != nil {
|
|
||||||
err = r.cli.Close()
|
|
||||||
}
|
|
||||||
close(r.done)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
|
|
||||||
b := r.pool.Get()
|
|
||||||
defer r.pool.Put(b)
|
|
||||||
options := store.NewExistsOptions(opts...)
|
|
||||||
labels := make([]string, 0, 6)
|
|
||||||
labels = append(labels, "name", options.Name, "statement", "exists")
|
|
||||||
|
|
||||||
timeout := r.opts.Timeout
|
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
|
||||||
|
|
||||||
if timeout > 0 {
|
|
||||||
var cancel context.CancelFunc
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
|
||||||
defer cancel()
|
|
||||||
}
|
|
||||||
|
|
||||||
rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
|
|
||||||
ts := time.Now()
|
|
||||||
val, err := r.cli.Exists(ctx, rkey).Result()
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
te := time.Since(ts)
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
|
|
||||||
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
|
|
||||||
if errors.Is(err, goredis.Nil) || (err == nil && val == 0) {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
|
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
|
|
||||||
} else if err != nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
|
func (r *rkv) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
|
||||||
b := r.pool.Get()
|
|
||||||
defer r.pool.Put(b)
|
|
||||||
|
|
||||||
options := store.NewReadOptions(opts...)
|
options := store.NewReadOptions(opts...)
|
||||||
labels := make([]string, 0, 6)
|
if len(options.Namespace) == 0 {
|
||||||
labels = append(labels, "name", options.Name, "statement", "read")
|
options.Namespace = r.opts.Namespace
|
||||||
|
|
||||||
timeout := r.opts.Timeout
|
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
}
|
||||||
|
if options.Namespace != "" {
|
||||||
if timeout > 0 {
|
key = fmt.Sprintf("%s%s", options.Namespace, key)
|
||||||
|
}
|
||||||
|
if r.opts.Timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
buf, err := r.cli.Get(ctx, key).Bytes()
|
||||||
rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
|
if err != nil && err == redis.Nil {
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
|
|
||||||
ts := time.Now()
|
|
||||||
buf, err := r.cli.Get(ctx, rkey).Bytes()
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
te := time.Since(ts)
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
|
|
||||||
if errors.Is(err, goredis.Nil) || (err == nil && buf == nil) {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
|
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
|
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if buf == nil {
|
||||||
switch b := val.(type) {
|
return store.ErrNotFound
|
||||||
case *[]byte:
|
|
||||||
*b = buf
|
|
||||||
case *string:
|
|
||||||
*b = string(buf)
|
|
||||||
default:
|
|
||||||
if err = r.opts.Codec.Unmarshal(buf, val); err != nil {
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
return r.opts.Codec.Unmarshal(buf, val)
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
|
func (r *rkv) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
|
||||||
options := store.NewReadOptions(opts...)
|
if len(keys) == 1 {
|
||||||
|
vt := reflect.ValueOf(vals)
|
||||||
timeout := r.opts.Timeout
|
if vt.Kind() == reflect.Ptr {
|
||||||
if options.Timeout > 0 {
|
vt = reflect.Indirect(vt)
|
||||||
timeout = options.Timeout
|
return r.Read(ctx, keys[0], vt.Index(0).Interface(), opts...)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
options := store.NewReadOptions(opts...)
|
||||||
if timeout > 0 {
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if r.opts.Timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
rvals, err := r.cli.MGet(ctx, rkeys...).Result()
|
||||||
var rkeys []string
|
if err != nil && err == redis.Nil {
|
||||||
var pools []*strings.Builder
|
|
||||||
if r.opts.Namespace != "" || options.Namespace != "" {
|
|
||||||
rkeys = make([]string, len(keys))
|
|
||||||
pools = make([]*strings.Builder, len(keys))
|
|
||||||
for idx, key := range keys {
|
|
||||||
b := r.pool.Get()
|
|
||||||
pools[idx] = b
|
|
||||||
rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
|
|
||||||
ts := time.Now()
|
|
||||||
var rvals []interface{}
|
|
||||||
var err error
|
|
||||||
if r.opts.Namespace != "" || options.Namespace != "" {
|
|
||||||
rvals, err = r.cli.MGet(ctx, rkeys...).Result()
|
|
||||||
for idx := range pools {
|
|
||||||
r.pool.Put(pools[idx])
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
rvals, err = r.cli.MGet(ctx, keys...).Result()
|
|
||||||
}
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
te := time.Since(ts)
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
if err == goredis.Nil || (len(rvals) == 0) {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
|
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
|
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if len(rvals) == 0 {
|
||||||
|
return store.ErrNotFound
|
||||||
|
}
|
||||||
|
|
||||||
vv := reflect.ValueOf(vals)
|
vv := reflect.ValueOf(vals)
|
||||||
vt := reflect.TypeOf(vals)
|
vt := reflect.TypeOf(vals)
|
||||||
@ -291,454 +155,181 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
|
|||||||
// special case for raw data
|
// special case for raw data
|
||||||
if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
|
if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
|
||||||
itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
|
itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
|
||||||
itm.SetBytes(buf)
|
} else {
|
||||||
continue
|
itm.Set(reflect.New(vt.Elem()))
|
||||||
} else if vt.Kind() == reflect.String {
|
|
||||||
itm.SetString(string(buf))
|
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
|
|
||||||
itm.Set(reflect.New(vt.Elem()))
|
|
||||||
if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
|
if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
|
||||||
setSpanError(ctx, err)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
vv.Set(nvv)
|
vv.Set(nvv)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
|
func (r *rkv) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
|
||||||
options := store.NewDeleteOptions(opts...)
|
options := store.NewDeleteOptions(opts...)
|
||||||
|
if len(options.Namespace) == 0 {
|
||||||
timeout := r.opts.Timeout
|
options.Namespace = r.opts.Namespace
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
}
|
||||||
|
if options.Namespace == "" {
|
||||||
if timeout > 0 {
|
return r.cli.Del(ctx, key).Err()
|
||||||
|
}
|
||||||
|
if r.opts.Timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
return r.cli.Del(ctx, fmt.Sprintf("%s%s", options.Namespace, key)).Err()
|
||||||
var rkeys []string
|
|
||||||
var pools []*strings.Builder
|
|
||||||
if r.opts.Namespace != "" || options.Namespace != "" {
|
|
||||||
rkeys = make([]string, len(keys))
|
|
||||||
pools = make([]*strings.Builder, len(keys))
|
|
||||||
for idx, key := range keys {
|
|
||||||
b := r.pool.Get()
|
|
||||||
pools[idx] = b
|
|
||||||
rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
|
|
||||||
ts := time.Now()
|
|
||||||
var err error
|
|
||||||
if r.opts.Namespace != "" || options.Namespace != "" {
|
|
||||||
err = r.cli.Del(ctx, rkeys...).Err()
|
|
||||||
for idx := range pools {
|
|
||||||
r.pool.Put(pools[idx])
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
err = r.cli.Del(ctx, keys...).Err()
|
|
||||||
}
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
te := time.Since(ts)
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
if err == goredis.Nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
|
|
||||||
return store.ErrNotFound
|
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
|
|
||||||
} else if err != nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
|
func (r *rkv) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
|
||||||
b := r.pool.Get()
|
|
||||||
defer r.pool.Put(b)
|
|
||||||
|
|
||||||
options := store.NewDeleteOptions(opts...)
|
|
||||||
labels := make([]string, 0, 6)
|
|
||||||
labels = append(labels, "name", options.Name, "statement", "delete")
|
|
||||||
|
|
||||||
timeout := r.opts.Timeout
|
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
|
||||||
|
|
||||||
if timeout > 0 {
|
|
||||||
var cancel context.CancelFunc
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
|
||||||
defer cancel()
|
|
||||||
}
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
|
|
||||||
ts := time.Now()
|
|
||||||
err := r.cli.Del(ctx, r.getKey(b, r.opts.Namespace, options.Namespace, key)).Err()
|
|
||||||
te := time.Since(ts)
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
|
|
||||||
if errors.Is(err, goredis.Nil) {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
|
|
||||||
return store.ErrNotFound
|
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
|
|
||||||
} else if err != nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
|
|
||||||
options := store.NewWriteOptions(opts...)
|
options := store.NewWriteOptions(opts...)
|
||||||
|
if len(options.Namespace) == 0 {
|
||||||
timeout := r.opts.Timeout
|
options.Namespace = r.opts.Namespace
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
}
|
||||||
|
buf, err := r.opts.Codec.Marshal(val)
|
||||||
if timeout > 0 {
|
if err != nil {
|
||||||
var cancel context.CancelFunc
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
|
||||||
defer cancel()
|
|
||||||
}
|
|
||||||
|
|
||||||
kvs := make([]string, 0, len(keys)*2)
|
|
||||||
pools := make([]*strings.Builder, len(keys))
|
|
||||||
for idx, key := range keys {
|
|
||||||
b := r.pool.Get()
|
|
||||||
pools[idx] = b
|
|
||||||
kvs = append(kvs, r.getKey(b, r.opts.Namespace, options.Namespace, 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))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
|
|
||||||
|
|
||||||
pipeliner := func(pipe goredis.Pipeliner) error {
|
|
||||||
for idx := 0; idx < len(kvs); idx += 2 {
|
|
||||||
if _, err := pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
ts := time.Now()
|
|
||||||
cmds, err := r.cli.Pipelined(ctx, pipeliner)
|
|
||||||
for idx := range pools {
|
|
||||||
r.pool.Put(pools[idx])
|
|
||||||
}
|
|
||||||
te := time.Since(ts)
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
if err == goredis.Nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
|
|
||||||
return store.ErrNotFound
|
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
|
|
||||||
} else if err != nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if options.Namespace != "" {
|
||||||
for _, cmd := range cmds {
|
key = fmt.Sprintf("%s%s", options.Namespace, key)
|
||||||
if err = cmd.Err(); err != nil {
|
|
||||||
if err == goredis.Nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
|
|
||||||
return store.ErrNotFound
|
|
||||||
}
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if r.opts.Timeout > 0 {
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
|
|
||||||
b := r.pool.Get()
|
|
||||||
defer r.pool.Put(b)
|
|
||||||
|
|
||||||
options := store.NewWriteOptions(opts...)
|
|
||||||
labels := make([]string, 0, 6)
|
|
||||||
labels = append(labels, "name", options.Name, "statement", "write")
|
|
||||||
|
|
||||||
timeout := r.opts.Timeout
|
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
|
||||||
|
|
||||||
if timeout > 0 {
|
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
return r.cli.Set(ctx, key, buf, options.TTL).Err()
|
||||||
rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
|
|
||||||
ts := time.Now()
|
|
||||||
err := r.cli.Set(ctx, rkey, buf, options.TTL).Err()
|
|
||||||
te := time.Since(ts)
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
|
|
||||||
if errors.Is(err, goredis.Nil) {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
|
|
||||||
return store.ErrNotFound
|
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
|
|
||||||
} else if err != nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
|
func (r *rkv) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
|
||||||
b := r.pool.Get()
|
|
||||||
defer r.pool.Put(b)
|
|
||||||
|
|
||||||
options := store.NewListOptions(opts...)
|
options := store.NewListOptions(opts...)
|
||||||
if len(options.Namespace) == 0 {
|
if len(options.Namespace) == 0 {
|
||||||
options.Namespace = r.opts.Namespace
|
options.Namespace = r.opts.Namespace
|
||||||
}
|
}
|
||||||
|
|
||||||
rkey := r.getKey(b, options.Namespace, "", options.Prefix+"*")
|
rkey := fmt.Sprintf("%s%s*", options.Namespace, options.Prefix)
|
||||||
if options.Suffix != "" {
|
if options.Suffix != "" {
|
||||||
rkey += options.Suffix
|
rkey += options.Suffix
|
||||||
}
|
}
|
||||||
|
if r.opts.Timeout > 0 {
|
||||||
timeout := r.opts.Timeout
|
|
||||||
if options.Timeout > 0 {
|
|
||||||
timeout = options.Timeout
|
|
||||||
}
|
|
||||||
|
|
||||||
if timeout > 0 {
|
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: add support for prefix/suffix/limit
|
// TODO: add support for prefix/suffix/limit
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
|
keys, err := r.cli.Keys(ctx, rkey).Result()
|
||||||
ts := time.Now()
|
if err != nil {
|
||||||
var keys []string
|
|
||||||
var err error
|
|
||||||
|
|
||||||
if c, ok := r.cli.(*goredis.ClusterClient); ok {
|
|
||||||
err = c.ForEachMaster(ctx, func(nctx context.Context, cli *goredis.Client) error {
|
|
||||||
nkeys, nerr := cli.Keys(nctx, rkey).Result()
|
|
||||||
if nerr != nil {
|
|
||||||
return nerr
|
|
||||||
}
|
|
||||||
keys = append(keys, nkeys...)
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
keys, err = r.cli.Keys(ctx, rkey).Result()
|
|
||||||
}
|
|
||||||
te := time.Since(ts)
|
|
||||||
setSpanError(ctx, err)
|
|
||||||
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
|
|
||||||
r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
|
||||||
if err == goredis.Nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
|
|
||||||
return nil, store.ErrNotFound
|
|
||||||
} else if err == nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
|
|
||||||
} else if err != nil {
|
|
||||||
r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if options.Namespace == "" {
|
||||||
prefix := r.opts.Namespace
|
|
||||||
if options.Namespace != "" {
|
|
||||||
prefix = options.Namespace
|
|
||||||
}
|
|
||||||
if prefix == "" {
|
|
||||||
return keys, nil
|
return keys, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
for idx, key := range keys {
|
nkeys := make([]string, 0, len(keys))
|
||||||
keys[idx] = strings.TrimPrefix(key, prefix)
|
for _, key := range keys {
|
||||||
|
nkeys = append(nkeys, strings.TrimPrefix(key, options.Namespace))
|
||||||
}
|
}
|
||||||
|
return nkeys, nil
|
||||||
return keys, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Options() store.Options {
|
func (r *rkv) Options() store.Options {
|
||||||
return r.opts
|
return r.opts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Name() string {
|
func (r *rkv) Name() string {
|
||||||
return r.opts.Name
|
return r.opts.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) String() string {
|
func (r *rkv) String() string {
|
||||||
return "redis"
|
return "redis"
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewStore(opts ...store.Option) *Store {
|
func NewStore(opts ...store.Option) *rkv {
|
||||||
return &Store{done: make(chan struct{}), opts: store.NewOptions(opts...)}
|
return &rkv{opts: store.NewOptions(opts...)}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) configure() error {
|
func (r *rkv) configure() error {
|
||||||
|
var redisOptions *redis.Options
|
||||||
|
var redisClusterOptions *redis.ClusterOptions
|
||||||
|
var err error
|
||||||
|
|
||||||
|
nodes := r.opts.Addrs
|
||||||
|
|
||||||
|
if len(nodes) == 0 {
|
||||||
|
nodes = []string{"redis://127.0.0.1:6379"}
|
||||||
|
}
|
||||||
|
|
||||||
if r.cli != nil && r.opts.Context == nil {
|
if r.cli != nil && r.opts.Context == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
universalOptions := DefaultUniversalOptions
|
|
||||||
|
|
||||||
if r.opts.Context != nil {
|
if r.opts.Context != nil {
|
||||||
if o, ok := r.opts.Context.Value(configKey{}).(*goredis.Options); ok {
|
if c, ok := r.opts.Context.Value(configKey{}).(*redis.Options); ok {
|
||||||
universalOptions.Addrs = []string{o.Addr}
|
redisOptions = c
|
||||||
universalOptions.Dialer = o.Dialer
|
|
||||||
universalOptions.OnConnect = o.OnConnect
|
|
||||||
universalOptions.Username = o.Username
|
|
||||||
universalOptions.Password = o.Password
|
|
||||||
|
|
||||||
universalOptions.MaxRetries = o.MaxRetries
|
|
||||||
universalOptions.MinRetryBackoff = o.MinRetryBackoff
|
|
||||||
universalOptions.MaxRetryBackoff = o.MaxRetryBackoff
|
|
||||||
|
|
||||||
universalOptions.DialTimeout = o.DialTimeout
|
|
||||||
universalOptions.ReadTimeout = o.ReadTimeout
|
|
||||||
universalOptions.WriteTimeout = o.WriteTimeout
|
|
||||||
universalOptions.ContextTimeoutEnabled = o.ContextTimeoutEnabled
|
|
||||||
|
|
||||||
universalOptions.PoolFIFO = o.PoolFIFO
|
|
||||||
|
|
||||||
universalOptions.PoolSize = o.PoolSize
|
|
||||||
universalOptions.PoolTimeout = o.PoolTimeout
|
|
||||||
universalOptions.MinIdleConns = o.MinIdleConns
|
|
||||||
universalOptions.MaxIdleConns = o.MaxIdleConns
|
|
||||||
universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
|
|
||||||
universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
|
|
||||||
|
|
||||||
if r.opts.TLSConfig != nil {
|
if r.opts.TLSConfig != nil {
|
||||||
universalOptions.TLSConfig = r.opts.TLSConfig
|
redisOptions.TLSConfig = r.opts.TLSConfig
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if o, ok := r.opts.Context.Value(clusterConfigKey{}).(*goredis.ClusterOptions); ok {
|
if c, ok := r.opts.Context.Value(clusterConfigKey{}).(*redis.ClusterOptions); ok {
|
||||||
universalOptions.Addrs = o.Addrs
|
redisClusterOptions = c
|
||||||
universalOptions.Dialer = o.Dialer
|
|
||||||
universalOptions.OnConnect = o.OnConnect
|
|
||||||
universalOptions.Username = o.Username
|
|
||||||
universalOptions.Password = o.Password
|
|
||||||
|
|
||||||
universalOptions.MaxRedirects = o.MaxRedirects
|
|
||||||
universalOptions.ReadOnly = o.ReadOnly
|
|
||||||
universalOptions.RouteByLatency = o.RouteByLatency
|
|
||||||
universalOptions.RouteRandomly = o.RouteRandomly
|
|
||||||
|
|
||||||
universalOptions.MaxRetries = o.MaxRetries
|
|
||||||
universalOptions.MinRetryBackoff = o.MinRetryBackoff
|
|
||||||
universalOptions.MaxRetryBackoff = o.MaxRetryBackoff
|
|
||||||
|
|
||||||
universalOptions.DialTimeout = o.DialTimeout
|
|
||||||
universalOptions.ReadTimeout = o.ReadTimeout
|
|
||||||
universalOptions.WriteTimeout = o.WriteTimeout
|
|
||||||
universalOptions.ContextTimeoutEnabled = o.ContextTimeoutEnabled
|
|
||||||
|
|
||||||
universalOptions.PoolFIFO = o.PoolFIFO
|
|
||||||
|
|
||||||
universalOptions.PoolSize = o.PoolSize
|
|
||||||
universalOptions.PoolTimeout = o.PoolTimeout
|
|
||||||
universalOptions.MinIdleConns = o.MinIdleConns
|
|
||||||
universalOptions.MaxIdleConns = o.MaxIdleConns
|
|
||||||
universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
|
|
||||||
universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
|
|
||||||
if r.opts.TLSConfig != nil {
|
if r.opts.TLSConfig != nil {
|
||||||
universalOptions.TLSConfig = r.opts.TLSConfig
|
redisClusterOptions.TLSConfig = r.opts.TLSConfig
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if o, ok := r.opts.Context.Value(universalConfigKey{}).(*goredis.UniversalOptions); ok {
|
|
||||||
universalOptions = o
|
|
||||||
if r.opts.TLSConfig != nil {
|
|
||||||
universalOptions.TLSConfig = r.opts.TLSConfig
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(r.opts.Addrs) > 0 {
|
if redisOptions != nil && redisClusterOptions != nil {
|
||||||
universalOptions.Addrs = r.opts.Addrs
|
return fmt.Errorf("must specify only one option Config or ClusterConfig")
|
||||||
} else {
|
|
||||||
universalOptions.Addrs = []string{"127.0.0.1:6379"}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
r.cli = goredis.NewUniversalClient(universalOptions)
|
if redisOptions == nil && redisClusterOptions == nil && r.cli != nil {
|
||||||
setTracing(r.cli, r.opts.Tracer)
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
r.pool = pool.NewStringsPool(50)
|
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],
|
||||||
|
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,
|
||||||
|
IdleTimeout: 20 * time.Second,
|
||||||
|
MinIdleConns: 10,
|
||||||
|
TLSConfig: r.opts.TLSConfig,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
|
||||||
|
redisClusterOptions = &redis.ClusterOptions{
|
||||||
|
Addrs: nodes,
|
||||||
|
Username: "",
|
||||||
|
Password: "", // no password set
|
||||||
|
MaxRetries: 2,
|
||||||
|
MaxRetryBackoff: 256 * time.Millisecond,
|
||||||
|
DialTimeout: 1 * time.Second,
|
||||||
|
ReadTimeout: 1 * time.Second,
|
||||||
|
WriteTimeout: 1 * time.Second,
|
||||||
|
PoolTimeout: 1 * time.Second,
|
||||||
|
IdleTimeout: 20 * time.Second,
|
||||||
|
MinIdleConns: 10,
|
||||||
|
TLSConfig: r.opts.TLSConfig,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
r.statsMeter()
|
if redisOptions != nil {
|
||||||
|
r.cli = redis.NewClient(redisOptions)
|
||||||
|
} else if redisClusterOptions != nil {
|
||||||
|
r.cli = redis.NewClusterClient(redisClusterOptions)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) getKey(b *strings.Builder, mainNamespace string, opNamespace string, key string) string {
|
|
||||||
if opNamespace == "" {
|
|
||||||
opNamespace = mainNamespace
|
|
||||||
}
|
|
||||||
if opNamespace != "" {
|
|
||||||
b.WriteString(opNamespace)
|
|
||||||
b.WriteString(DefaultPathSeparator)
|
|
||||||
}
|
|
||||||
b.WriteString(key)
|
|
||||||
return b.String()
|
|
||||||
}
|
|
||||||
|
|||||||
@ -7,62 +7,14 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
goredis "github.com/redis/go-redis/v9"
|
"github.com/go-redis/redis/v8"
|
||||||
"go.unistack.org/micro/v3/store"
|
"go.unistack.org/micro/v3/store"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestLazyConnect(t *testing.T) {
|
|
||||||
ctx := context.Background()
|
|
||||||
var err error
|
|
||||||
|
|
||||||
r := NewStore()
|
|
||||||
|
|
||||||
if err = r.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
if err = r.Connect(ctx); err != nil {
|
|
||||||
t.Logf("connect failed %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for {
|
|
||||||
if err = r.Write(ctx, "mykey", "myval"); err != nil {
|
|
||||||
t.Logf("failed to write %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestKeepTTL(t *testing.T) {
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
|
||||||
t.Skip()
|
|
||||||
}
|
|
||||||
r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))
|
|
||||||
|
|
||||||
if err := r.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
if err := r.Connect(ctx); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
key := "key"
|
|
||||||
err := r.Write(ctx, key, "val1", store.WriteTTL(15*time.Second))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Write error: %v", err)
|
|
||||||
}
|
|
||||||
time.Sleep(3 * time.Second)
|
|
||||||
err = r.Write(ctx, key, "val2", store.WriteTTL(-1))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Write error: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func Test_rkv_configure(t *testing.T) {
|
func Test_rkv_configure(t *testing.T) {
|
||||||
type fields struct {
|
type fields struct {
|
||||||
options store.Options
|
options store.Options
|
||||||
Client goredis.UniversalClient
|
Client *redis.Client
|
||||||
}
|
}
|
||||||
type wantValues struct {
|
type wantValues struct {
|
||||||
username string
|
username string
|
||||||
@ -85,7 +37,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "legacy Url", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"127.0.0.1:6379"}}, Client: nil},
|
name: "legacy Url", fields: fields{options: store.Options{Addrs: []string{"127.0.0.1:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "",
|
username: "",
|
||||||
password: "",
|
password: "",
|
||||||
@ -93,7 +45,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "New Url", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"redis://127.0.0.1:6379"}}, Client: nil},
|
name: "New Url", fields: fields{options: store.Options{Addrs: []string{"redis://127.0.0.1:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "",
|
username: "",
|
||||||
password: "",
|
password: "",
|
||||||
@ -101,7 +53,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Url with Pwd", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"redis://:password@redis:6379"}}, Client: nil},
|
name: "Url with Pwd", fields: fields{options: store.Options{Addrs: []string{"redis://:password@redis:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "",
|
username: "",
|
||||||
password: "password",
|
password: "password",
|
||||||
@ -109,7 +61,7 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Url with username and Pwd", fields: fields{options: store.Options{Tracer: tracer.DefaultTracer, Addrs: []string{"redis://username:password@redis:6379"}}, Client: nil},
|
name: "Url with username and Pwd", fields: fields{options: store.Options{Addrs: []string{"redis://username:password@redis:6379"}}, Client: nil},
|
||||||
wantErr: false, want: wantValues{
|
wantErr: false, want: wantValues{
|
||||||
username: "username",
|
username: "username",
|
||||||
password: "password",
|
password: "password",
|
||||||
@ -119,11 +71,11 @@ func Test_rkv_configure(t *testing.T) {
|
|||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
rc := &Store{
|
r := &rkv{
|
||||||
opts: tt.fields.options,
|
opts: tt.fields.options,
|
||||||
cli: tt.fields.Client,
|
cli: tt.fields.Client,
|
||||||
}
|
}
|
||||||
err := rc.configure()
|
err := r.configure()
|
||||||
if (err != nil) != tt.wantErr {
|
if (err != nil) != tt.wantErr {
|
||||||
t.Errorf("configure() error = %v, wantErr %v", err, tt.wantErr)
|
t.Errorf("configure() error = %v, wantErr %v", err, tt.wantErr)
|
||||||
return
|
return
|
||||||
|
|||||||
49
stats.go
49
stats.go
@ -1,49 +0,0 @@
|
|||||||
package redis
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
|
|
||||||
goredis "github.com/redis/go-redis/v9"
|
|
||||||
"go.unistack.org/micro/v3/meter"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
PoolHitsTotal = "pool_hits_total"
|
|
||||||
PoolMissesTotal = "pool_misses_total"
|
|
||||||
PoolTimeoutTotal = "pool_timeout_total"
|
|
||||||
PoolConnTotalCurrent = "pool_conn_total_current"
|
|
||||||
PoolConnIdleCurrent = "pool_conn_idle_current"
|
|
||||||
PoolConnStaleTotal = "pool_conn_stale_total"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Statser interface {
|
|
||||||
PoolStats() *goredis.PoolStats
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Store) statsMeter() {
|
|
||||||
var st Statser
|
|
||||||
|
|
||||||
if r.cli != nil {
|
|
||||||
st = r.cli
|
|
||||||
} else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
ticker := time.NewTicker(meter.DefaultMeterStatsInterval)
|
|
||||||
defer ticker.Stop()
|
|
||||||
|
|
||||||
for _ = range ticker.C {
|
|
||||||
if st == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
stats := st.PoolStats()
|
|
||||||
r.opts.Meter.Counter(PoolHitsTotal).Set(uint64(stats.Hits))
|
|
||||||
r.opts.Meter.Counter(PoolMissesTotal).Set(uint64(stats.Misses))
|
|
||||||
r.opts.Meter.Counter(PoolTimeoutTotal).Set(uint64(stats.Timeouts))
|
|
||||||
r.opts.Meter.Counter(PoolConnTotalCurrent).Set(uint64(stats.TotalConns))
|
|
||||||
r.opts.Meter.Counter(PoolConnIdleCurrent).Set(uint64(stats.IdleConns))
|
|
||||||
r.opts.Meter.Counter(PoolConnStaleTotal).Set(uint64(stats.StaleConns))
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
128
tracer.go
128
tracer.go
@ -1,128 +0,0 @@
|
|||||||
package redis
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
rediscmd "github.com/redis/go-redis/extra/rediscmd/v9"
|
|
||||||
goredis "github.com/redis/go-redis/v9"
|
|
||||||
"go.unistack.org/micro/v3/tracer"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setTracing(rdb goredis.UniversalClient, tr tracer.Tracer, opts ...tracer.SpanOption) {
|
|
||||||
switch rdb := rdb.(type) {
|
|
||||||
case *goredis.Client:
|
|
||||||
opt := rdb.Options()
|
|
||||||
connString := formatDBConnString(opt.Network, opt.Addr)
|
|
||||||
rdb.AddHook(newTracingHook(connString, tr))
|
|
||||||
case *goredis.ClusterClient:
|
|
||||||
rdb.OnNewNode(func(rdb *goredis.Client) {
|
|
||||||
opt := rdb.Options()
|
|
||||||
connString := formatDBConnString(opt.Network, opt.Addr)
|
|
||||||
rdb.AddHook(newTracingHook(connString, tr))
|
|
||||||
})
|
|
||||||
case *goredis.Ring:
|
|
||||||
rdb.OnNewNode(func(rdb *goredis.Client) {
|
|
||||||
opt := rdb.Options()
|
|
||||||
connString := formatDBConnString(opt.Network, opt.Addr)
|
|
||||||
rdb.AddHook(newTracingHook(connString, tr))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type tracingHook struct {
|
|
||||||
tr tracer.Tracer
|
|
||||||
opts []tracer.SpanOption
|
|
||||||
}
|
|
||||||
|
|
||||||
var _ goredis.Hook = (*tracingHook)(nil)
|
|
||||||
|
|
||||||
func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOption) *tracingHook {
|
|
||||||
opts = append(opts, tracer.WithSpanKind(tracer.SpanKindClient))
|
|
||||||
if connString != "" {
|
|
||||||
opts = append(opts, tracer.WithSpanLabels("db.connection_string", connString))
|
|
||||||
}
|
|
||||||
|
|
||||||
return &tracingHook{
|
|
||||||
tr: tr,
|
|
||||||
opts: opts,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *tracingHook) DialHook(hook goredis.DialHook) goredis.DialHook {
|
|
||||||
return func(ctx context.Context, network, addr string) (net.Conn, error) {
|
|
||||||
/*
|
|
||||||
_, span := h.tr.Start(ctx, "goredis.dial", h.opts...)
|
|
||||||
defer span.Finish()
|
|
||||||
*/
|
|
||||||
conn, err := hook(ctx, network, addr)
|
|
||||||
// recordError(span, err)
|
|
||||||
|
|
||||||
return conn, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *tracingHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
|
|
||||||
return func(ctx context.Context, cmd goredis.Cmder) error {
|
|
||||||
cmdString := rediscmd.CmdString(cmd)
|
|
||||||
var err error
|
|
||||||
|
|
||||||
switch cmdString {
|
|
||||||
case "cluster slots":
|
|
||||||
break
|
|
||||||
default:
|
|
||||||
_, span := h.tr.Start(ctx, "sdk.database", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
|
|
||||||
defer func() {
|
|
||||||
recordError(span, err)
|
|
||||||
span.Finish()
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
err = hook(ctx, cmd)
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *tracingHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) goredis.ProcessPipelineHook {
|
|
||||||
return func(ctx context.Context, cmds []goredis.Cmder) error {
|
|
||||||
_, cmdsString := rediscmd.CmdsString(cmds)
|
|
||||||
|
|
||||||
opts := append(h.opts, tracer.WithSpanLabels(
|
|
||||||
"db.database.num_cmd", strconv.Itoa(len(cmds)),
|
|
||||||
"db.statement", cmdsString,
|
|
||||||
))
|
|
||||||
|
|
||||||
_, span := h.tr.Start(ctx, "sdk.database", opts...)
|
|
||||||
defer span.Finish()
|
|
||||||
|
|
||||||
err := hook(ctx, cmds)
|
|
||||||
recordError(span, err)
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func setSpanError(ctx context.Context, err error) {
|
|
||||||
if err == nil || err == goredis.Nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if sp, ok := tracer.SpanFromContext(ctx); !ok && sp != nil {
|
|
||||||
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func recordError(span tracer.Span, err error) {
|
|
||||||
if err != nil && err != goredis.Nil {
|
|
||||||
span.SetStatus(tracer.SpanStatusError, err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatDBConnString(network, addr string) string {
|
|
||||||
if network == "tcp" {
|
|
||||||
network = "redis"
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%s://%s", network, addr)
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user