From 08c32998297e66486416d4021630510eafdcd81e Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 10 Mar 2023 09:38:49 -0800 Subject: database/sql: remove a distracting alloc, use atomic.Bool This removes an allocation in Conn.grabConn that, while not super important, was distracting me when optimizing code elsewhere. While here, convert an atomic that was forgotten when this package was earlier updated to use the new Go 1.19 typed atomics. Change-Id: I4666256b4c0512e2162bd485c389130699f9d5ed Reviewed-on: https://go-review.googlesource.com/c/go/+/475415 Reviewed-by: David Crawshaw Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Cherry Mui Run-TryBot: Brad Fitzpatrick --- src/database/sql/sql_test.go | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'src/database/sql/sql_test.go') diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index 8c58723c03..2b3d76f513 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -9,6 +9,8 @@ import ( "database/sql/driver" "errors" "fmt" + "internal/race" + "internal/testenv" "math/rand" "reflect" "runtime" @@ -4583,3 +4585,35 @@ func BenchmarkManyConcurrentQueries(b *testing.B) { } }) } + +func TestGrabConnAllocs(t *testing.T) { + testenv.SkipIfOptimizationOff(t) + if race.Enabled { + t.Skip("skipping allocation test when using race detector") + } + c := new(Conn) + ctx := context.Background() + n := int(testing.AllocsPerRun(1000, func() { + _, release, err := c.grabConn(ctx) + if err != nil { + t.Fatal(err) + } + release(nil) + })) + if n > 0 { + t.Fatalf("Conn.grabConn allocated %v objects; want 0", n) + } +} + +func BenchmarkGrabConn(b *testing.B) { + b.ReportAllocs() + c := new(Conn) + ctx := context.Background() + for i := 0; i < b.N; i++ { + _, release, err := c.grabConn(ctx) + if err != nil { + b.Fatal(err) + } + release(nil) + } +} -- cgit v1.3