Skip to content

Commit 9ea2431

Browse files
ofekshenawaofekshenawa
authored
Merge branch 'master' into test-redis-8
2 parents 71605f6 + 1ed936e commit 9ea2431

File tree

16 files changed

+1887
-656
lines changed

16 files changed

+1887
-656
lines changed

‎doctests/stream_tutorial_test.go

+1,073
Large diffs are not rendered by default.

‎example/del-keys-without-ttl/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
replace github.com/redis/go-redis/v9 => ../..
66

77
require (
8-
github.com/redis/go-redis/v9 v9.6.1
8+
github.com/redis/go-redis/v9 v9.6.2
99
go.uber.org/zap v1.24.0
1010
)
1111

‎example/hll/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace github.com/redis/go-redis/v9 => ../..
66

7-
require github.com/redis/go-redis/v9 v9.6.1
7+
require github.com/redis/go-redis/v9 v9.6.2
88

99
require (
1010
github.com/cespare/xxhash/v2 v2.2.0 // indirect

‎example/lua-scripting/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace github.com/redis/go-redis/v9 => ../..
66

7-
require github.com/redis/go-redis/v9 v9.6.1
7+
require github.com/redis/go-redis/v9 v9.6.2
88

99
require (
1010
github.com/cespare/xxhash/v2 v2.2.0 // indirect

‎example/otel/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ replace github.com/redis/go-redis/extra/redisotel/v9 => ../../extra/redisotel
99
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../../extra/rediscmd
1010

1111
require (
12-
github.com/redis/go-redis/extra/redisotel/v9 v9.6.1
13-
github.com/redis/go-redis/v9 v9.6.1
12+
github.com/redis/go-redis/extra/redisotel/v9 v9.6.2
13+
github.com/redis/go-redis/v9 v9.6.2
1414
github.com/uptrace/uptrace-go v1.21.0
1515
go.opentelemetry.io/otel v1.22.0
1616
)
@@ -23,7 +23,7 @@ require (
2323
github.com/go-logr/stdr v1.2.2 // indirect
2424
github.com/golang/protobuf v1.5.3 // indirect
2525
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
26-
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.1 // indirect
26+
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2 // indirect
2727
go.opentelemetry.io/contrib/instrumentation/runtime v0.46.1 // indirect
2828
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
2929
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect

‎example/redis-bloom/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace github.com/redis/go-redis/v9 => ../..
66

7-
require github.com/redis/go-redis/v9 v9.6.1
7+
require github.com/redis/go-redis/v9 v9.6.2
88

99
require (
1010
github.com/cespare/xxhash/v2 v2.2.0 // indirect

‎example/scan-struct/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
66

77
require (
88
github.com/davecgh/go-spew v1.1.1
9-
github.com/redis/go-redis/v9 v9.6.1
9+
github.com/redis/go-redis/v9 v9.6.2
1010
)
1111

1212
require (

‎extra/rediscensus/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
77
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
88

99
require (
10-
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.1
11-
github.com/redis/go-redis/v9 v9.6.1
10+
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2
11+
github.com/redis/go-redis/v9 v9.6.2
1212
go.opencensus.io v0.24.0
1313
)
1414

‎extra/rediscmd/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/redis/go-redis/v9 => ../..
77
require (
88
github.com/bsm/ginkgo/v2 v2.12.0
99
github.com/bsm/gomega v1.27.10
10-
github.com/redis/go-redis/v9 v9.6.1
10+
github.com/redis/go-redis/v9 v9.6.2
1111
)
1212

1313
require (

‎extra/redisotel/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
77
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
88

99
require (
10-
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.1
11-
github.com/redis/go-redis/v9 v9.6.1
10+
github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2
11+
github.com/redis/go-redis/v9 v9.6.2
1212
go.opentelemetry.io/otel v1.22.0
1313
go.opentelemetry.io/otel/metric v1.22.0
1414
go.opentelemetry.io/otel/sdk v1.22.0

‎extra/redisprometheus/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
66

77
require (
88
github.com/prometheus/client_golang v1.14.0
9-
github.com/redis/go-redis/v9 v9.6.1
9+
github.com/redis/go-redis/v9 v9.6.2
1010
)
1111

1212
require (

‎json.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type JSONArrTrimArgs struct {
6060
type JSONCmd struct {
6161
baseCmd
6262
val string
63-
expanded []interface{}
63+
expanded interface{}
6464
}
6565

6666
var _ Cmder = (*JSONCmd)(nil)
@@ -100,11 +100,11 @@ func (cmd *JSONCmd) Result() (string, error) {
100100
return cmd.Val(), cmd.Err()
101101
}
102102

103-
func (cmd JSONCmd) Expanded() (interface{}, error) {
103+
func (cmd *JSONCmd) Expanded() (interface{}, error) {
104104
if len(cmd.val) != 0 && cmd.expanded == nil {
105105
err := json.Unmarshal([]byte(cmd.val), &cmd.expanded)
106106
if err != nil {
107-
return "", err
107+
return nil, err
108108
}
109109
}
110110

@@ -494,7 +494,7 @@ func (c cmdable) JSONMSet(ctx context.Context, params ...interface{}) *StatusCmd
494494
}
495495

496496
// JSONNumIncrBy increments the number value stored at the specified path by the provided number.
497-
// For more information, see https://redis.io/commands/json.numincreby
497+
// For more information, see https://redis.io/docs/latest/commands/json.numincrby/
498498
func (c cmdable) JSONNumIncrBy(ctx context.Context, key, path string, value float64) *JSONCmd {
499499
args := []interface{}{"JSON.NUMINCRBY", key, path, value}
500500
cmd := newJSONCmd(ctx, args...)

0 commit comments

Comments
 (0)