introduce mysqlConn.data

Author: shogo82148

auth.go

@@ -361,17 +361,12 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 					pubKey := mc.cfg.pubKey
 					if pubKey == nil {
 						// request public key from server
-						data, err := mc.buf.takeSmallBuffer(4 + 1)
-						if err != nil {
-							return err
-						}
-						data[4] = cachingSha2PasswordRequestPublicKey
-						err = mc.writePacket(data)
-						if err != nil {
+						if err := mc.writeCommandPacket(cachingSha2PasswordRequestPublicKey); err != nil {
 							return err
 						}
 
-						if data, err = mc.readPacket(); err != nil {
+						data, err := mc.readPacket()
+						if err != nil {
 							return err
 						}
 

connection.go

@@ -54,6 +54,7 @@ type mysqlConn struct {
 	canceled atomicError // set non-nil if conn is canceled
 	closed   atomicBool  // set when conn is closed, before closech is closed
 
+	data     [16]byte         // buffer for small reads and writes
 	readRes  chan readResult  // channel for read result
 	writeReq chan []byte      // buffered channel for write packets
 	writeRes chan writeResult // channel for write result

packets.go

@@ -417,18 +417,11 @@ func (mc *mysqlConn) writeCommandPacket(command byte) error {
 	// Reset Packet Sequence
 	mc.sequence = 0
 
-	data, err := mc.buf.takeSmallBuffer(4 + 1)
-	if err != nil {
-		// cannot take the buffer. Something must be wrong with the connection
-		mc.cfg.Logger.Print(err)
-		return errBadConnNoWrite
-	}
-
 	// Add command byte
-	data[4] = command
+	mc.data[4] = command
 
 	// Send CMD packet
-	return mc.writePacket(data)
+	return mc.writePacket(mc.data[:5])
 }
 
 func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {
@@ -457,24 +450,17 @@ func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error {
 	// Reset Packet Sequence
 	mc.sequence = 0
 
-	data, err := mc.buf.takeSmallBuffer(4 + 1 + 4)
-	if err != nil {
-		// cannot take the buffer. Something must be wrong with the connection
-		mc.cfg.Logger.Print(err)
-		return errBadConnNoWrite
-	}
-
 	// Add command byte
-	data[4] = command
+	mc.data[4] = command
 
 	// Add arg [32 bit]
-	data[5] = byte(arg)
-	data[6] = byte(arg >> 8)
-	data[7] = byte(arg >> 16)
-	data[8] = byte(arg >> 24)
+	mc.data[5] = byte(arg)
+	mc.data[6] = byte(arg >> 8)
+	mc.data[7] = byte(arg >> 16)
+	mc.data[8] = byte(arg >> 24)
 
 	// Send CMD packet
-	return mc.writePacket(data)
+	return mc.writePacket(mc.data[:4+1+4])
 }
 
 /******************************************************************************