aboutsummaryrefslogtreecommitdiff
path: root/benchmark
diff options
context:
space:
mode:
Diffstat (limited to 'benchmark')
-rw-r--r--benchmark/benchmark_test.go44
-rw-r--r--benchmark/postgres_test.go26
2 files changed, 35 insertions, 35 deletions
diff --git a/benchmark/benchmark_test.go b/benchmark/benchmark_test.go
index 4bc7950..f779b08 100644
--- a/benchmark/benchmark_test.go
+++ b/benchmark/benchmark_test.go
@@ -43,14 +43,14 @@ var (
batchSizesForUpdate = []int{1, 2, 4, 8, 16, 100}
)
-func makeSqliteTestDB(t testing.TB, recordCount int) (db oblast.SqlHandle[*sql.DB], dsn string) {
+func makeSqliteTestDB(t testing.TB, recordCount int) (db *oblast.DB, dsn string) {
dsn = fmt.Sprintf("file:%s?mode=memory&cache=shared", t.Name())
- db = oblast.Wrap(must.Return(sql.Open("sqlite3", dsn))(t))
- _ = must.Return(db.Base.Exec(`CREATE TABLE entries (id INTEGER, message TEXT, PRIMARY KEY (id AUTOINCREMENT))`))(t)
+ db = oblast.NewDB(must.Return(sql.Open("sqlite3", dsn))(t))
+ _ = must.Return(db.Exec(`CREATE TABLE entries (id INTEGER, message TEXT, PRIMARY KEY (id AUTOINCREMENT))`))(t)
if recordCount > 0 {
// fill in some random-looking, but deterministic data
- stmt := must.Return(db.Base.Prepare(`INSERT INTO entries (id, message) VALUES (?, ?)`))(t)
+ stmt := must.Return(db.Prepare(`INSERT INTO entries (id, message) VALUES (?, ?)`))(t)
for idx := range recordCount {
buf := sha256.Sum256([]byte(strconv.Itoa(idx)))
_ = must.Return(stmt.Exec(idx, fmt.Sprintf("sha256:%x", buf[:])))(t)
@@ -91,7 +91,7 @@ func BenchmarkORMSelectMany(b *testing.B) {
oblast.TableNameIs("entries"),
oblast.PrimaryKeyIs("id"),
)
- gorpDB := gorp.DbMap{Db: db.Base, Dialect: gorp.SqliteDialect{}}
+ gorpDB := gorp.DbMap{Db: db.DB, Dialect: gorp.SqliteDialect{}}
gormDB := must.Return(gorm.Open(sqlite.Open(dsn), &gorm.Config{}))(b)
partialQuery := `id < ` + strconv.Itoa(batchSize)
query := `SELECT * FROM entries WHERE ` + partialQuery
@@ -120,7 +120,7 @@ func BenchmarkORMSelectMany(b *testing.B) {
selectWithSqlite := func(b *testing.B) {
var count int
- rows := must.Return(db.Base.Query(query))(b) //nolint:rowserrcheck // false positive
+ rows := must.Return(db.Query(query))(b) //nolint:rowserrcheck // false positive
var (
id int64
message string
@@ -185,7 +185,7 @@ func BenchmarkORMSelectOne(b *testing.B) {
oblast.TableNameIs("entries"),
oblast.PrimaryKeyIs("id"),
)
- gorpDB := gorp.DbMap{Db: db.Base, Dialect: gorp.SqliteDialect{}}
+ gorpDB := gorp.DbMap{Db: db.DB, Dialect: gorp.SqliteDialect{}}
gormDB := must.Return(gorm.Open(sqlite.Open(dsn), &gorm.Config{}))(b)
partialQuery := `id = ` + strconv.Itoa(recordID)
query := `SELECT * FROM entries WHERE ` + partialQuery
@@ -217,7 +217,7 @@ func BenchmarkORMSelectOne(b *testing.B) {
id int64
message string
)
- must.Succeed(b, db.Base.QueryRow(query).Scan(&id, &message))
+ must.Succeed(b, db.QueryRow(query).Scan(&id, &message))
assert.Equal(b, id, int64(recordID))
}
@@ -265,7 +265,7 @@ func BenchmarkORMInsertAndDelete(b *testing.B) {
oblast.TableNameIs("entries"),
oblast.PrimaryKeyIs("id"),
)
- gorpDB := gorp.DbMap{Db: db.Base, Dialect: gorp.SqliteDialect{}}
+ gorpDB := gorp.DbMap{Db: db.DB, Dialect: gorp.SqliteDialect{}}
gorpDB.AddTableWithName(GorpEntry{}, "entries").SetKeys(true, "id")
gormDB := must.Return(gorm.Open(sqlite.Open(dsn), &gorm.Config{}))(b)
@@ -351,23 +351,23 @@ func BenchmarkORMInsertAndDelete(b *testing.B) {
insertAndDeleteWithStraightExec := func(b *testing.B) {
ids := make([]int64, batchSize)
for idx := range ids {
- result := must.Return(db.Base.Exec(`INSERT INTO entries (message) VALUES (?)`, "hello"))(b)
+ result := must.Return(db.Exec(`INSERT INTO entries (message) VALUES (?)`, "hello"))(b)
ids[idx] = must.Return(result.LastInsertId())(b)
}
for _, id := range ids {
- _ = must.Return(db.Base.Exec(`DELETE FROM entries WHERE id = ?`, id))(b)
+ _ = must.Return(db.Exec(`DELETE FROM entries WHERE id = ?`, id))(b)
}
}
insertAndDeleteWithPreparedExec := func(b *testing.B) {
ids := make([]int64, batchSize)
- stmtInsert := must.Return(db.Base.Prepare(`INSERT INTO entries (message) VALUES (?)`))(b)
+ stmtInsert := must.Return(db.Prepare(`INSERT INTO entries (message) VALUES (?)`))(b)
defer stmtInsert.Close()
for idx := range ids {
result := must.Return(stmtInsert.Exec("hello"))(b)
ids[idx] = must.Return(result.LastInsertId())(b)
}
- stmtDelete := must.Return(db.Base.Prepare(`DELETE FROM entries WHERE id = ?`))(b)
+ stmtDelete := must.Return(db.Prepare(`DELETE FROM entries WHERE id = ?`))(b)
defer stmtDelete.Close()
for _, id := range ids {
_ = must.Return(stmtDelete.Exec(id))(b)
@@ -377,21 +377,21 @@ func BenchmarkORMInsertAndDelete(b *testing.B) {
insertAndDeleteWithStraightQueryRow := func(b *testing.B) {
ids := make([]int64, batchSize)
for idx := range ids {
- must.Succeed(b, db.Base.QueryRow(`INSERT INTO entries (message) VALUES (?) RETURNING id`, "hello").Scan(&ids[idx]))
+ must.Succeed(b, db.QueryRow(`INSERT INTO entries (message) VALUES (?) RETURNING id`, "hello").Scan(&ids[idx]))
}
for _, id := range ids {
- _ = must.Return(db.Base.Exec(`DELETE FROM entries WHERE id = ?`, id))(b)
+ _ = must.Return(db.Exec(`DELETE FROM entries WHERE id = ?`, id))(b)
}
}
insertAndDeleteWithPreparedQueryRow := func(b *testing.B) {
ids := make([]int64, batchSize)
- stmtInsert := must.Return(db.Base.Prepare(`INSERT INTO entries (message) VALUES (?) RETURNING id`))(b)
+ stmtInsert := must.Return(db.Prepare(`INSERT INTO entries (message) VALUES (?) RETURNING id`))(b)
defer stmtInsert.Close()
for idx := range ids {
must.Succeed(b, stmtInsert.QueryRow("hello").Scan(&ids[idx]))
}
- stmtDelete := must.Return(db.Base.Prepare(`DELETE FROM entries WHERE id = ?`))(b)
+ stmtDelete := must.Return(db.Prepare(`DELETE FROM entries WHERE id = ?`))(b)
defer stmtDelete.Close()
for _, id := range ids {
_ = must.Return(stmtDelete.Exec(id))(b)
@@ -450,7 +450,7 @@ func BenchmarkORMUpdate(b *testing.B) {
oblast.TableNameIs("entries"),
oblast.PrimaryKeyIs("id"),
)
- gorpDB := gorp.DbMap{Db: db.Base, Dialect: gorp.SqliteDialect{}}
+ gorpDB := gorp.DbMap{Db: db.DB, Dialect: gorp.SqliteDialect{}}
gorpDB.AddTableWithName(GorpEntry{}, "entries").SetKeys(true, "id")
gormDB := must.Return(gorm.Open(sqlite.Open(dsn), &gorm.Config{}))(b)
@@ -458,7 +458,7 @@ func BenchmarkORMUpdate(b *testing.B) {
for _, batchSize := range batchSizesForUpdate {
b.Run("N="+strconv.Itoa(batchSize), func(b *testing.B) {
// prepare a bunch of records that we can update, in a reproducible way
- _ = must.Return(db.Base.Exec(`DELETE FROM entries`))
+ _ = must.Return(db.Exec(`DELETE FROM entries`))
recordsForOblast := make([]OblastEntry, batchSize)
recordsForOblastForInsert := make([]*OblastEntry, batchSize)
for idx := range recordsForOblast {
@@ -498,11 +498,11 @@ func BenchmarkORMUpdate(b *testing.B) {
}
updateWithStraightSqlite := func(b *testing.B, message string) {
for _, r := range recordsForOblast {
- _ = must.Return(db.Base.Exec(`UPDATE entries SET message = ? WHERE id = ?`, message, r.ID))(b)
+ _ = must.Return(db.Exec(`UPDATE entries SET message = ? WHERE id = ?`, message, r.ID))(b)
}
}
updateWithPreparedSqlite := func(b *testing.B, message string) {
- stmt := must.Return(db.Base.Prepare(`UPDATE entries SET message = ? WHERE id = ?`))(b)
+ stmt := must.Return(db.Prepare(`UPDATE entries SET message = ? WHERE id = ?`))(b)
for _, r := range recordsForOblast {
_ = must.Return(stmt.Exec(message, r.ID))(b)
}
@@ -510,7 +510,7 @@ func BenchmarkORMUpdate(b *testing.B) {
}
checkRecordsUpdated := func(b *testing.B, message string) {
var count int64
- must.Succeed(b, db.Base.QueryRow(`SELECT COUNT(*) FROM entries WHERE message = ?`, message).Scan(&count))
+ must.Succeed(b, db.QueryRow(`SELECT COUNT(*) FROM entries WHERE message = ?`, message).Scan(&count))
assert.Equal(b, count, int64(batchSize))
}
diff --git a/benchmark/postgres_test.go b/benchmark/postgres_test.go
index 02c2c43..8f1b7e8 100644
--- a/benchmark/postgres_test.go
+++ b/benchmark/postgres_test.go
@@ -36,14 +36,14 @@ func BenchmarkPostgresHeadingHeadingHeadingHeadingHeadingHeadingHeadingHeading(b
const defaultPostgresDSN = "host=localhost user=postgres dbname=oblast_benchmark sslmode=disable"
-func connectToPostgresTestDB(t testing.TB, recordCount int) oblast.SqlHandle[*sql.DB] {
+func connectToPostgresTestDB(t testing.TB, recordCount int) *oblast.DB {
dsn := cmp.Or(os.Getenv("BENCHMARK_POSTGRES_DSN"), defaultPostgresDSN)
- db := oblast.Wrap(must.Return(sql.Open("postgres", dsn))(t))
- _ = must.Return(db.Base.Exec(`CREATE TEMPORARY TABLE entries (id BIGSERIAL, message TEXT)`))(t)
+ db := oblast.NewDB(must.Return(sql.Open("postgres", dsn))(t))
+ _ = must.Return(db.Exec(`CREATE TEMPORARY TABLE entries (id BIGSERIAL, message TEXT)`))(t)
if recordCount > 0 {
// fill in some random-looking, but deterministic data
- stmt := must.Return(db.Base.Prepare(`INSERT INTO entries (id, message) VALUES ($1, $2)`))(t)
+ stmt := must.Return(db.Prepare(`INSERT INTO entries (id, message) VALUES ($1, $2)`))(t)
for idx := range recordCount {
buf := sha256.Sum256([]byte(strconv.Itoa(idx)))
_ = must.Return(stmt.Exec(idx, fmt.Sprintf("sha256:%x", buf[:])))(t)
@@ -107,7 +107,7 @@ func BenchmarkPostgresSelect(b *testing.B) {
b.Run("driver=pq/strategy=straight", func(b *testing.B) {
for b.Loop() {
var records []OblastEntry
- rows := must.Return(pqDB.Base.Query(query))(b) //nolint:rowserrcheck // false positive
+ rows := must.Return(pqDB.Query(query))(b) //nolint:rowserrcheck // false positive
for rows.Next() {
var e OblastEntry
must.Succeed(b, rows.Scan(&e.ID, &e.Message))
@@ -173,7 +173,7 @@ func BenchmarkPostgresSelectOne(b *testing.B) {
id int64
message string
)
- must.Succeed(b, pqDB.Base.QueryRow(query).Scan(&id, &message))
+ must.Succeed(b, pqDB.QueryRow(query).Scan(&id, &message))
assert.Equal(b, id, int64(recordID))
}
})
@@ -239,10 +239,10 @@ func BenchmarkPostgresInsertAndDelete(b *testing.B) {
for b.Loop() {
ids := make([]int64, batchSize)
for idx := range ids {
- must.Succeed(b, pqDB.Base.QueryRow(insertQuery, "hello").Scan(&ids[idx]))
+ must.Succeed(b, pqDB.QueryRow(insertQuery, "hello").Scan(&ids[idx]))
}
for _, id := range ids {
- _ = must.Return(pqDB.Base.Exec(deleteQuery, id))(b)
+ _ = must.Return(pqDB.Exec(deleteQuery, id))(b)
}
}
})
@@ -262,12 +262,12 @@ func BenchmarkPostgresInsertAndDelete(b *testing.B) {
b.Run("driver=pq/strategy=prepared", func(b *testing.B) {
for b.Loop() {
ids := make([]int64, batchSize)
- stmtInsert := must.Return(pqDB.Base.Prepare(insertQuery))(b)
+ stmtInsert := must.Return(pqDB.Prepare(insertQuery))(b)
defer stmtInsert.Close()
for idx := range ids {
must.Succeed(b, stmtInsert.QueryRow("hello").Scan(&ids[idx]))
}
- stmtDelete := must.Return(pqDB.Base.Prepare(deleteQuery))(b)
+ stmtDelete := must.Return(pqDB.Prepare(deleteQuery))(b)
defer stmtDelete.Close()
for _, id := range ids {
_ = must.Return(stmtDelete.Exec(id))(b)
@@ -309,7 +309,7 @@ func BenchmarkPostgresUpdate(b *testing.B) {
for _, batchSize := range batchSizesForInsertDelete {
b.Run("N="+strconv.Itoa(batchSize), func(b *testing.B) {
// prepare a bunch of records that we can update, in a reproducible way
- _ = must.Return(pqDB.Base.Exec(`DELETE FROM entries`))
+ _ = must.Return(pqDB.Exec(`DELETE FROM entries`))
_ = must.Return(pgxConn.Exec(noctx, `DELETE FROM entries`))
pqRecords := make([]OblastEntry, batchSize)
pqRecordsForInsert := make([]*OblastEntry, batchSize)
@@ -356,7 +356,7 @@ func BenchmarkPostgresUpdate(b *testing.B) {
b.Run("driver=pq/strategy=straight", func(b *testing.B) {
loop(b, func(message string) {
for _, r := range pqRecords {
- _ = must.Return(pqDB.Base.Exec(updateQuery, message, r.ID))(b)
+ _ = must.Return(pqDB.Exec(updateQuery, message, r.ID))(b)
}
})
})
@@ -371,7 +371,7 @@ func BenchmarkPostgresUpdate(b *testing.B) {
b.Run("driver=pq/strategy=prepared", func(b *testing.B) {
loop(b, func(message string) {
- stmt := must.Return(pqDB.Base.Prepare(updateQuery))(b)
+ stmt := must.Return(pqDB.Prepare(updateQuery))(b)
for _, r := range pqRecords {
_ = must.Return(stmt.Exec(message, r.ID))(b)
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-08 16:06:03 +0000