Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

database/sql: fix accumulation of bad conns on prepared statements

Browse source 
Fixes an issue where prepared statements that outlive many
connections become expensive to invoke.

Fixes #6081

R=golang-dev
CC=bradfitz, golang-dev
https://golang.org/cl/12646044
This commit is contained in:
Matt Joiner 2013-08-14 09:27:30 -07:00 • committed by Brad Fitzpatrick
parent e0ca536f36
commit 13c7896fb6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pkg/database/sql/sql.go
View file

@ -518,12 +518,12 @@ var (
func (db *DB) connIfFree(wanted *driverConn) (*driverConn, error) { func (db *DB) connIfFree(wanted *driverConn) (*driverConn, error) {
db.mu.Lock() db.mu.Lock()
defer db.mu.Unlock() defer db.mu.Unlock()
if wanted.inUse {
return nil, errConnBusy
}
if wanted.dbmuClosed { if wanted.dbmuClosed {
return nil, errConnClosed return nil, errConnClosed
} }
if wanted.inUse {
return nil, errConnBusy
}
for i, conn := range db.freeConn { for i, conn := range db.freeConn {
if conn != wanted { if conn != wanted {
continue continue
@ -590,6 +590,7 @@ func (db *DB) putConn(dc *driverConn, err error) {
if err == driver.ErrBadConn { if err == driver.ErrBadConn {
// Don't reuse bad connections. // Don't reuse bad connections.
db.mu.Unlock() db.mu.Unlock()
dc.Close()
return return
} }
if putConnHook != nil { if putConnHook != nil {

1
src/pkg/database/sql/sql_test.go
View file

@ -1112,7 +1112,6 @@ func manyConcurrentQueries(t testOrBench) {
} }
func TestIssue6081(t *testing.T) { func TestIssue6081(t *testing.T) {
t.Skip("known broken test")
db := newTestDB(t, "people") db := newTestDB(t, "people")
defer closeDB(t, db) defer closeDB(t, db)