Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow scanning redis values into pointer fields #2787

Merged
merged 4 commits into from
Dec 17, 2023
Merged

Allow scanning redis values into pointer fields #2787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfca711
Allow scanning redis values into pointer fields
Nov 3, 2023
e55a3e3
Formatting
splundid Nov 3, 2023
73e0258
Merge branch 'master' into allow_scan_into_nillable_fields
ofekshenawa Dec 17, 2023
beec235
Merge branch 'master' into allow_scan_into_nillable_fields
ofekshenawa Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5378,7 +5378,6 @@ func (cmd *InfoCmd) readReply(rd *proto.Reader) error {
}

return nil

}

func (cmd *InfoCmd) Item(section, key string) string {
Expand Down
9 changes: 7 additions & 2 deletions internal/hscan/hscan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (

. "github.com/bsm/ginkgo/v2"
. "github.com/bsm/gomega"

"github.com/redis/go-redis/v9/internal/util"
)

type data struct {
Expand All @@ -29,6 +31,7 @@ type data struct {
Float float32 `redis:"float"`
Float64 float64 `redis:"float64"`
Bool bool `redis:"bool"`
BoolRef *bool `redis:"boolRef"`
}

type TimeRFC3339Nano struct {
Expand Down Expand Up @@ -117,10 +120,10 @@ var _ = Describe("Scan", func() {
Expect(Scan(&d, i{"key"}, i{"value"})).NotTo(HaveOccurred())
Expect(d).To(Equal(data{}))

keys := i{"string", "byte", "int", "int64", "uint", "uint64", "float", "float64", "bool"}
keys := i{"string", "byte", "int", "int64", "uint", "uint64", "float", "float64", "bool", "boolRef"}
vals := i{
"str!", "bytes!", "123", "123456789123456789", "456", "987654321987654321",
"123.456", "123456789123456789.987654321987654321", "1",
"123.456", "123456789123456789.987654321987654321", "1", "1",
}
Expect(Scan(&d, keys, vals)).NotTo(HaveOccurred())
Expect(d).To(Equal(data{
Expand All @@ -133,6 +136,7 @@ var _ = Describe("Scan", func() {
Float: 123.456,
Float64: 1.2345678912345678e+17,
Bool: true,
BoolRef: util.ToPtr(true),
}))

// Scan a different type with the same values to test that
Expand Down Expand Up @@ -167,6 +171,7 @@ var _ = Describe("Scan", func() {
Float: 1.0,
Float64: 1.2345678912345678e+17,
Bool: true,
BoolRef: util.ToPtr(true),
}))
})

Expand Down
6 changes: 5 additions & 1 deletion internal/hscan/structmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ func newStructSpec(t reflect.Type, fieldTag string) *structSpec {
}

// Use the built-in decoder.
out.set(tag, &structField{index: i, fn: decoders[f.Type.Kind()]})
kind := f.Type.Kind()
if kind == reflect.Pointer {
kind = f.Type.Elem().Kind()
}
out.set(tag, &structField{index: i, fn: decoders[kind]})
}

return out
Expand Down
9 changes: 1 addition & 8 deletions json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ type JSONCmd struct {
var _ Cmder = (*JSONCmd)(nil)

func newJSONCmd(ctx context.Context, args ...interface{}) *JSONCmd {

return &JSONCmd{
baseCmd: baseCmd{
ctx: ctx,
Expand Down Expand Up @@ -95,15 +94,13 @@ func (cmd *JSONCmd) Val() string {
} else {
return cmd.val
}

}

func (cmd *JSONCmd) Result() (string, error) {
return cmd.Val(), cmd.Err()
}

func (cmd JSONCmd) Expanded() (interface{}, error) {

if len(cmd.val) != 0 && cmd.expanded == nil {
err := json.Unmarshal([]byte(cmd.val), &cmd.expanded)
if err != nil {
Expand All @@ -115,7 +112,6 @@ func (cmd JSONCmd) Expanded() (interface{}, error) {
}

func (cmd *JSONCmd) readReply(rd *proto.Reader) error {

// nil response from JSON.(M)GET (cmd.baseCmd.err will be "redis: nil")
if cmd.baseCmd.Err() == Nil {
cmd.val = ""
Expand All @@ -131,7 +127,7 @@ func (cmd *JSONCmd) readReply(rd *proto.Reader) error {
return err
}

var expanded = make([]interface{}, size)
expanded := make([]interface{}, size)

for i := 0; i < size; i++ {
if expanded[i], err = rd.ReadReply(); err != nil {
Expand Down Expand Up @@ -186,7 +182,6 @@ func (cmd *JSONSliceCmd) Result() ([]interface{}, error) {
}

func (cmd *JSONSliceCmd) readReply(rd *proto.Reader) error {

if cmd.baseCmd.Err() == Nil {
cmd.val = nil
return Nil
Expand Down Expand Up @@ -220,7 +215,6 @@ func (cmd *JSONSliceCmd) readReply(rd *proto.Reader) error {
}
}
return nil

}

/*******************************************************************************
Expand Down Expand Up @@ -262,7 +256,6 @@ func (cmd *IntPointerSliceCmd) Result() ([]*int64, error) {
}

func (cmd *IntPointerSliceCmd) readReply(rd *proto.Reader) error {

n, err := rd.ReadArrayLen()
if err != nil {
return err
Expand Down
11 changes: 1 addition & 10 deletions json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

. "github.com/bsm/ginkgo/v2"
. "github.com/bsm/gomega"

"github.com/redis/go-redis/v9"
)

Expand All @@ -13,7 +14,6 @@ type JSONGetTestStruct struct {
}

var _ = Describe("JSON Commands", Label("json"), func() {

ctx := context.TODO()
var client *redis.Client

Expand All @@ -27,7 +27,6 @@ var _ = Describe("JSON Commands", Label("json"), func() {
})

Describe("arrays", Label("arrays"), func() {

It("should JSONArrAppend", Label("json.arrappend", "json"), func() {
cmd1 := client.JSONSet(ctx, "append2", "$", `{"a": [10], "b": {"a": [12, 13]}}`)
Expect(cmd1.Err()).NotTo(HaveOccurred())
Expand Down Expand Up @@ -76,7 +75,6 @@ var _ = Describe("JSON Commands", Label("json"), func() {
res, err = client.JSONArrIndexWithArgs(ctx, "index2", "$", &redis.JSONArrIndexArgs{Stop: &stop}, 4).Result()
Expect(err).NotTo(HaveOccurred())
Expect(res[0]).To(Equal(int64(-1)))

})

It("should JSONArrIndex and JSONArrIndexWithArgs with $", Label("json.arrindex", "json"), func() {
Expand Down Expand Up @@ -235,7 +233,6 @@ var _ = Describe("JSON Commands", Label("json"), func() {
Expect(cmd3.Err()).NotTo(HaveOccurred())
Expect(cmd3.Val()).To(Equal("[[100,200,200]]"))
})

})

Describe("get/set", Label("getset"), func() {
Expand All @@ -257,7 +254,6 @@ var _ = Describe("JSON Commands", Label("json"), func() {
res, err = client.JSONGetWithArgs(ctx, "get3", &redis.JSONGetArgs{Indent: "-", Newline: `~`, Space: `!`}).Result()
Expect(err).NotTo(HaveOccurred())
Expect(res).To(Equal(`[~-{~--"a":!1,~--"b":!2~-}~]`))

})

It("should JSONMerge", Label("json.merge", "json"), func() {
Expand Down Expand Up @@ -330,13 +326,10 @@ var _ = Describe("JSON Commands", Label("json"), func() {
iRes, err = client.JSONMGet(ctx, "$..a", "non_existing_doc", "non_existing_doc1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(iRes).To(Equal([]interface{}{nil, nil}))

})

})

Describe("Misc", Label("misc"), func() {

It("should JSONClear", Label("json.clear", "json"), func() {
cmd1 := client.JSONSet(ctx, "clear1", "$", `[1]`)
Expect(cmd1.Err()).NotTo(HaveOccurred())
Expand Down Expand Up @@ -460,7 +453,6 @@ var _ = Describe("JSON Commands", Label("json"), func() {
cmd3 := client.JSONGet(ctx, "forget3", "$")
Expect(cmd3.Err()).NotTo(HaveOccurred())
Expect(cmd3.Val()).To(Equal(`[{"b":{"b":"annie"}}]`))

})

It("should JSONForget with $", Label("json.forget", "json"), func() {
Expand Down Expand Up @@ -622,7 +614,6 @@ var _ = Describe("JSON Commands", Label("json"), func() {
cmd3, err := client.JSONGet(ctx, "strapp1", "$").Result()
Expect(err).NotTo(HaveOccurred())
Expect(cmd3).To(Equal(`["foobar"]`))

})

It("should JSONStrAppend and JSONStrLen with $", Label("json.strappend", "json.strlen", "json"), func() {
Expand Down
Loading