Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: redis/rueidis
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.23
Choose a base ref
...
head repository: redis/rueidis
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.24
Choose a head ref
  • 15 commits
  • 17 files changed
  • 4 contributors

Commits on Dec 7, 2023

  1. fix: typo in comment

    @rueian
    rueian committed Dec 7, 2023
    Copy the full SHA
    d25943e View commit details

  2. feat: change Z member type to string in rueidiscompat to align go-redis

    @rueian
    rueian committed Dec 7, 2023
    Copy the full SHA
    3851dec View commit details

Commits on Dec 10, 2023

  1. feat: let clusterclient respect the option.PipelineMultiplex

    @rueian
    rueian committed Dec 10, 2023
    Copy the full SHA
    e06396c View commit details

  2. docs: let clusterclient respect the option.PipelineMultiplex

    @rueian
    rueian committed Dec 10, 2023
    Copy the full SHA
    5ca6ad6 View commit details

  3. Merge pull request #418 from redis/multiple-tcp-for-cluster-node 

    feat: let clusterclient respect the option.PipelineMultiplex
    @rueian
    rueian authored Dec 10, 2023
    Copy the full SHA
    9dea63a View commit details

Commits on Dec 11, 2023

  1. fix: correct CLIENT SETINFO connection setup

    @rueian
    rueian committed Dec 11, 2023
    Copy the full SHA
    b145163 View commit details

  2. fix: correct CLIENT SETINFO connection setup in tests

    @rueian
    rueian committed Dec 11, 2023
    Copy the full SHA
    a2b2c0f View commit details

  3. Merge pull request #420 from redis/fix-set-client-info 

    fix: correct CLIENT SETINFO connection setup
    @rueian
    rueian authored Dec 11, 2023
    Copy the full SHA
    0fac21f View commit details

Commits on Dec 12, 2023

  1. fix: rueidis.ParseURL() cannot parse unix address

    @IrineSistiana
    IrineSistiana committed Dec 12, 2023
    Copy the full SHA
    901d5f9 View commit details

  2. Merge pull request #425 from IrineSistiana/fix-424 

    fix: rueidis.ParseURL() cannot parse unix address
    @rueian
    rueian authored Dec 12, 2023
    Copy the full SHA
    b79ac22 View commit details

Commits on Dec 13, 2023

  1. feat: align go-redis TimeseriesCmdable (#422) 

    * copy definition and tests from go-redis

Reference:
- https://github.com/redis/go-redis/blob/master/timeseries_commands.go
- https://github.com/redis/go-redis/blob/master/timeseries_commands_test.go

* TSAdd, TSAddWithArgs

* impl TSCreate, TSCreateWithArgs

* impl TSAlter, TSCreateRule

* impl TSIncrBy, TSIncrByWithArgs, TSDecrBy, TSDecrByWithArgs, TSDel, TSDeleteRule, TSGet, TSInfo, TSInfoWithArgs, TSMAdd, TSQueryIndex, TSRevRange

* impl TSRevRangeWithArgs, TSRange

* impl TSRevRangeWithArgs TSRange TSMRange TSMRangeWithArgs TSMRevRange

* impl TSMGet, TSMGetWithArgs, TSMRevRange, TSMRevRangeWithArgs

* impl newTSTimestampValueSliceCmd, newMapStringSliceInterfaceCmd

* fix newMapStringInterfaceCmd: manually convert map[string]any to map[any]any

WORKAROUND: manually convert map[string]any to map[any]any to make go-redis test PASS
we don't use (*RedisMessage).ToAny() on map type because it will convert ele
to map[string]any

* impl newTSTimestampValueCmd

* simplify the way we use command builder: reducing unnecessary if-else

* let duplicatePolicy accept both lower and upper case word

Because tests in go-redis use both of them.

* Handle redis Nil in newMapStringInterfaceCmd

* fix tests: should TSMAdd

* fix tests: should TSMGet and TSMGetWithArgs

* refactor: introduce AsAnyAnyMap

* refactor: newMapStringInterfaceCmd, simplify if-else condition

* fix should TSDel and TSRange

* revert code that are accidentally replaced by vim find and replace

* remove map[any]any

* replace rueidis.Nil with nil in newMapStringInterfaceCmd
    @unknowntpo
    unknowntpo authored Dec 13, 2023
    Copy the full SHA
    170c52c View commit details

Commits on Dec 14, 2023

  1. feat: add built-in metrics (#421) 

    * feat: add built-in metrics

* refactor: rename buckets

* refactor: integrate with otelclient

* refactor: remove sync.once

* style: change simple

* refactor: change default dial fn

* refactor: change to cas

* refactor: rename histogramoption

* refactor: change client option as required
    @proost
    proost authored Dec 14, 2023
    Copy the full SHA
    a035425 View commit details

  2. chore: go mod tidy

    @rueian
    rueian committed Dec 14, 2023
    Copy the full SHA
    5ff7f42 View commit details

  3. refactor: shorten the naming of DefaultHistogramBuckets

    @rueian
    rueian committed Dec 14, 2023
    Copy the full SHA
    5cacd16 View commit details

Commits on Dec 15, 2023

  1. feat: bump v1.0.24

    @rueian
    rueian committed Dec 15, 2023
    Copy the full SHA
    0c5c4b8 View commit details
Showing with 2,558 additions and 112 deletions.
  1. +1 −1 README.md
  2. +8 −8 go.mod
  3. +16 −16 go.sum
  4. +3 −1 mux_test.go
  5. +11 −11 pipe.go
  6. +62 −22 pipe_test.go
  7. +5 −7 rueidis.go
  8. +15 −5 rueidis_test.go
  9. +820 −1 rueidiscompat/adapter.go
  10. +924 −4 rueidiscompat/adapter_test.go
  11. +283 −1 rueidiscompat/command.go
  12. +1 −1 rueidiscompat/structmap.go
  13. +159 −0 rueidisotel/metrics.go
  14. +223 −0 rueidisotel/metrics_test.go
  15. +17 −29 rueidisotel/trace.go
  16. +7 −5 url.go
  17. +3 −0 url_test.go
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -460,7 +460,7 @@ module mymodule
go 1.18
require github.com/redis/rueidis v1.0.23-go1.18
require github.com/redis/rueidis v1.0.24-go1.18
```

## Contributing
16 changes: 8 additions & 8 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -4,29 +4,29 @@ go 1.20

require (
github.com/oklog/ulid/v2 v2.1.0
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/metric v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/metric v1.21.0
go.opentelemetry.io/otel/sdk v1.21.0
go.opentelemetry.io/otel/sdk/metric v1.21.0
go.opentelemetry.io/otel/trace v1.21.0
)

require (
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.28.0
go.uber.org/mock v0.3.0
golang.org/x/sys v0.14.0
)

require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/kr/text v0.2.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.12.0 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
32 changes: 16 additions & 16 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U=
github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -32,23 +32,23 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0=
go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q=
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
4 changes: 3 additions & 1 deletion mux_test.go
View file
Original file line number Diff line number Diff line change
@@ -78,7 +78,9 @@ func TestNewMux(t *testing.T) {
})
mock.Expect("CLIENT", "TRACKING", "ON", "OPTIN").
ReplyString("OK")
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LIB_NAME, "LIB-VER", LIB_VER).
mock.Expect("CLIENT", "SETINFO", "LIB-NAME", LibName).
ReplyError("UNKNOWN COMMAND")
mock.Expect("CLIENT", "SETINFO", "LIB-VER", LibVer).
ReplyError("UNKNOWN COMMAND")
mock.Expect("PING").ReplyString("OK")
mock.Close()
22 changes: 11 additions & 11 deletions pipe.go
View file
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ import (
"github.com/redis/rueidis/internal/util"
)

const LIB_NAME = "rueidis"
const LIB_VER = "1.0.23"
const LibName = "rueidis"
const LibVer = "1.0.24"

var noHello = regexp.MustCompile("unknown command .?(HELLO|hello).?")

@@ -177,7 +177,7 @@ func _newPipe(connFn func() (net.Conn, error), option *ClientOption, r2ps bool)
helloCmd = append(helloCmd, "SETNAME", option.ClientName)
}

init := make([][]string, 0, 4)
init := make([][]string, 0, 5)
if option.ClientTrackingOptions == nil {
init = append(init, helloCmd, []string{"CLIENT", "TRACKING", "ON", "OPTIN"})
} else {
@@ -198,10 +198,10 @@ func _newPipe(connFn func() (net.Conn, error), option *ClientOption, r2ps bool)
if option.ClientNoEvict {
init = append(init, []string{"CLIENT", "NO-EVICT", "ON"})
}
if option.ClientSetInfo != nil {
init = append(init, append([]string{"CLIENT", "SETINFO"}, option.ClientSetInfo...))
if len(option.ClientSetInfo) == 2 {
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", option.ClientSetInfo[0]}, []string{"CLIENT", "SETINFO", "LIB-VER", option.ClientSetInfo[1]})
} else {
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LIB_NAME, "LIB-VER", LIB_VER})
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LibName}, []string{"CLIENT", "SETINFO", "LIB-VER", LibVer})
}

timeout := option.Dialer.Timeout
@@ -216,7 +216,7 @@ func _newPipe(connFn func() (net.Conn, error), option *ClientOption, r2ps bool)
if !r2 && !r2ps {
resp := p.DoMulti(ctx, cmds.NewMultiCompleted(init)...)
defer resultsp.Put(resp)
for i, r := range resp.s[:len(resp.s)-1] { // skip error checking on the last CLIENT SETINFO
for i, r := range resp.s[:len(resp.s)-2] { // skip error checking on the last CLIENT SETINFO
if i == 0 {
p.info, err = r.AsMap()
} else {
@@ -279,16 +279,16 @@ func _newPipe(connFn func() (net.Conn, error), option *ClientOption, r2ps bool)
if option.ClientNoEvict {
init = append(init, []string{"CLIENT", "NO-EVICT", "ON"})
}
if option.ClientSetInfo != nil {
init = append(init, append([]string{"CLIENT", "SETINFO"}, option.ClientSetInfo...))
if len(option.ClientSetInfo) == 2 {
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", option.ClientSetInfo[0]}, []string{"CLIENT", "SETINFO", "LIB-VER", option.ClientSetInfo[1]})
} else {
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LIB_NAME, "LIB-VER", LIB_VER})
init = append(init, []string{"CLIENT", "SETINFO", "LIB-NAME", LibName}, []string{"CLIENT", "SETINFO", "LIB-VER", LibVer})
}
p.version = 5
if len(init) != 0 {
resp := p.DoMulti(ctx, cmds.NewMultiCompleted(init)...)
defer resultsp.Put(resp)
for i, r := range resp.s[:len(resp.s)-1] { // skip error checking on the last CLIENT SETINFO
for i, r := range resp.s[:len(resp.s)-2] { // skip error checking on the last CLIENT SETINFO
if init[i][0] == "READONLY" {
// igore READONLY command error
continue
Loading