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

Rename ConnectionPool to ConnPool

scan-io
Jack Christensen 2014-05-17 13:38:44 -05:00
parent 1ff653ae15
commit f9a2501100
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bench_test.go
View File

@ -634,9 +634,9 @@ func BenchmarkTimestampTzBinary(b *testing.B) {
}
}
func BenchmarkConnectionPool(b *testing.B) {
func BenchmarkConnPool(b *testing.B) {
options := pgx.ConnectionPoolOptions{MaxConnections: 5}
pool, err := pgx.NewConnectionPool(*defaultConnConfig, options)
pool, err := pgx.NewConnPool(*defaultConnConfig, options)
if err != nil {
b.Fatalf("Unable to create connection pool: %v", err)
}

2
conn.go
View File

@ -37,7 +37,7 @@ type ConnConfig struct {
}
// Conn is a PostgreSQL connection handle. It is not safe for concurrent usage.
// Use ConnectionPool to manage access to multiple database connections from multiple
// Use ConnPool to manage access to multiple database connections from multiple
// goroutines.
type Conn struct {
conn net.Conn // the underlying TCP or unix domain socket connection

40
connection_pool.go → conn_pool.go
View File

@ -11,7 +11,7 @@ type ConnectionPoolOptions struct {
Logger Logger
}
type ConnectionPool struct {
type ConnPool struct {
allConnections []*Conn
availableConnections []*Conn
cond *sync.Cond
@ -27,10 +27,10 @@ type ConnectionPoolStat struct {
AvailableConnections int // unused live connections
}
// NewConnectionPool creates a new ConnectionPool. config are passed through to
// NewConnPool creates a new ConnPool. config are passed through to
// Connect directly.
func NewConnectionPool(config ConnConfig, options ConnectionPoolOptions) (p *ConnectionPool, err error) {
p = new(ConnectionPool)
func NewConnPool(config ConnConfig, options ConnectionPoolOptions) (p *ConnPool, err error) {
p = new(ConnPool)
p.config = config
p.maxConnections = options.MaxConnections
p.afterConnect = options.AfterConnect
@ -57,7 +57,7 @@ func NewConnectionPool(config ConnConfig, options ConnectionPoolOptions) (p *Con
}
// Acquire takes exclusive use of a connection until it is released.
func (p *ConnectionPool) Acquire() (c *Conn, err error) {
func (p *ConnPool) Acquire() (c *Conn, err error) {
p.cond.L.Lock()
defer p.cond.L.Unlock()
@ -93,7 +93,7 @@ func (p *ConnectionPool) Acquire() (c *Conn, err error) {
}
// Release gives up use of a connection.
func (p *ConnectionPool) Release(conn *Conn) {
func (p *ConnPool) Release(conn *Conn) {
if conn.TxStatus != 'I' {
conn.Execute("rollback")
}
@ -116,7 +116,7 @@ func (p *ConnectionPool) Release(conn *Conn) {
}
// Close ends the use of a connection by closing all underlying connections.
func (p *ConnectionPool) Close() {
func (p *ConnPool) Close() {
for i := 0; i < p.maxConnections; i++ {
if c, err := p.Acquire(); err != nil {
_ = c.Close()
@ -124,7 +124,7 @@ func (p *ConnectionPool) Close() {
}
}
func (p *ConnectionPool) Stat() (s ConnectionPoolStat) {
func (p *ConnPool) Stat() (s ConnectionPoolStat) {
p.cond.L.Lock()
defer p.cond.L.Unlock()
@ -134,15 +134,15 @@ func (p *ConnectionPool) Stat() (s ConnectionPoolStat) {
return
}
func (p *ConnectionPool) MaxConnectionCount() int {
func (p *ConnPool) MaxConnectionCount() int {
return p.maxConnections
}
func (p *ConnectionPool) CurrentConnectionCount() int {
func (p *ConnPool) CurrentConnectionCount() int {
return p.maxConnections
}
func (p *ConnectionPool) createConnection() (c *Conn, err error) {
func (p *ConnPool) createConnection() (c *Conn, err error) {
c, err = Connect(p.config)
if err != nil {
return
@ -157,7 +157,7 @@ func (p *ConnectionPool) createConnection() (c *Conn, err error) {
}
// SelectFunc acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) SelectFunc(sql string, onDataRow func(*DataRowReader) error, arguments ...interface{}) (err error) {
func (p *ConnPool) SelectFunc(sql string, onDataRow func(*DataRowReader) error, arguments ...interface{}) (err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -168,7 +168,7 @@ func (p *ConnectionPool) SelectFunc(sql string, onDataRow func(*DataRowReader) e
}
// SelectRows acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) SelectRows(sql string, arguments ...interface{}) (rows []map[string]interface{}, err error) {
func (p *ConnPool) SelectRows(sql string, arguments ...interface{}) (rows []map[string]interface{}, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -179,7 +179,7 @@ func (p *ConnectionPool) SelectRows(sql string, arguments ...interface{}) (rows
}
// SelectRow acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) SelectRow(sql string, arguments ...interface{}) (row map[string]interface{}, err error) {
func (p *ConnPool) SelectRow(sql string, arguments ...interface{}) (row map[string]interface{}, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -190,7 +190,7 @@ func (p *ConnectionPool) SelectRow(sql string, arguments ...interface{}) (row ma
}
// SelectValue acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) SelectValue(sql string, arguments ...interface{}) (v interface{}, err error) {
func (p *ConnPool) SelectValue(sql string, arguments ...interface{}) (v interface{}, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -201,7 +201,7 @@ func (p *ConnectionPool) SelectValue(sql string, arguments ...interface{}) (v in
}
// SelectValueTo acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) SelectValueTo(w io.Writer, sql string, arguments ...interface{}) (err error) {
func (p *ConnPool) SelectValueTo(w io.Writer, sql string, arguments ...interface{}) (err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -212,7 +212,7 @@ func (p *ConnectionPool) SelectValueTo(w io.Writer, sql string, arguments ...int
}
// SelectValues acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) SelectValues(sql string, arguments ...interface{}) (values []interface{}, err error) {
func (p *ConnPool) SelectValues(sql string, arguments ...interface{}) (values []interface{}, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -223,7 +223,7 @@ func (p *ConnectionPool) SelectValues(sql string, arguments ...interface{}) (val
}
// Execute acquires a connection, delegates the call to that connection, and releases the connection
func (p *ConnectionPool) Execute(sql string, arguments ...interface{}) (commandTag string, err error) {
func (p *ConnPool) Execute(sql string, arguments ...interface{}) (commandTag string, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -236,7 +236,7 @@ func (p *ConnectionPool) Execute(sql string, arguments ...interface{}) (commandT
// Transaction acquires a connection, delegates the call to that connection,
// and releases the connection. The call signature differs slightly from the
// underlying Transaction in that the callback function accepts a *Conn
func (p *ConnectionPool) Transaction(f func(conn *Conn) bool) (committed bool, err error) {
func (p *ConnPool) Transaction(f func(conn *Conn) bool) (committed bool, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return
@ -251,7 +251,7 @@ func (p *ConnectionPool) Transaction(f func(conn *Conn) bool) (committed bool, e
// TransactionIso acquires a connection, delegates the call to that connection,
// and releases the connection. The call signature differs slightly from the
// underlying TransactionIso in that the callback function accepts a *Conn
func (p *ConnectionPool) TransactionIso(isoLevel string, f func(conn *Conn) bool) (committed bool, err error) {
func (p *ConnPool) TransactionIso(isoLevel string, f func(conn *Conn) bool) (committed bool, err error) {
var c *Conn
if c, err = p.Acquire(); err != nil {
return

22
connection_pool_test.go → conn_pool_test.go
View File

@ -8,16 +8,16 @@ import (
"testing"
)
func createConnectionPool(t *testing.T, maxConnections int) *pgx.ConnectionPool {
func createConnPool(t *testing.T, maxConnections int) *pgx.ConnPool {
options := pgx.ConnectionPoolOptions{MaxConnections: maxConnections}
pool, err := pgx.NewConnectionPool(*defaultConnConfig, options)
pool, err := pgx.NewConnPool(*defaultConnConfig, options)
if err != nil {
t.Fatalf("Unable to create connection pool: %v", err)
}
return pool
}
func TestNewConnectionPool(t *testing.T) {
func TestNewConnPool(t *testing.T) {
var numCallbacks int
afterConnect := func(c *pgx.Conn) error {
numCallbacks++
@ -25,7 +25,7 @@ func TestNewConnectionPool(t *testing.T) {
}
options := pgx.ConnectionPoolOptions{MaxConnections: 2, AfterConnect: afterConnect}
pool, err := pgx.NewConnectionPool(*defaultConnConfig, options)
pool, err := pgx.NewConnPool(*defaultConnConfig, options)
if err != nil {
t.Fatal("Unable to establish connection pool")
}
@ -44,7 +44,7 @@ func TestNewConnectionPool(t *testing.T) {
}
options = pgx.ConnectionPoolOptions{MaxConnections: 2, AfterConnect: afterConnect}
pool, err = pgx.NewConnectionPool(*defaultConnConfig, options)
pool, err = pgx.NewConnPool(*defaultConnConfig, options)
if err != errAfterConnect {
t.Errorf("Expected errAfterConnect but received unexpected: %v", err)
}
@ -54,7 +54,7 @@ func TestPoolAcquireAndReleaseCycle(t *testing.T) {
maxConnections := 2
incrementCount := int32(100)
completeSync := make(chan int)
pool := createConnectionPool(t, maxConnections)
pool := createConnPool(t, maxConnections)
defer pool.Close()
acquireAll := func() (connections []*pgx.Conn) {
@ -125,7 +125,7 @@ func TestPoolAcquireAndReleaseCycle(t *testing.T) {
}
func TestPoolReleaseWithTransactions(t *testing.T) {
pool := createConnectionPool(t, 1)
pool := createConnPool(t, 1)
defer pool.Close()
conn, err := pool.Acquire()
@ -164,7 +164,7 @@ func TestPoolReleaseWithTransactions(t *testing.T) {
func TestPoolAcquireAndReleaseCycleAutoConnect(t *testing.T) {
maxConnections := 3
pool := createConnectionPool(t, maxConnections)
pool := createConnPool(t, maxConnections)
defer pool.Close()
doSomething := func() {
@ -203,7 +203,7 @@ func TestPoolAcquireAndReleaseCycleAutoConnect(t *testing.T) {
func TestPoolReleaseDiscardsDeadConnections(t *testing.T) {
maxConnections := 3
pool := createConnectionPool(t, maxConnections)
pool := createConnPool(t, maxConnections)
defer pool.Close()
var c1, c2 *pgx.Conn
@ -262,7 +262,7 @@ func TestPoolReleaseDiscardsDeadConnections(t *testing.T) {
}
func TestPoolTransaction(t *testing.T) {
pool := createConnectionPool(t, 1)
pool := createConnPool(t, 1)
defer pool.Close()
committed, err := pool.Transaction(func(conn *pgx.Conn) bool {
@ -315,7 +315,7 @@ func TestPoolTransaction(t *testing.T) {
}
func TestPoolTransactionIso(t *testing.T) {
pool := createConnectionPool(t, 1)
pool := createConnPool(t, 1)
defer pool.Close()
committed, err := pool.TransactionIso("serializable", func(conn *pgx.Conn) bool {

2
examples/url_shortener/main.go
View File

@ -8,7 +8,7 @@ import (
"os"
)
var pool *pgx.ConnectionPool
var pool *pgx.ConnPool
// afterConnect creates the prepared statements that this application uses
func afterConnect(conn *pgx.Conn) (err error) {