fix actions

efectn · Jun 22, 2023 · 494e4d7 · 494e4d7
1 parent f01728a
commit 494e4d7
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 58 deletions.
diff --git a/.github/run_benchmarks_actions.sh b/.github/run_benchmarks_actions.sh
@@ -1,23 +1,16 @@
 #!/usr/bin/env bash
 
 # Prototype benchmark results
-proto=$(cat data/results.md.proto)
-
-# Benchmark operations
-operations=("with-no-flag|1" "multi-5|5" "multi-10|10" "multi-20|20")
+proto=$(cat .github/data/results.md.proto)
 
 # Build benchmarker
 go build main.go
 
-for operation in "${operations[@]}"; do
-    IFS="|"; read -a operation <<< "$operation"
-
-    # Apply output to template
-    logs=$(./main -source="host=localhost user=postgres password=postgres dbname=test sslmode=disable" -multi=${operation[1]} -debug=false) 
-    escaped=$(echo "${logs}" | sed '$!s@$@\\@g')
+# Apply output to template
+logs=$(./main -source="host=localhost user=postgres password=postgres dbname=test sslmode=disable" -debug=false)
+escaped=$(echo "${logs}" | sed '$!s@$@\\@g')
 
-    proto=$(sed "s|@(${operation[0]})|${escaped}|g" <<< $proto)
-done
+proto=$(sed "s|@(benchmark-results)|${escaped}|g" <<< $proto)
 
 # Print final results & delete benchmarker
 rm main

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -21,4 +21,4 @@ jobs:
     - name: Build Benchmarker
       run: go build main.go
     - name: Run Benchmarker
-      run: ./main -source="host=localhost user=postgres password=postgres dbname=test sslmode=disable" -orm=all -multi=1 -debug=false
+      run: ./main -source="host=localhost user=postgres password=postgres dbname=test sslmode=disable" -orm=all -debug=false
diff --git a/bench/beego.go b/bench/beego.go
@@ -4,13 +4,11 @@ import (
 	"fmt"
 	"github.com/astaxie/beego/orm"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 )
 
 type Beego struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn orm.Ormer
 }
 

diff --git a/bench/bun.go b/bench/bun.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	bundb "github.com/uptrace/bun"
@@ -13,7 +12,6 @@ import (
 
 type Bun struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *bundb.DB
 }
 

diff --git a/bench/dbr.go b/bench/dbr.go
@@ -2,7 +2,6 @@ package bench
 
 import (
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	dbrware "github.com/gocraft/dbr/v2"
@@ -13,7 +12,6 @@ var columns = []string{"name", "title", "fax", "web", "age", "right", "counter"}
 
 type Dbr struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *dbrware.Session
 }
 

diff --git a/bench/ent.go b/bench/ent.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	"entgo.io/ent/dialect"
@@ -15,7 +14,6 @@ import (
 
 type Ent struct {
 	helper.ORMInterface
-	mu    sync.Mutex
 	conn  *entdb.Client
 	dbEnt *sql.DB
 }
@@ -102,7 +100,7 @@ func (ent *Ent) InsertMulti(b *testing.B) {
 func (ent *Ent) Update(b *testing.B) {
 	m := NewModelAlt()
 
-	_, err := ent.conn.Model.Create().
+	created, err := ent.conn.Model.Create().
 		SetName(m.Name).
 		SetTitle(m.Title).
 		SetFax(m.Fax).
@@ -114,6 +112,7 @@ func (ent *Ent) Update(b *testing.B) {
 	if err != nil {
 		helper.SetError(b, ent.Name(), "Update", err.Error())
 	}
+	m.Id = created.ID
 
 	b.ReportAllocs()
 	b.ResetTimer()
@@ -138,7 +137,7 @@ func (ent *Ent) Update(b *testing.B) {
 func (ent *Ent) Read(b *testing.B) {
 	m := NewModelAlt()
 
-	_, err := ent.conn.Model.Create().
+	created, err := ent.conn.Model.Create().
 		SetName(m.Name).
 		SetTitle(m.Title).
 		SetFax(m.Fax).
@@ -150,12 +149,13 @@ func (ent *Ent) Read(b *testing.B) {
 	if err != nil {
 		helper.SetError(b, ent.Name(), "Read", err.Error())
 	}
+	m.Id = created.ID
 
 	b.ReportAllocs()
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
-		_, err := ent.conn.Model.Query().Where(model.IDEQ(1)).First(ctx)
+		_, err := ent.conn.Model.Query().Where(model.IDEQ(m.Id)).First(ctx)
 		if err != nil {
 			helper.SetError(b, ent.Name(), "Read", err.Error())
 		}

diff --git a/bench/godb.go b/bench/godb.go
@@ -5,13 +5,11 @@ import (
 	_ "github.com/jackc/pgx/v4/stdlib"
 	godbware "github.com/samonzeweb/godb"
 	"github.com/samonzeweb/godb/adapters/postgresql"
-	"sync"
 	"testing"
 )
 
 type Godb struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *godbware.DB
 }
 

diff --git a/bench/gorm.go b/bench/gorm.go
@@ -5,13 +5,11 @@ import (
 	"gorm.io/driver/postgres"
 	gormdb "gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"sync"
 	"testing"
 )
 
 type Gorm struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *gormdb.DB
 }
 

diff --git a/bench/gorm_prep.go b/bench/gorm_prep.go
@@ -5,13 +5,11 @@ import (
 	"gorm.io/driver/postgres"
 	gormdb "gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"sync"
 	"testing"
 )
 
 type GormPrep struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *gormdb.DB
 }
 

diff --git a/bench/gorp.go b/bench/gorp.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	_ "github.com/jackc/pgx/v4/stdlib"
@@ -13,7 +12,6 @@ import (
 
 type Gorp struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *gorpware.DbMap
 }
 

diff --git a/bench/pg.go b/bench/pg.go
@@ -3,13 +3,11 @@ package bench
 import (
 	"github.com/efectn/go-orm-benchmarks/helper"
 	pgdb "github.com/go-pg/pg/v10"
-	"sync"
 	"testing"
 )
 
 type Pg struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *pgdb.DB
 }
 

diff --git a/bench/pgx.go b/bench/pgx.go
@@ -3,13 +3,11 @@ package bench
 import (
 	"github.com/efectn/go-orm-benchmarks/helper"
 	pgxdb "github.com/jackc/pgx/v4"
-	"sync"
 	"testing"
 )
 
 type Pgx struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *pgxdb.Conn
 }
 

diff --git a/bench/pgx_pool.go b/bench/pgx_pool.go
@@ -4,13 +4,11 @@ import (
 	"github.com/efectn/go-orm-benchmarks/helper"
 	pgxdb "github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
-	"sync"
 	"testing"
 )
 
 type PgxPool struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *pgxpool.Pool
 }
 

diff --git a/bench/pop.go b/bench/pop.go
@@ -2,7 +2,6 @@ package bench
 
 import (
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	popware "github.com/gobuffalo/pop/v6"
@@ -11,7 +10,6 @@ import (
 
 type Pop struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *popware.Connection
 }
 

diff --git a/bench/raw.go b/bench/raw.go
@@ -4,7 +4,6 @@ import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
 	"strconv"
-	"sync"
 	"testing"
 )
 
@@ -19,7 +18,6 @@ const (
 
 type Raw struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *sql.DB
 }
 

diff --git a/bench/reform.go b/bench/reform.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	r "github.com/efectn/go-orm-benchmarks/bench/reform"
@@ -15,7 +14,6 @@ import (
 
 type Reform struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *reformware.DB
 	db   *sql.DB
 }

diff --git a/bench/rel.go b/bench/rel.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"context"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	"github.com/go-rel/postgres"
@@ -13,7 +12,6 @@ import (
 
 type Rel struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn relware.Repository
 	db   relware.Adapter
 }

diff --git a/bench/sqlboiler.go b/bench/sqlboiler.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	models "github.com/efectn/go-orm-benchmarks/bench/sqlboiler"
@@ -14,7 +13,6 @@ import (
 
 type Sqlboiler struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *sql.DB
 }
 

diff --git a/bench/sqlc.go b/bench/sqlc.go
@@ -3,15 +3,13 @@ package bench
 import (
 	"database/sql"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	"github.com/efectn/go-orm-benchmarks/bench/sqlc/db"
 )
 
 type Sqlc struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *db.Queries
 	db   *sql.DB
 }

diff --git a/bench/sqlx.go b/bench/sqlx.go
@@ -4,7 +4,6 @@ import (
 	"github.com/efectn/go-orm-benchmarks/helper"
 	sqlxdb "github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
-	"sync"
 	"testing"
 )
 
@@ -21,7 +20,6 @@ const (
 
 type Sqlx struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *sqlxdb.DB
 }
 

diff --git a/bench/upper.go b/bench/upper.go
@@ -4,13 +4,11 @@ import (
 	"github.com/efectn/go-orm-benchmarks/helper"
 	db "github.com/upper/db/v4"
 	"github.com/upper/db/v4/adapter/postgresql"
-	"sync"
 	"testing"
 )
 
 type Upper struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn db.Session
 }
 

diff --git a/bench/xorm.go b/bench/xorm.go
@@ -2,14 +2,12 @@ package bench
 
 import (
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 	xormdb "xorm.io/xorm"
 )
 
 type Xorm struct {
 	helper.ORMInterface
-	mu   sync.Mutex
 	conn *xormdb.Session
 }
 

diff --git a/bench/zorm.go b/bench/zorm.go
@@ -3,7 +3,6 @@ package bench
 import (
 	"context"
 	"github.com/efectn/go-orm-benchmarks/helper"
-	"sync"
 	"testing"
 
 	zormdb "gitee.com/chunanyong/zorm"
@@ -19,7 +18,6 @@ var (
 
 type Zorm struct {
 	helper.ORMInterface
-	mu sync.Mutex
 }
 
 func CreateZorm() helper.ORMInterface {