[go] database/sql: replaced context.Background() invocations with global …
Gerrit Bot (Gerrit)
Gerrit Bot has uploaded this change for review.
database/sql: replaced context.Background() invocations with global …
Reduced redundant context.Background() calls. Since context.Background() is returning an empty, package scoped static empty ctx.
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
GitHub-Last-Rev: e274a566716642080af3f94403430f570dbc5fb1
GitHub-Pull-Request: golang/go#60575
---
M src/database/sql/sql.go
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index a77d63d..9cd29a9 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -35,6 +35,10 @@
drivers = make(map[string]driver.Driver)
)
+// backgroundCtx is the default context used by the [sql]. It is never canceled, has no
+// values, and has no deadline.
+var backgroundCtx = context.Background()
+
// nowFunc returns the current time; it's overridden in tests.
var nowFunc = time.Now
@@ -779,7 +783,7 @@
// function should be called just once. It is rarely necessary to
// close a DB.
func OpenDB(c driver.Connector) *DB {
- ctx, cancel := context.WithCancel(context.Background())
+ ctx, cancel := context.WithCancel(backgroundCtx)
db := &DB{
connector: c,
openerCh: make(chan struct{}, connectionRequestQueueSize),
@@ -864,7 +868,7 @@
// Ping uses context.Background internally; to specify the context, use
// PingContext.
func (db *DB) Ping() error {
- return db.PingContext(context.Background())
+ return db.PingContext(backgroundCtx)
}
// Close closes the database and prevents new queries from starting.
@@ -1574,7 +1578,7 @@
// Prepare uses context.Background internally; to specify the context, use
// PrepareContext.
func (db *DB) Prepare(query string) (*Stmt, error) {
- return db.PrepareContext(context.Background(), query)
+ return db.PrepareContext(backgroundCtx, query)
}
func (db *DB) prepare(ctx context.Context, query string, strategy connReuseStrategy) (*Stmt, error) {
@@ -1644,7 +1648,7 @@
// Exec uses context.Background internally; to specify the context, use
// ExecContext.
func (db *DB) Exec(query string, args ...any) (Result, error) {
- return db.ExecContext(context.Background(), query, args...)
+ return db.ExecContext(backgroundCtx, query, args...)
}
func (db *DB) exec(ctx context.Context, query string, args []any, strategy connReuseStrategy) (Result, error) {
@@ -1714,7 +1718,7 @@
// Query uses context.Background internally; to specify the context, use
// QueryContext.
func (db *DB) Query(query string, args ...any) (*Rows, error) {
- return db.QueryContext(context.Background(), query, args...)
+ return db.QueryContext(backgroundCtx, query, args...)
}
func (db *DB) query(ctx context.Context, query string, args []any, strategy connReuseStrategy) (*Rows, error) {
@@ -1815,7 +1819,7 @@
// QueryRow uses context.Background internally; to specify the context, use
// QueryRowContext.
func (db *DB) QueryRow(query string, args ...any) *Row {
- return db.QueryRowContext(context.Background(), query, args...)
+ return db.QueryRowContext(backgroundCtx, query, args...)
}
// BeginTx starts a transaction.
@@ -1846,7 +1850,7 @@
// Begin uses context.Background internally; to specify the context, use
// BeginTx.
func (db *DB) Begin() (*Tx, error) {
- return db.BeginTx(context.Background(), nil)
+ return db.BeginTx(backgroundCtx, nil)
}
func (db *DB) begin(ctx context.Context, opts *TxOptions, strategy connReuseStrategy) (tx *Tx, err error) {
@@ -2357,7 +2361,7 @@
// Prepare uses context.Background internally; to specify the context, use
// PrepareContext.
func (tx *Tx) Prepare(query string) (*Stmt, error) {
- return tx.PrepareContext(context.Background(), query)
+ return tx.PrepareContext(backgroundCtx, query)
}
// StmtContext returns a transaction-specific prepared statement from
@@ -2465,7 +2469,7 @@
// Stmt uses context.Background internally; to specify the context, use
// StmtContext.
func (tx *Tx) Stmt(stmt *Stmt) *Stmt {
- return tx.StmtContext(context.Background(), stmt)
+ return tx.StmtContext(backgroundCtx, stmt)
}
// ExecContext executes a query that doesn't return rows.
@@ -2484,7 +2488,7 @@
// Exec uses context.Background internally; to specify the context, use
// ExecContext.
func (tx *Tx) Exec(query string, args ...any) (Result, error) {
- return tx.ExecContext(context.Background(), query, args...)
+ return tx.ExecContext(backgroundCtx, query, args...)
}
// QueryContext executes a query that returns rows, typically a SELECT.
@@ -2502,7 +2506,7 @@
// Query uses context.Background internally; to specify the context, use
// QueryContext.
func (tx *Tx) Query(query string, args ...any) (*Rows, error) {
- return tx.QueryContext(context.Background(), query, args...)
+ return tx.QueryContext(backgroundCtx, query, args...)
}
// QueryRowContext executes a query that is expected to return at most one row.
@@ -2526,7 +2530,7 @@
// QueryRow uses context.Background internally; to specify the context, use
// QueryRowContext.
func (tx *Tx) QueryRow(query string, args ...any) *Row {
- return tx.QueryRowContext(context.Background(), query, args...)
+ return tx.QueryRowContext(backgroundCtx, query, args...)
}
// connStmt is a prepared statement on a particular connection.
@@ -2627,7 +2631,7 @@
// Exec uses context.Background internally; to specify the context, use
// ExecContext.
func (s *Stmt) Exec(args ...any) (Result, error) {
- return s.ExecContext(context.Background(), args...)
+ return s.ExecContext(backgroundCtx, args...)
}
func resultFromStatement(ctx context.Context, ci driver.Conn, ds *driverStmt, args ...any) (Result, error) {
@@ -2795,7 +2799,7 @@
// Query uses context.Background internally; to specify the context, use
// QueryContext.
func (s *Stmt) Query(args ...any) (*Rows, error) {
- return s.QueryContext(context.Background(), args...)
+ return s.QueryContext(backgroundCtx, args...)
}
func rowsiFromStatement(ctx context.Context, ci driver.Conn, ds *driverStmt, args ...any) (driver.Rows, error) {
@@ -2837,7 +2841,7 @@
// QueryRow uses context.Background internally; to specify the context, use
// QueryRowContext.
func (s *Stmt) QueryRow(args ...any) *Row {
- return s.QueryRowContext(context.Background(), args...)
+ return s.QueryRowContext(backgroundCtx, args...)
}
// Close closes the statement.
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Gerrit Bot uploaded patch set #2 to this change.
database/sql: replaced context.Background() invocations with global …
Reduced redundant context.Background() calls. Since context.Background() is returning an empty, package scoped static empty ctx.
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
GitHub-Last-Rev: a748b726d9340992b1957fc5daf7e78cb0d161a0
GitHub-Pull-Request: golang/go#60575
---
M src/database/sql/sql.go
1 file changed, 19 insertions(+), 15 deletions(-)
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Gerrit Bot uploaded patch set #3 to this change.
database/sql: replaced context.Background() invocations with global …
Reduced redundant context.Background() calls. Since context.Background() is returning an empty, package scoped static empty ctx.
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
GitHub-Last-Rev: 17e8b423e6427a2f1d04cb4ae8ce58f6cb6e6bb5
GitHub-Pull-Request: golang/go#60575
---
M src/database/sql/sql.go
1 file changed, 19 insertions(+), 15 deletions(-)
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Gerrit Bot uploaded patch set #4 to this change.
database/sql: replaced context.Background() invocations with global …
Reduced redundant context.Background() calls. Since context.Background() is returning an empty, package scoped static empty ctx.
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
GitHub-Last-Rev: 2124157a69663aeba04bccf4ff3940d91372604a
GitHub-Pull-Request: golang/go#60575
---
M src/database/sql/sql.go
1 file changed, 19 insertions(+), 15 deletions(-)
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Hiro Hamada (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Brad Fitzpatrick, Daniel Theophanes, Ian Lance Taylor, Robert Griesemer.
Patch set 4:Code-Review +1
1 comment:
Patchset:
I would like have my change reviewed
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Hiro Hamada (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Brad Fitzpatrick, Daniel Theophanes, Ian Lance Taylor, Robert Griesemer.
1 comment:
Patchset:
Can we have this reviewed faster? Tests are passing and improvement could significantly lower the cpu cycles.
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Brad Fitzpatrick (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Daniel Theophanes, Ian Lance Taylor, Robert Griesemer.
1 comment:
Patchset:
Can we have this reviewed faster? Tests are passing and improvement could significantly lower the cp […]
This change looks like it does nothing. context.Background() should inline to exactly the same code, but the current way without this change was more readable and idiomatic.
Please come back with performance numbers to justify this change. But I don't think you'll find any.
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Brad Fitzpatrick, Daniel Theophanes, Ian Lance Taylor, Robert Griesemer.
Gerrit Bot uploaded patch set #5 to this change.
database/sql: replaced context.Background() invocations with global …
Reduced redundant context.Background() calls. Since context.Background() is returning an empty, package scoped static empty ctx.
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
Change-Id: Ibbef5d471e9c651d6c413c1319530a83be6a17e5
GitHub-Last-Rev: fef21bf48a2603f98a95c4821604449c29611c14
GitHub-Pull-Request: golang/go#60575
---
M src/database/sql/sql.go
1 file changed, 19 insertions(+), 15 deletions(-)
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Hiro Hamada (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Brad Fitzpatrick, Daniel Theophanes, Ian Lance Taylor, Robert Griesemer.
1 comment:
Patchset:
This change looks like it does nothing. context. […]
Hi Brad I was under the notion that "inlining is limited to functions within the same package. The Go compiler considers inlining when optimizing code within a single package, but it does not perform inlining across package boundaries. This is because inlining across packages would violate the encapsulation and modularity principles of Go."
I ill look into greater detail logs and dumps then..
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Hiro Hamada (Gerrit)
Attention is currently required from: Brad Fitzpatrick, Brad Fitzpatrick, Daniel Theophanes, Ian Lance Taylor, Robert Griesemer.
2 comments:
Patchset:
Hi Brad I was under the notion that "inlining is limited to functions within the same package. […]
Never mind i went and looked optimization logs during compilation & saw
./sql.go:40:39: inlining call to context.Background
Patchset:
Withdrawing the PR
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Ian Lance Taylor (Gerrit)
1 comment:
Patchset:
Never mind i went and looked optimization logs during compilation & saw […]
Where is that quote from? As you've discovered, it's inaccurate. Thanks.
To view, visit change 500376. To unsubscribe, or for help writing mail filters, visit settings.