localhots
/
bocadillo
1
0
Fork 0
Code Releases Activity

Fix query event parsing

This commit is contained in:
Gregory Eremin 2018-11-12 13:33:10 +01:00
parent cb10d7cecf
commit d8e5bf2d04
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binlog/event_query.go
View File

@ -24,8 +24,16 @@ func (e *QueryEvent) Decode(connBuff []byte) {
schemaLen := int(buf.ReadUint8())
e.ErrorCode = buf.ReadUint16()
statusVarLen := int(buf.ReadUint8())
e.StatusVars = make([]byte, statusVarLen)
copy(e.StatusVars, buf.Read(statusVarLen))
copy(e.Schema, buf.Read(schemaLen))
// FIXME: This is not by the spec but seem to work
// It could be there's an error somewhere and this byte skipping corrects it
buf.Skip(1) // Always 0x00
copy(e.Query, buf.Cur())
e.Schema = make([]byte, schemaLen)
copy(e.Schema, buf.Read(schemaLen))
buf.Skip(1) // Always 0x00
e.Query = buf.Cur()
}

2
tools/buffer.go
View File

@ -37,7 +37,7 @@ func (b *Buffer) Read(n int) []byte {
b.pos += n
Debugf("Read %d bytes: %X\n", n, b.data[b.pos-n:b.pos])
return b.data[b.pos-n:]
return b.data[b.pos-n : b.pos]
}
// Cur returns remaining unread buffer.