moved packet result handling to separate file, added most statement functions

Author: Philio

Makefile

@@ -9,6 +9,7 @@ GOFILES=mysql.go\
         writer.go\
         packet.go\
 	convert.go\
+	handler.go\
         result.go\
         statement.go
 

convert.go

@@ -6,6 +6,7 @@
 package mysql
 
 import "math"
+import "os"
 import "strconv"
 
 // bytes to int
@@ -164,3 +165,54 @@ func btof64(b []byte) float64 {
 func f64tob(f float64) []byte {
 	return ui64tob(math.Float64bits(f))
 }
+
+// bytes to length
+func btolcb(b []byte) (num uint64, n int, err os.Error) {
+	switch {
+	// 0-250 = value of first byte
+	case b[0] <= 250:
+		num = uint64(b[0])
+		n = 1
+		return
+	// 251 column value = NULL
+	case b[0] == 251:
+		num = 0
+		n = 1
+		return
+	// 252 following 2 = value of following 16-bit word
+	case b[0] == 252:
+		n = 3
+	// 253 following 3 = value of following 24-bit word
+	case b[0] == 253:
+		n = 4
+	// 254 following 8 = value of following 64-bit word
+	case b[0] == 254:
+		n = 9
+	}
+	// Check there are enough bytes
+	if len(b) < n {
+		err = os.EOF
+		return
+	}
+	// Get uint64
+	t := make([]byte, 8)
+	copy(t, b[1:n])
+	num = btoui64(t)
+	return
+}
+
+// length to bytes
+func lcbtob(n uint64) (b []byte) {
+	switch {
+	// <= 250 = 1 byte
+	case n <= 250:
+		b = []byte{byte(n)}
+	// <= 0xffff = 252 + 2 bytes
+	case n <= 0xffff:
+		b = []byte{0xfc, byte(n), byte(n >> 8)}
+	// <= 0xffffff = 253 + 3 bytes
+	case n <= 0xffffff:
+		b = []byte{0xfd, byte(n), byte(n >> 8), byte(n >> 16)}
+	}
+	return
+}

mysql.go

@@ -765,7 +765,6 @@ func (c *Client) getFields() (err os.Error) {
 			return
 		}
 		if eof {
-			c.result.fieldPos = 0
 			break
 		}
 	}
@@ -812,18 +811,19 @@ func (c *Client) getResult(types packetType) (eof bool, err os.Error) {
 	default:
 		err = &ClientError{CR_UNKNOWN_ERROR, CR_UNKNOWN_ERROR_STR}
 	case *packetOK:
-		err = c.processOKResult(p.(*packetOK))
+		err = handleOK(p.(*packetOK), c, &c.AffectedRows, &c.LastInsertId, &c.Warnings)
 	case *packetError:
-		err = c.processErrorResult(p.(*packetError))
+		err = handleError(p.(*packetError), c)
 	case *packetEOF:
 		eof = true
-		err = c.processEOF(p.(*packetEOF))
+		err = handleEOF(p.(*packetEOF), c)
 	case *packetResultSet:
-		err = c.processResultSetResult(p.(*packetResultSet))
+		c.result = &Result{c: c}
+		err = handleResultSet(p.(*packetResultSet), c, c.result)
 	case *packetField:
-		err = c.processFieldResult(p.(*packetField))
+		err = handleField(p.(*packetField), c, c.result)
 	case *packetRowData:
-		err = c.processRowResult(p.(*packetRowData))
+		err = handleRow(p.(*packetRowData), c, c.result)
 	}
 	return
 }
@@ -836,136 +836,3 @@ func (c *Client) checkSequence(sequence uint8) (err os.Error) {
 	}
 	return
 }
-
-// Process OK packet
-func (c *Client) processOKResult(p *packetOK) (err os.Error) {
-	// Log OK result
-	c.log(1, "[%d] Received OK packet", p.sequence)
-	// Check sequence
-	err = c.checkSequence(p.sequence)
-	if err != nil {
-		return
-	}
-	// Store packet data
-	c.AffectedRows = p.affectedRows
-	c.LastInsertId = p.insertId
-	c.Warnings = p.warningCount
-	c.serverStatus = ServerStatus(p.serverStatus)
-	// Full logging [level 3]
-	if c.LogLevel > 2 {
-		c.logStatus()
-	}
-	return
-}
-
-// Process error packet
-func (c *Client) processErrorResult(p *packetError) (err os.Error) {
-	// Log error result
-	c.log(1, "[%d] Received error packet", p.sequence)
-	// Check sequence
-	err = c.checkSequence(p.sequence)
-	if err != nil {
-		return
-	}
-	// Check and unset more results flag
-	// @todo maybe serverStatus should just be zeroed?
-	if c.MoreResults() {
-		c.serverStatus ^= SERVER_MORE_RESULTS_EXISTS
-	}
-	// Return error
-	return &ServerError{Errno(p.errno), Error(p.error)}
-}
-
-// Process EOF packet
-func (c *Client) processEOF(p *packetEOF) (err os.Error) {
-	// Log EOF result
-	c.log(1, "[%d] Received EOF packet", p.sequence)
-	// Check sequence
-	err = c.checkSequence(p.sequence)
-	if err != nil {
-		return
-	}
-	// Store packet data
-	if p.useStatus {
-		c.serverStatus = ServerStatus(p.serverStatus)
-		// Full logging [level 3]
-		if c.LogLevel > 2 {
-			c.logStatus()
-		}
-	}
-	return
-}
-
-// Process result set packet
-func (c *Client) processResultSetResult(p *packetResultSet) (err os.Error) {
-	// Log error result
-	c.log(1, "[%d] Received result set packet", p.sequence)
-	// Check sequence
-	err = c.checkSequence(p.sequence)
-	if err != nil {
-		return
-	}
-	// Create new result
-	c.result = &Result{
-		c:          c,
-		fieldCount: p.fieldCount,
-	}
-	return
-}
-
-// Process field packet
-func (c *Client) processFieldResult(p *packetField) (err os.Error) {
-	// Log field result
-	c.log(1, "[%d] Received field packet", p.sequence)
-	// Check sequence
-	err = c.checkSequence(p.sequence)
-	if err != nil {
-		return
-	}
-	// Check if there is a result set
-	if c.result == nil || c.result.mode == RESULT_FREE {
-		return
-	}
-	// Assign fields if needed
-	if len(c.result.fields) == 0 {
-		c.result.fields = make([]*Field, c.result.fieldCount)
-	}
-	// Create new field and add to result
-	c.result.fields[c.result.fieldPos] = &Field{
-		Database: p.database,
-		Table:    p.table,
-		Name:     p.name,
-		Length:   p.length,
-		Type:     p.fieldType,
-		Flags:    p.flags,
-		Decimals: p.decimals,
-	}
-	c.result.fieldPos++
-	return
-}
-
-// Process row packet
-func (c *Client) processRowResult(p *packetRowData) (err os.Error) {
-	// Log field result
-	c.log(1, "[%d] Received row packet", p.sequence)
-	// Check sequence
-	err = c.checkSequence(p.sequence)
-	if err != nil {
-		return
-	}
-	// Check if there is a result set
-	if c.result == nil || c.result.mode == RESULT_FREE {
-		return
-	}
-	// Stored result
-	if c.result.mode == RESULT_STORED {
-		// Cast and append the row
-		c.result.rows = append(c.result.rows, Row(p.row))
-	}
-	// Used result
-	if c.result.mode == RESULT_USED {
-		// Only save 1 row, overwrite previous
-		c.result.rows = []Row{Row(p.row)}
-	}
-	return
-}

packet.go

@@ -8,6 +8,7 @@ package mysql
 import (
 	"bytes"
 	"os"
+	"fmt"
 )
 
 // Packet type identifier
@@ -65,41 +66,6 @@ func (p *packetBase) readSlice(data []byte, delim byte) (slice []byte, err os.Er
 	return
 }
 
-// Read length coded binary
-func (p *packetBase) readLengthCodedBinary(data []byte) (num uint64, n int, err os.Error) {
-	switch {
-	// 0-250 = value of first byte
-	case data[0] <= 250:
-		num = uint64(data[0])
-		n = 1
-		return
-	// 251 column value = NULL
-	case data[0] == 251:
-		num = 0
-		n = 1
-		return
-	// 252 following 2 = value of following 16-bit word
-	case data[0] == 252:
-		n = 3
-	// 253 following 3 = value of following 24-bit word
-	case data[0] == 253:
-		n = 4
-	// 254 following 8 = value of following 64-bit word
-	case data[0] == 254:
-		n = 9
-	}
-	// Check there are enough bytes
-	if len(data) < n {
-		err = os.EOF
-		return
-	}
-	// Get uint64
-	b := make([]byte, 8)
-	copy(b, data[1:n])
-	num = btoui64(b)
-	return
-}
-
 // Read length coded string
 func (p *packetBase) readLengthCodedString(data []byte) (s string, n int, err os.Error) {
 	// Read bytes and convert to string
@@ -113,7 +79,7 @@ func (p *packetBase) readLengthCodedString(data []byte) (s string, n int, err os
 
 func (p *packetBase) readLengthCodedBytes(data []byte) (b []byte, n int, err os.Error) {
 	// Get string length
-	num, n, err := p.readLengthCodedBinary(data)
+	num, n, err := btolcb(data)
 	if err != nil {
 		return
 	}
@@ -283,14 +249,14 @@ func (p *packetOK) read(data []byte) (err os.Error) {
 	// Position (skip first byte/field count)
 	pos := 1
 	// Affected rows [length coded binary]
-	num, n, err := p.readLengthCodedBinary(data[pos:])
+	num, n, err := btolcb(data[pos:])
 	if err != nil {
 		return
 	}
 	p.affectedRows = num
 	pos += n
 	// Insert id [length coded binary]
-	num, n, err = p.readLengthCodedBinary(data[pos:])
+	num, n, err = btolcb(data[pos:])
 	if err != nil {
 		return
 	}
@@ -495,14 +461,14 @@ func (p *packetResultSet) read(data []byte) (err os.Error) {
 	// Position and bytes read
 	var pos, n int
 	// Field count [length coded binary]
-	p.fieldCount, n, err = p.readLengthCodedBinary(data[pos:])
+	p.fieldCount, n, err = btolcb(data[pos:])
 	if err != nil {
 		return
 	}
 	pos += n
 	// Extra [length coded binary]
 	if pos < len(data) {
-		p.extra, n, err = p.readLengthCodedBinary(data[pos:])
+		p.extra, n, err = btolcb(data[pos:])
 		if err != nil {
 			return
 		}
@@ -594,7 +560,7 @@ func (p *packetField) read(data []byte) (err os.Error) {
 		pos++
 		// Default value [len coded binary]
 		if pos < len(data) {
-			p.defaultVal, _, err = p.readLengthCodedBinary(data[pos:])
+			p.defaultVal, _, err = btolcb(data[pos:])
 		}
 	} else {
 		// Table [len coded string]
@@ -651,11 +617,7 @@ func (p *packetRowData) read(data []byte) (err os.Error) {
 			return
 		}
 		// Add to slice
-		if len(p.row) == 0 {
-			p.row = []interface{}{b}
-		} else {
-			p.row = append(p.row, b)
-		}
+		p.row = append(p.row, b)
 		// Increment position and check for end of packet
 		pos += n
 		if pos == len(data) {
@@ -798,13 +760,14 @@ func (p *packetExecute) write() (data []byte, err os.Error) {
 	}
 	// Add the packet header
 	data = p.addHeader(data)
+	fmt.Printf("%#v\n", data)
 	return
 }
 
 // Binary row struct
 type packetRowBinary struct {
 	packetBase
-	row []interface{}
+	data []byte
 }
 
 // Row binary packet reader
@@ -815,5 +778,7 @@ func (p *packetRowBinary) read(data []byte) (err os.Error) {
 			err = &ClientError{CR_MALFORMED_PACKET, CR_MALFORMED_PACKET_STR}
 		}
 	}()
+	// Simply store the row
+	p.data = data
 	return
 }

result.go

@@ -32,8 +32,8 @@ type Field struct {
 	Table    string
 	Name     string
 	Length   uint32
-	Type     uint8
-	Flags    uint16
+	Type     FieldType
+	Flags    FieldFlag
 	Decimals uint8
 }