Skip to content

Replaced use of custom buffer type with stdlib implementation #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Replaced use of custom buffer type with stdlib implementation #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df9909f
replaced custom buffer type with bufio.Reader
balasanjay Apr 19, 2013
a0825cc
removed unnecessary file
balasanjay Apr 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 0 additions & 85 deletions buffer.go
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
package mysql

import (
"bufio"
"database/sql/driver"
"errors"
"net"
Expand All @@ -22,7 +23,7 @@ type mysqlConn struct {
charset byte
cipher []byte
netConn net.Conn
buf *buffer
buf *bufio.Reader
protocol uint8
sequence uint8
affectedRows uint64
Expand Down
3 changes: 2 additions & 1 deletion driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
package mysql

import (
"bufio"
"database/sql"
"database/sql/driver"
"net"
Expand Down Expand Up @@ -43,7 +44,7 @@ func (d *mysqlDriver) Open(dsn string) (driver.Conn, error) {
if err != nil {
return nil, err
}
mc.buf = newBuffer(mc.netConn)
mc.buf = bufio.NewReader(mc.netConn)

// Reading Handshake Initialization Packet
err = mc.readInitPacket()
Expand Down
4 changes: 2 additions & 2 deletions packets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
func (mc *mysqlConn) readPacket() (data []byte, err error) {
// Read packet header
data = make([]byte, 4)
err = mc.buf.read(data)
_, err = io.ReadAtLeast(mc.buf, data, len(data))
if err != nil {
errLog.Print(err.Error())
return nil, driver.ErrBadConn
Expand All @@ -53,7 +53,7 @@ func (mc *mysqlConn) readPacket() (data []byte, err error) {

// Read packet body [pktLen bytes]
data = make([]byte, pktLen)
err = mc.buf.read(data)
_, err = io.ReadAtLeast(mc.buf, data, len(data))
if err == nil {
if pktLen < maxPacketSize {
return data, nil
Expand Down