redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

Don't create empty map for nil values

Browse Source
This commit is contained in:
Vladimir Mihailenco
2020-02-02 10:52:57 +02:00
parent 0fdd200bc7
commit 99cd690a70
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
command.go
View File

@ -999,18 +999,20 @@ func xMessageSliceParser(rd *proto.Reader, n int64) (interface{}, error) {
return nil, err return nil, err
} }
var values map[string]interface{}
v, err := rd.ReadArrayReply(stringInterfaceMapParser) v, err := rd.ReadArrayReply(stringInterfaceMapParser)
if err != nil && err != proto.Nil { if err != nil {
if err != proto.Nil {
return nil, err return nil, err
} }
} else {
if v == nil || err == proto.Nil { values = v.(map[string]interface{})
v = make(map[string]interface{})
} }
msgs = append(msgs, XMessage{ msgs = append(msgs, XMessage{
ID: id, ID: id,
Values: v.(map[string]interface{}), Values: values,
}) })
return nil, nil return nil, nil
}) })

2
commands_test.go
View File

@ -3598,7 +3598,7 @@ var _ = Describe("Commands", func() {
Stream: "stream", Stream: "stream",
Messages: []redis.XMessage{ Messages: []redis.XMessage{
{ID: "1-0", Values: map[string]interface{}{"uno": "un"}}, {ID: "1-0", Values: map[string]interface{}{"uno": "un"}},
{ID: "2-0", Values: map[string]interface{}{}}, {ID: "2-0", Values: nil},
{ID: "3-0", Values: map[string]interface{}{"tres": "troix"}}, {ID: "3-0", Values: map[string]interface{}{"tres": "troix"}},
}}, }},
})) }))