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

Refactor reply parser.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2014-01-06 16:06:30 +02:00
parent 78febcebe7
commit 4252b31cd9
7 changed files with 162 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
v2/command.go
View File

@ -9,7 +9,7 @@ import (
type Cmder interface {
args() []string
parseReply(reader) (interface{}, error)
parseReply(reader) error
setErr(error)
setVal(interface{})
@ -80,8 +80,9 @@ func (cmd *baseCmd) setVal(val interface{}) {
cmd.val = val
}
func (cmd *baseCmd) parseReply(rd reader) (interface{}, error) {
return parseReply(rd)
func (cmd *baseCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, parseSlice)
return cmd.err
}
func (cmd *baseCmd) readTimeout() *time.Duration {
@ -168,13 +169,10 @@ func NewDurationCmd(precision time.Duration, args ...string) *DurationCmd {
}
}
func (cmd *DurationCmd) parseReply(rd reader) (interface{}, error) {
v, err := parseReply(rd)
if err != nil {
return 0, err
}
vv := time.Duration(v.(int64))
return vv * cmd.precision, nil
func (cmd *DurationCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, nil)
cmd.val = time.Duration(cmd.val.(int64)) * cmd.precision
return cmd.err
}
func (cmd *DurationCmd) Val() time.Duration {
@ -196,12 +194,10 @@ func NewBoolCmd(args ...string) *BoolCmd {
}
}
func (cmd *BoolCmd) parseReply(rd reader) (interface{}, error) {
v, err := parseReply(rd)
if err != nil {
return nil, err
}
return v.(int64) == 1, nil
func (cmd *BoolCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, nil)
cmd.val = cmd.val.(int64) == 1
return cmd.err
}
func (cmd *BoolCmd) Val() bool {
@ -242,12 +238,13 @@ func NewFloatCmd(args ...string) *FloatCmd {
}
}
func (cmd *FloatCmd) parseReply(rd reader) (interface{}, error) {
v, err := parseReply(rd)
if err != nil {
return nil, err
func (cmd *FloatCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, nil)
if cmd.err != nil {
return cmd.err
}
return strconv.ParseFloat(v.(string), 64)
cmd.val, cmd.err = strconv.ParseFloat(cmd.val.(string), 64)
return cmd.err
}
func (cmd *FloatCmd) Val() float64 {
@ -288,8 +285,9 @@ func NewStringSliceCmd(args ...string) *StringSliceCmd {
}
}
func (cmd *StringSliceCmd) parseReply(rd reader) (interface{}, error) {
return parseStringSliceReply(rd)
func (cmd *StringSliceCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, parseStringSlice)
return cmd.err
}
func (cmd *StringSliceCmd) Val() []string {
@ -311,8 +309,9 @@ func NewBoolSliceCmd(args ...string) *BoolSliceCmd {
}
}
func (cmd *BoolSliceCmd) parseReply(rd reader) (interface{}, error) {
return parseBoolSliceReply(rd)
func (cmd *BoolSliceCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, parseBoolSlice)
return cmd.err
}
func (cmd *BoolSliceCmd) Val() []bool {
@ -334,8 +333,9 @@ func NewStringStringMapCmd(args ...string) *StringStringMapCmd {
}
}
func (cmd *StringStringMapCmd) parseReply(rd reader) (interface{}, error) {
return parseStringStringMapReply(rd)
func (cmd *StringStringMapCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, parseStringStringMap)
return cmd.err
}
func (cmd *StringStringMapCmd) Val() map[string]string {
@ -357,8 +357,9 @@ func NewStringFloatMapCmd(args ...string) *StringFloatMapCmd {
}
}
func (cmd *StringFloatMapCmd) parseReply(rd reader) (interface{}, error) {
return parseStringFloatMapReply(rd)
func (cmd *StringFloatMapCmd) parseReply(rd reader) error {
cmd.val, cmd.err = parseReply(rd, parseStringFloatMap)
return cmd.err
}
func (cmd *StringFloatMapCmd) Val() map[string]float64 {