apps/redis-go
0
0
Fork 0
mirror of https://github.com/HDT3213/godis.git synced 2025-10-04 16:32:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

tiny fix

Browse Source
This commit is contained in:
hdt3213
2021-06-05 16:43:06 +08:00
parent 083d5b325e
commit 9d03314359
4 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
redis/parser/parser.go
View File

@@ -39,16 +39,15 @@ func ParseOne(data []byte) (redis.Reply, error) {
}
type readState struct {
downloading bool
readingMultiLine bool
expectedArgsCount int
receivedCount int
msgType byte
args [][]byte
fixedLen int64
bulkLen int64
}
func (s *readState) finished() bool {
return s.expectedArgsCount > 0 && s.receivedCount == s.expectedArgsCount
return s.expectedArgsCount > 0 && len(s.args) == s.expectedArgsCount
}
func parse0(reader io.Reader, ch chan<- *Payload) {
@@ -82,7 +81,7 @@ func parse0(reader io.Reader, ch chan<- *Payload) {
}
// parse line
if !state.downloading {
if !state.readingMultiLine {
// receive new response
if msg[0] == '*' {
// multi bulk reply
@@ -110,7 +109,7 @@ func parse0(reader io.Reader, ch chan<- *Payload) {
state = readState{} // reset state
continue
}
if state.fixedLen == -1 { // null bulk reply
if state.bulkLen == -1 { // null bulk reply
ch <- &Payload{
Data: &reply.NullBulkReply{},
}
@@ -129,7 +128,7 @@ func parse0(reader io.Reader, ch chan<- *Payload) {
}
} else {
// receive following bulk reply
err = readBulkBody(msg, &state)
err = readBody(msg, &state)
if err != nil {
ch <- &Payload{
Err: errors.New("protocol error: " + string(msg)),
@@ -158,7 +157,7 @@ func parse0(reader io.Reader, ch chan<- *Payload) {
func readLine(bufReader *bufio.Reader, state *readState) ([]byte, bool, error) {
var msg []byte
var err error
if state.fixedLen == 0 { // read normal line
if state.bulkLen == 0 { // read normal line
msg, err = bufReader.ReadBytes('\n')
if err != nil {
return nil, true, err
@@ -167,7 +166,7 @@ func readLine(bufReader *bufio.Reader, state *readState) ([]byte, bool, error) {
return nil, false, errors.New("protocol error: " + string(msg))
}
} else { // read bulk line (binary safe)
msg = make([]byte, state.fixedLen+2)
msg = make([]byte, state.bulkLen+2)
_, err = io.ReadFull(bufReader, msg)
if err != nil {
return nil, true, err
@@ -177,7 +176,7 @@ func readLine(bufReader *bufio.Reader, state *readState) ([]byte, bool, error) {
msg[len(msg)-1] != '\n' {
return nil, false, errors.New("protocol error: " + string(msg))
}
state.fixedLen = 0
state.bulkLen = 0
}
return msg, false, nil
}
@@ -195,10 +194,9 @@ func parseMultiBulkHeader(msg []byte, state *readState) error {
} else if expectedLine > 0 {
// first line of multi bulk reply
state.msgType = msg[0]
state.downloading = true
state.readingMultiLine = true
state.expectedArgsCount = int(expectedLine)
state.receivedCount = 0
state.args = make([][]byte, expectedLine)
state.args = make([][]byte, 0, expectedLine)
return nil
} else {
return errors.New("protocol error: " + string(msg))
@@ -207,18 +205,17 @@ func parseMultiBulkHeader(msg []byte, state *readState) error {
func parseBulkHeader(msg []byte, state *readState) error {
var err error
state.fixedLen, err = strconv.ParseInt(string(msg[1:len(msg)-2]), 10, 64)
state.bulkLen, err = strconv.ParseInt(string(msg[1:len(msg)-2]), 10, 64)
if err != nil {
return errors.New("protocol error: " + string(msg))
}
if state.fixedLen == -1 { // null bulk
if state.bulkLen == -1 { // null bulk
return nil
} else if state.fixedLen > 0 {
} else if state.bulkLen > 0 {
state.msgType = msg[0]
state.downloading = true
state.readingMultiLine = true
state.expectedArgsCount = 1
state.receivedCount = 0
state.args = make([][]byte, 1)
state.args = make([][]byte, 0, 1)
return nil
} else {
return errors.New("protocol error: " + string(msg))
@@ -253,23 +250,21 @@ func parseSingleLineReply(msg []byte) (redis.Reply, error) {
}
// read the non-first lines of multi bulk reply or bulk reply
func readBulkBody(msg []byte, state *readState) error {
func readBody(msg []byte, state *readState) error {
line := msg[0 : len(msg)-2]
var err error
if line[0] == '$' {
// bulk reply
state.fixedLen, err = strconv.ParseInt(string(line[1:]), 10, 64)
state.bulkLen, err = strconv.ParseInt(string(line[1:]), 10, 64)
if err != nil {
return errors.New("protocol error: " + string(msg))
}
if state.fixedLen <= 0 { // null bulk in multi bulks
state.args[state.receivedCount] = []byte{}
state.receivedCount++
state.fixedLen = 0
if state.bulkLen <= 0 { // null bulk in multi bulks
state.args = append(state.args, []byte{})
state.bulkLen = 0
}
} else {
state.args[state.receivedCount] = line
state.receivedCount++
state.args = append(state.args, line)
}
return nil
}