GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove rxMsg

pull/483/head
Jack Christensen 2019-02-02 12:41:44 -06:00
parent 2e3738f0a9
commit 1ccd6527f5
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conn.go
View File

@ -708,22 +708,6 @@ func (c *Conn) processContextFreeMsg(msg pgproto3.BackendMessage) (err error) {
return nil
}
func (c *Conn) rxMsg() (pgproto3.BackendMessage, error) {
if !c.IsAlive() {
return nil, ErrDeadConn
}
msg, err := c.pgConn.ReceiveMessage()
if err != nil {
if netErr, ok := err.(net.Error); !(ok && netErr.Timeout()) {
c.die(err)
}
return nil, err
}
return msg, nil
}
func (c *Conn) rxErrorResponse(msg *pgproto3.ErrorResponse) *pgconn.PgError {
err := &pgconn.PgError{
Severity: msg.Severity,
@ -975,7 +959,7 @@ func (c *Conn) waitForPreviousCancelQuery(ctx context.Context) error {
func (c *Conn) ensureConnectionReadyForQuery() error {
for c.pendingReadyForQueryCount > 0 {
msg, err := c.rxMsg()
msg, err := c.pgConn.ReceiveMessage()
if err != nil {
return err
}

2
fastpath.go
View File

@ -79,7 +79,7 @@ func (f *fastpath) Call(oid pgtype.OID, args []fpArg) (res []byte, err error) {
f.cn.pendingReadyForQueryCount++
for {
msg, err := f.cn.rxMsg()
msg, err := f.cn.pgConn.ReceiveMessage()
if err != nil {
return nil, err
}

4
replication.go
View File

@ -219,7 +219,7 @@ func (rc *ReplicationConn) GetConnInfo() *pgtype.ConnInfo {
}
func (rc *ReplicationConn) readReplicationMessage() (r *ReplicationMessage, err error) {
msg, err := rc.c.rxMsg()
msg, err := rc.c.pgConn.ReceiveMessage()
if err != nil {
return
}
@ -344,7 +344,7 @@ func (rc *ReplicationConn) sendReplicationModeQuery(sql string) (*Rows, error) {
rows.fatal(err)
}
msg, err := rc.c.rxMsg()
msg, err := rc.c.pgConn.ReceiveMessage()
if err != nil {
return nil, err
}