Skip to content

Commit cc20ec8

Browse files
committed
No longer need to do header calculation for writePacket
1 parent b203832 commit cc20ec8

File tree

2 files changed

+0
-54
lines changed

2 files changed

+0
-54
lines changed

infile.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
114114
for err == nil && ioErr == nil {
115115
n, err = rdr.Read(data[4:])
116116
if n > 0 {
117-
data[0] = byte(n)
118-
data[1] = byte(n >> 8)
119-
data[2] = byte(n >> 16)
120-
data[3] = mc.sequence
121117
ioErr = mc.writePacket(data[:4+n])
122118
}
123119
}

packets.go

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,6 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error {
251251
// SSL Connection Request Packet
252252
// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::SSLRequest
253253
if mc.cfg.tls != nil {
254-
// Packet header [24bit length + 1 byte sequence]
255-
data[0] = byte((4 + 4 + 1 + 23))
256-
data[1] = byte((4 + 4 + 1 + 23) >> 8)
257-
data[2] = byte((4 + 4 + 1 + 23) >> 16)
258-
data[3] = mc.sequence
259-
260254
// Send TLS / SSL request packet
261255
if err := mc.writePacket(data[:(4+4+1+23)+4]); err != nil {
262256
return err
@@ -271,12 +265,6 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error {
271265
mc.buf.rd = tlsConn
272266
}
273267

274-
// Add the packet header [24bit length + 1 byte sequence]
275-
data[0] = byte(pktLen)
276-
data[1] = byte(pktLen >> 8)
277-
data[2] = byte(pktLen >> 16)
278-
data[3] = mc.sequence
279-
280268
// Filler [23 bytes] (all 0x00)
281269
pos := 13 + 23
282270

@@ -316,12 +304,6 @@ func (mc *mysqlConn) writeOldAuthPacket(cipher []byte) error {
316304
return driver.ErrBadConn
317305
}
318306

319-
// Add the packet header [24bit length + 1 byte sequence]
320-
data[0] = byte(pktLen)
321-
data[1] = byte(pktLen >> 8)
322-
data[2] = byte(pktLen >> 16)
323-
data[3] = mc.sequence
324-
325307
// Add the scrambled password [null terminated string]
326308
copy(data[4:], scrambleBuff)
327309

@@ -343,12 +325,6 @@ func (mc *mysqlConn) writeCommandPacket(command byte) error {
343325
return driver.ErrBadConn
344326
}
345327

346-
// Add the packet header [24bit length + 1 byte sequence]
347-
data[0] = 0x01 // 1 byte long
348-
data[1] = 0x00
349-
data[2] = 0x00
350-
data[3] = 0x00 // new command, sequence id is always 0
351-
352328
// Add command byte
353329
data[4] = command
354330

@@ -368,12 +344,6 @@ func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {
368344
return driver.ErrBadConn
369345
}
370346

371-
// Add the packet header [24bit length + 1 byte sequence]
372-
data[0] = byte(pktLen)
373-
data[1] = byte(pktLen >> 8)
374-
data[2] = byte(pktLen >> 16)
375-
data[3] = 0x00 // new command, sequence id is always 0
376-
377347
// Add command byte
378348
data[4] = command
379349

@@ -395,12 +365,6 @@ func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error {
395365
return driver.ErrBadConn
396366
}
397367

398-
// Add the packet header [24bit length + 1 byte sequence]
399-
data[0] = 0x05 // 5 bytes long
400-
data[1] = 0x00
401-
data[2] = 0x00
402-
data[3] = 0x00 // new command, sequence id is always 0
403-
404368
// Add command byte
405369
data[4] = command
406370

@@ -735,12 +699,6 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {
735699
}
736700

737701
stmt.mc.sequence = 0
738-
// Add the packet header [24bit length + 1 byte sequence]
739-
data[0] = byte(pktLen)
740-
data[1] = byte(pktLen >> 8)
741-
data[2] = byte(pktLen >> 16)
742-
data[3] = 0x00 // mc.sequence
743-
744702
// Add command byte [1 byte]
745703
data[4] = comStmtSendLongData
746704

@@ -971,14 +929,6 @@ func (stmt *mysqlStmt) writeExecutePacket(args []driver.Value) error {
971929
pos += len(paramValues)
972930
data = data[:pos]
973931

974-
pktLen := pos - 4
975-
976-
// packet header [4 bytes]
977-
data[0] = byte(pktLen)
978-
data[1] = byte(pktLen >> 8)
979-
data[2] = byte(pktLen >> 16)
980-
data[3] = mc.sequence
981-
982932
// Convert nullMask to bytes
983933
for i, max := 0, (stmt.paramCount+7)>>3; i < max; i++ {
984934
data[i+14] = byte(nullMask >> uint(i<<3))

0 commit comments

Comments
 (0)