remove a few unecessary conversions and trims

master
Jordan Orelli 11 years ago
parent e421be5d42
commit fb6dff1267

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"io" "io"
"strconv" "strconv"
"strings"
) )
var ( var (
@ -48,6 +47,8 @@ func readValue(r io.Reader) (value, error) {
return readError(line[1:]) return readError(line[1:])
case start_integer: case start_integer:
return readInteger(line[1:]) return readInteger(line[1:])
case start_bulkstring:
return readBulkString(line[1:], r)
default: default:
return nil, fmt.Errorf("unable to read redis protocol value: illegal start character: %c", line[0]) return nil, fmt.Errorf("unable to read redis protocol value: illegal start character: %c", line[0])
} }
@ -58,7 +59,7 @@ func readValue(r io.Reader) (value, error) {
type String string type String string
func readString(b []byte) (value, error) { func readString(b []byte) (value, error) {
return String(strings.Trim(string(b), "\r\n")), nil return String(b), nil
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
@ -66,7 +67,7 @@ func readString(b []byte) (value, error) {
type Error string type Error string
func readError(b []byte) (value, error) { func readError(b []byte) (value, error) {
return Error(strings.Trim(string(b), "\r\n")), nil return Error(b), nil
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
@ -74,9 +75,17 @@ func readError(b []byte) (value, error) {
type Integer int64 type Integer int64
func readInteger(b []byte) (value, error) { func readInteger(b []byte) (value, error) {
i, err := strconv.ParseInt(strings.Trim(string(b), "\r\n"), 10, 64) i, err := strconv.ParseInt(string(b), 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to read integer in redis protocol format: %v", err) return nil, fmt.Errorf("unable to read integer in redis protocol format: %v", err)
} }
return Integer(i), nil return Integer(i), nil
} }
// -----------------------------------------------------------------------------------------
type BulkString string
func readBulkString(prefix []byte, r io.Reader) (value, error) {
return nil, nil
}

Loading…
Cancel
Save