fixed PostgreSQL DSN

Author: samitani

README.md

@@ -13,19 +13,21 @@ However I needed to do more complex and fundamental customization, such as addin
 
 I would like to thank Peter Zaitsev, Alexy Kopytov and contributors for inventing great tool [sysbench](https://github.com/akopytov/sysbench).
 
-## How to install
+## Install
 
 ```
-go install github.com/samitani/go-sysbench/cmd/go-sysbench@main
+go install github.com/samitani/go-sysbench/cmd/go-sysbench@latest
 ```
 
-## Incompatibility with sysbench
+## Usage
+
+### General Syntax
+
+### Options
 
-* `go-sysbench` supports only `oltp_read_only` and `oltp_read_write` database benchmarks. Linux benchmarks such as `fileio`, `cpu`, `memory` are not supported.
-* Some options are not implemented. `go-sysbench oltp_read_write run --help` shows available options.
 ```
 $ go-sysbench oltp_read_write run --help
-2025/02/05 22:55:07 Usage:
+2025/02/08 12:27:31 Usage:
   go-sysbench [OPTIONS] oltp_read_write run [run-OPTIONS]
 
 Help Options:
@@ -47,15 +49,22 @@ Help Options:
           --mysql-password=                 MySQL password [$MYSQL_PWD]
           --mysql-db=                       MySQL database name (default: sbtest)
           --mysql-ssl=[on|off]              use SSL connections (default: off)
+          --mysql-ignore-errors=            list of errors to ignore, or "all" (default: 1213,1020,1205)
           --pgsql-host=                     PostgreSQL server host (default: localhost)
           --pgsql-port=                     PostgreSQL server port (default: 5432)
           --pgsql-user=                     PostgreSQL user (default: sbtest)
           --pgsql-password=                 PostgreSQL password [$PGPASSWORD]
           --pgsql-db=                       PostgreSQL database name (default: sbtest)
+          --pgsql-ssl=[on|off]              use SSL connections (default: off)
           --spanner-project=                Spanner Google Cloud project name
           --spanner-instance=               Spanner instance id
           --spanner-db=                     Spanner database name (default: sbtest)
 ```
+
+## Incompatibility with sysbench
+
+* `go-sysbench` supports only `oltp_read_only` and `oltp_read_write` database benchmarks. Linux benchmarks such as `fileio`, `cpu`, `memory` are not supported.
+* Some options are not implemented. See Options section above.
 * Number of reconnects is not reported.
 * Lua scripts is not supported. To customize the benchmark scenario, you have to edit the code directly.
 

benchmark/benchmark.go

@@ -16,10 +16,11 @@ type (
 		Event(context.Context) (uint64, uint64, uint64, uint64, error)
 	}
 	CommonOpts struct {
-		Tables    int    `long:"tables" description:"number of tables" default:"1"`
-		TableSize int    `long:"table_size" description:"number of rows per table" default:"10000"`
-		DBDriver  string `long:"db-driver" choice:"mysql" choice:"pgsql" choice:"spanner" description:"specifies database driver to use" default:"mysql"` //nolint:staticcheck
-		ReadWrite bool
+		Tables         int    `long:"tables" description:"number of tables" default:"1"`
+		TableSize      int    `long:"table_size" description:"number of rows per table" default:"10000"`
+		DBDriver       string `long:"db-driver" choice:"mysql" choice:"pgsql" choice:"spanner" description:"specifies database driver to use" default:"mysql"` //nolint:staticcheck
+		DBPreparedStmt string `long:"db-ps-mode" choice:"auto" choice:"disable" description:"prepared statements usage mode" default:"auto"`                   //nolint:staticcheck
+		ReadWrite      bool
 	}
 	BenchmarkOpts struct {
 		CommonOpts

benchmark/oltpbench.go

@@ -60,9 +60,11 @@ const (
 	// Number of DELETE/INSERT combinations per transaction
 	numDeleteInserts = 1
 
-	OptSSLOn              = "on"
-	OptSSLOff             = "off"
-	OptMySQLIgnoreErrsAll = "all"
+	OptSSLOn                 = "on"
+	OptSSLOff                = "off"
+	OptMySQLIgnoreErrsAll    = "all"
+	OptDBPreparedStmtAuto    = "auto"
+	OptDBPreparedStmtDisable = "disable"
 )
 
 type (
@@ -296,7 +298,15 @@ func (o *OLTPBench) dsnMySQL() string {
 	} else {
 		tlsParam = "false"
 	}
-	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%s", o.opts.MySQLUser, o.opts.MySQLPassword, o.opts.MySQLHost, o.opts.MySQLPort, o.opts.MySQLDB, tlsParam)
+	/*
+	if o.opts.DBPreparedStmt == OptDBPreparedStmtDisable {
+		interpolateParams = "true"
+	} else {
+		interpolateParams = "false"
+	}
+	*/
+
+	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%s&interpolateParams=%s", o.opts.MySQLUser, o.opts.MySQLPassword, o.opts.MySQLHost, o.opts.MySQLPort, o.opts.MySQLDB, tlsParam, "false")
 }
 
 func (o *OLTPBench) dsnPgSQL() string {
@@ -306,8 +316,7 @@ func (o *OLTPBench) dsnPgSQL() string {
 	} else {
 		sslParam = "disable"
 	}
-
-	return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s", o.opts.PgSQLUser, o.opts.PgSQLPassword, o.opts.PgSQLHost, o.opts.PgSQLPort, o.opts.PgSQLDB, sslParam)
+	return fmt.Sprintf("user=%s password=%s host=%s port=%d dbname=%s sslmode=%s", o.opts.PgSQLUser, o.opts.PgSQLPassword, o.opts.PgSQLHost, o.opts.PgSQLPort, o.opts.PgSQLDB, sslParam)
 }
 
 func (o *OLTPBench) dsnSpanner() string {

cmd/go-sysbench/main.go

@@ -7,20 +7,19 @@ package main
 // 11. README に 性能差分について書く
 // 12. thread fairness の計算
 
-// 31. PostgreSQL の DSN のエスケープ
-// 32. DSNの生成に各ドライバのモジュールを利用する
+// 20. PreparedStatement の実装
 
-// 41. 乱数生成をクエリを投げる前段階で行う
-// 42. PreparedStatement の実装
+// 31. 乱数生成をクエリを投げる前段階で行う
 
-// 51. カスタムシナリオを書く
+// 40. --mysql-ignore-errors の場合 others にカウントする
+// 41. 空振りクエリはotherにカウントする
 
-// 60. --mysql-ignore-errors の場合 others にカウントする
-// 61. 空振りクエリはotherにカウントする
+// 50. README に 日本語を書く
+// 51. README に 実行方法について書く
 
-// 70. README に 日本語を書く
-// 72. README に 実行方法について書く
-// 73. README に フラグの順番の制約
+// 60. フラグの順番の制約解除
+
+// 70. [bug] --events が正しく機能しない
 
 import (
 	"log"

runner/runner.go

@@ -147,7 +147,7 @@ func (r *Runner) Run(bench benchmark.Benchmark) error {
 		go func() {
 			defer wg.Done()
 
-			var pe error = nil
+			//var pe error = nil
 			var eventBegin time.Time
 
 			for {
@@ -164,11 +164,8 @@ func (r *Runner) Run(bench benchmark.Benchmark) error {
 					eventBegin = time.Now()
 					reads, writes, others, errs, err := bench.Event(ctx)
 					if err != nil && err != context.DeadlineExceeded && err != context.Canceled {
-						// ignore same error
-						if pe == nil || pe.Error() != err.Error() {
-							pe = err
-							fmt.Println(err.Error())
-						}
+						fmt.Println(err.Error())
+						cancel()
 					}
 					latency := time.Since(eventBegin).Nanoseconds()