redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-08-01 16:06:54 +03:00
Code Activity

Pass cn.Rd where possible

Browse Source
This commit is contained in:
Vladimir Mihailenco
2018-08-15 09:38:58 +03:00
parent cfe305296f
commit 7c26d1ceb6
7 changed files with 123 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
internal/proto/reader.go
View File

@ -26,39 +26,39 @@ func (e RedisError) Error() string { return string(e) }
//------------------------------------------------------------------------------
type MultiBulkParse func(*Reader, int64) (interface{}, error)
type MultiBulkParse func(Reader, int64) (interface{}, error)
type Reader struct {
src *ElasticBufReader
}
func NewReader(src *ElasticBufReader) *Reader {
return &Reader{
func NewReader(src *ElasticBufReader) Reader {
return Reader{
src: src,
}
}
func (r *Reader) Reset(rd io.Reader) {
func (r Reader) Reset(rd io.Reader) {
r.src.Reset(rd)
}
func (r *Reader) Buffer() []byte {
func (r Reader) Buffer() []byte {
return r.src.Buffer()
}
func (r *Reader) ResetBuffer(buf []byte) {
func (r Reader) ResetBuffer(buf []byte) {
r.src.ResetBuffer(buf)
}
func (r *Reader) Bytes() []byte {
func (r Reader) Bytes() []byte {
return r.src.Bytes()
}
func (r *Reader) ReadN(n int) ([]byte, error) {
func (r Reader) ReadN(n int) ([]byte, error) {
return r.src.ReadN(n)
}
func (r *Reader) ReadLine() ([]byte, error) {
func (r Reader) ReadLine() ([]byte, error) {
line, err := r.src.ReadLine()
if err != nil {
return nil, err
@ -72,7 +72,7 @@ func (r *Reader) ReadLine() ([]byte, error) {
return line, nil
}
func (r *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
func (r Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
line, err := r.ReadLine()
if err != nil {
return nil, err
@ -97,7 +97,7 @@ func (r *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
return nil, fmt.Errorf("redis: can't parse %.100q", line)
}
func (r *Reader) ReadIntReply() (int64, error) {
func (r Reader) ReadIntReply() (int64, error) {
line, err := r.ReadLine()
if err != nil {
return 0, err
@ -112,7 +112,7 @@ func (r *Reader) ReadIntReply() (int64, error) {
}
}
func (r *Reader) ReadTmpBytesReply() ([]byte, error) {
func (r Reader) ReadTmpBytesReply() ([]byte, error) {
line, err := r.ReadLine()
if err != nil {
return nil, err
@ -129,7 +129,7 @@ func (r *Reader) ReadTmpBytesReply() ([]byte, error) {
}
}
func (r *Reader) ReadBytesReply() ([]byte, error) {
func (r Reader) ReadBytesReply() ([]byte, error) {
b, err := r.ReadTmpBytesReply()
if err != nil {
return nil, err
@ -139,7 +139,7 @@ func (r *Reader) ReadBytesReply() ([]byte, error) {
return cp, nil
}
func (r *Reader) ReadStringReply() (string, error) {
func (r Reader) ReadStringReply() (string, error) {
b, err := r.ReadTmpBytesReply()
if err != nil {
return "", err
@ -147,7 +147,7 @@ func (r *Reader) ReadStringReply() (string, error) {
return string(b), nil
}
func (r *Reader) ReadFloatReply() (float64, error) {
func (r Reader) ReadFloatReply() (float64, error) {
b, err := r.ReadTmpBytesReply()
if err != nil {
return 0, err
@ -155,7 +155,7 @@ func (r *Reader) ReadFloatReply() (float64, error) {
return util.ParseFloat(b, 64)
}
func (r *Reader) ReadArrayReply(m MultiBulkParse) (interface{}, error) {
func (r Reader) ReadArrayReply(m MultiBulkParse) (interface{}, error) {
line, err := r.ReadLine()
if err != nil {
return nil, err
@ -174,7 +174,7 @@ func (r *Reader) ReadArrayReply(m MultiBulkParse) (interface{}, error) {
}
}
func (r *Reader) ReadArrayLen() (int64, error) {
func (r Reader) ReadArrayLen() (int64, error) {
line, err := r.ReadLine()
if err != nil {
return 0, err
@ -189,7 +189,7 @@ func (r *Reader) ReadArrayLen() (int64, error) {
}
}
func (r *Reader) ReadScanReply() ([]string, uint64, error) {
func (r Reader) ReadScanReply() ([]string, uint64, error) {
n, err := r.ReadArrayLen()
if err != nil {
return nil, 0, err
@ -220,7 +220,7 @@ func (r *Reader) ReadScanReply() ([]string, uint64, error) {
return keys, cursor, err
}
func (r *Reader) readTmpBytesReply(line []byte) ([]byte, error) {
func (r Reader) readTmpBytesReply(line []byte) ([]byte, error) {
if isNilReply(line) {
return nil, Nil
}
@ -237,7 +237,7 @@ func (r *Reader) readTmpBytesReply(line []byte) ([]byte, error) {
return b[:replyLen], nil
}
func (r *Reader) ReadInt() (int64, error) {
func (r Reader) ReadInt() (int64, error) {
b, err := r.ReadTmpBytesReply()
if err != nil {
return 0, err
@ -245,7 +245,7 @@ func (r *Reader) ReadInt() (int64, error) {
return util.ParseInt(b, 10, 64)
}
func (r *Reader) ReadUint() (uint64, error) {
func (r Reader) ReadUint() (uint64, error) {
b, err := r.ReadTmpBytesReply()
if err != nil {
return 0, err

4
internal/proto/reader_test.go
View File

@ -11,7 +11,7 @@ import (
. "github.com/onsi/gomega"
)
func newReader(s string) *proto.Reader {
func newReader(s string) proto.Reader {
return proto.NewReader(proto.NewElasticBufReader(strings.NewReader(s)))
}
@ -78,7 +78,7 @@ func benchmarkParseReply(b *testing.B, reply string, m proto.MultiBulkParse, wan
}
}
func multiBulkParse(p *proto.Reader, n int64) (interface{}, error) {
func multiBulkParse(p proto.Reader, n int64) (interface{}, error) {
vv := make([]interface{}, 0, n)
for i := int64(0); i < n; i++ {
v, err := p.ReadReply(multiBulkParse)