backport benchmark_test (#1706)

Backport benchmark improvements.

Author: methane

.github/workflows/test.yml

@@ -96,6 +96,10 @@ jobs:
 run: |
  go test -v '-race' '-covermode=atomic' '-coverprofile=coverage.out' -parallel 10
 
+ - name: benchmark
+run: |
+ go test -run '^$' -bench .
+
  - name: Send coverage
 uses: shogo82148/actions-goveralls@v1
 with:

benchmark_test.go

@@ -46,10 +46,10 @@ func (tb *TB) checkStmt(stmt *sql.Stmt, err error) *sql.Stmt{
 returnstmt
 }
 
-funcinitDB(b*testing.B, useCompressionbool, queries...string) *sql.DB{
+funcinitDB(b*testing.B, compressbool, queries...string) *sql.DB{
 tb:= (*TB)(b)
 comprStr:=""
-ifuseCompression{
+ifcompress{
 comprStr="&compress=1"
  }
 db:=tb.checkDB(sql.Open(driverNameTest, dsn+comprStr))
@@ -64,16 +64,15 @@ func initDB(b *testing.B, useCompression bool, queries ...string) *sql.DB{
 constconcurrencyLevel=10
 
 funcBenchmarkQuery(b*testing.B){
-benchmarkQueryHelper(b, false)
+benchmarkQuery(b, false)
 }
 
-funcBenchmarkQueryCompression(b*testing.B){
-benchmarkQueryHelper(b, true)
+funcBenchmarkQueryCompressed(b*testing.B){
+benchmarkQuery(b, true)
 }
 
-funcbenchmarkQueryHelper(b*testing.B, comprbool){
+funcbenchmarkQuery(b*testing.B, comprbool){
 tb:= (*TB)(b)
-b.StopTimer()
 b.ReportAllocs()
 db:=initDB(b, compr,
 "DROP TABLE IF EXISTS foo",
@@ -115,8 +114,6 @@ func benchmarkQueryHelper(b *testing.B, compr bool){
 
 funcBenchmarkExec(b*testing.B){
 tb:= (*TB)(b)
-b.StopTimer()
-b.ReportAllocs()
 db:=tb.checkDB(sql.Open(driverNameTest, dsn))
 db.SetMaxIdleConns(concurrencyLevel)
 deferdb.Close()
@@ -128,9 +125,11 @@ func BenchmarkExec(b *testing.B){
 varwg sync.WaitGroup
 wg.Add(concurrencyLevel)
 deferwg.Wait()
-b.StartTimer()
 
-fori:=0; i<concurrencyLevel; i++{
+b.ReportAllocs()
+b.ResetTimer()
+
+fori:=0; i<concurrencyLevel; i++{
 gofunc(){
 for{
 ifatomic.AddInt64(&remain, -1) <0{
@@ -158,14 +157,15 @@ func initRoundtripBenchmarks() ([]byte, int, int){
 }
 
 funcBenchmarkRoundtripTxt(b*testing.B){
-b.StopTimer()
 sample, min, max:=initRoundtripBenchmarks()
 sampleString:=string(sample)
-b.ReportAllocs()
 tb:= (*TB)(b)
 db:=tb.checkDB(sql.Open(driverNameTest, dsn))
 deferdb.Close()
-b.StartTimer()
+
+b.ReportAllocs()
+b.ResetTimer()
+
 varresultstring
 fori:=0; i<b.N; i++{
 length:=min+i
@@ -192,15 +192,15 @@ func BenchmarkRoundtripTxt(b *testing.B){
 }
 
 funcBenchmarkRoundtripBin(b*testing.B){
-b.StopTimer()
 sample, min, max:=initRoundtripBenchmarks()
-b.ReportAllocs()
 tb:= (*TB)(b)
 db:=tb.checkDB(sql.Open(driverNameTest, dsn))
 deferdb.Close()
 stmt:=tb.checkStmt(db.Prepare("SELECT ?"))
 deferstmt.Close()
-b.StartTimer()
+
+b.ReportAllocs()
+b.ResetTimer()
 varresult sql.RawBytes
 fori:=0; i<b.N; i++{
 length:=min+i
@@ -385,10 +385,9 @@ func BenchmarkQueryRawBytes(b *testing.B){
  }
 }
 
-// BenchmarkReceiveMassiveRows measures performance of receiving large number of rows.
-funcBenchmarkReceiveMassiveRows(b*testing.B){
+funcbenchmark10kRows(b*testing.B, compressbool){
 // Setup -- prepare 10000 rows.
-db:=initDB(b, false,
+db:=initDB(b, compress,
 "DROP TABLE IF EXISTS foo",
 "CREATE TABLE foo (id INT PRIMARY KEY, val TEXT)")
 deferdb.Close()
@@ -399,11 +398,14 @@ func BenchmarkReceiveMassiveRows(b *testing.B){
 b.Errorf("failed to prepare query: %v", err)
 return
  }
+
+args:=make([]any, 200)
+fori:=1; i<200; i+=2{
+args[i] =sval
+ }
 fori:=0; i<10000; i+=100{
-args:=make([]any, 200)
 forj:=0; j<100; j++{
 args[j*2] =i+j
-args[j*2+1] =sval
  }
 _, err:=stmt.Exec(args...)
 iferr!=nil{
@@ -413,30 +415,43 @@ func BenchmarkReceiveMassiveRows(b *testing.B){
  }
 stmt.Close()
 
-// Use b.Run() to skip expensive setup.
+// benchmark function called several times with different b.N.
+// it means heavy setup is called multiple times.
+// Use b.Run() to run expensive setup only once.
+// Go 1.24 introduced b.Loop() for this purpose. But we keep this
+// benchmark compatible with Go 1.20.
 b.Run("query", func(b*testing.B){
 b.ReportAllocs()
-
 fori:=0; i<b.N; i++{
 rows, err:=db.Query(`SELECT id, val FROM foo`)
 iferr!=nil{
 b.Errorf("failed to select: %v", err)
 return
  }
+// rows.Scan() escapes arguments. So these variables must be defined
+// before loop.
+variint
+vars sql.RawBytes
 forrows.Next(){
-variint
-vars sql.RawBytes
-err=rows.Scan(&i, &s)
-iferr!=nil{
+iferr:=rows.Scan(&i, &s); err!=nil{
 b.Errorf("failed to scan: %v", err)
-_=rows.Close()
+rows.Close()
 return
  }
  }
 iferr=rows.Err(); err!=nil{
 b.Errorf("failed to read rows: %v", err)
  }
-_=rows.Close()
+rows.Close()
  }
  })
 }
+
+// BenchmarkReceive10kRows measures performance of receiving large number of rows.
+funcBenchmarkReceive10kRows(b*testing.B){
+benchmark10kRows(b, false)
+}
+
+funcBenchmarkReceive10kRowsCompressed(b*testing.B){
+benchmark10kRows(b, true)
+}