re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

internal/proto: use read prefix to indicate that method reads from the stream.

This commit is contained in:
Vladimir Mihailenco 2016-10-14 14:42:32 +03:00
parent dcdf129dd5
commit 3996289fe2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/proto/reader.go
View File

@ -77,7 +77,7 @@ func (p *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
case IntReply: case IntReply:
return parseIntValue(line) return parseIntValue(line)
case StringReply: case StringReply:
return p.parseBytesValue(line) return p.readBytesValue(line)
case ArrayReply: case ArrayReply:
n, err := parseArrayLen(line) n, err := parseArrayLen(line)
if err != nil { if err != nil {
@ -112,7 +112,7 @@ func (p *Reader) ReadBytesReply() ([]byte, error) {
case ErrorReply: case ErrorReply:
return nil, parseErrorValue(line) return nil, parseErrorValue(line)
case StringReply: case StringReply:
return p.parseBytesValue(line) return p.readBytesValue(line)
case StatusReply: case StatusReply:
return parseStatusValue(line) return parseStatusValue(line)
default: default:
@ -206,7 +206,7 @@ func (p *Reader) ReadScanReply() ([]string, uint64, error) {
return keys, cursor, err return keys, cursor, err
} }
func (p *Reader) parseBytesValue(line []byte) ([]byte, error) { func (p *Reader) readBytesValue(line []byte) ([]byte, error) {
if isNilReply(line) { if isNilReply(line) {
return nil, internal.Nil return nil, internal.Nil
} }

2
parser.go
View File

@ -406,5 +406,5 @@ func timeParser(rd *proto.Reader, n int64) (interface{}, error) {
return nil, err return nil, err
} }
return time.Unix(sec, microsec*100), nil return time.Unix(sec, microsec*1000), nil
} }