fixed mode

Author: samitani

benchmark/benchmark.go

@@ -23,7 +23,6 @@ type (
 		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
@@ -34,8 +33,10 @@ type (
 )
 
 func BenchmarkFactory(testname string, opt *BenchmarkOpts) (Benchmark, error) {
-	if testname == "oltp_read_only" || testname == "oltp_read_write" {
-		return newOLTPBench(opt), nil
+	if testname == "oltp_read_only" {
+		return newOLTPBench(opt, rwModeReadOnly), nil
+	} else if testname == "oltp_read_write" {
+		return newOLTPBench(opt, rwModeReadWrite), nil
 	}
 	return nil, fmt.Errorf("Unknown benchmark: %s", testname)
 

benchmark/oltpbench.go

@@ -54,6 +54,9 @@ const (
 	OptMySQLIgnoreErrsAll    = "all"
 	OptDBPreparedStmtAuto    = "auto"
 	OptDBPreparedStmtDisable = "disable"
+
+	rwModeReadOnly  = "ro"
+	rwModeReadWrite = "rw"
 )
 
 var stmtsMySQL map[string]string = map[string]string{
@@ -109,13 +112,14 @@ type (
 	OLTPBench struct {
 		opts *BenchmarkOpts
 
+		rwMode               string
 		mysqlIgnoreErrsSlice []uint16
 		db                   *sql.DB
 	}
 )
 
-func newOLTPBench(option *BenchmarkOpts) *OLTPBench {
-	return &OLTPBench{opts: option}
+func newOLTPBench(option *BenchmarkOpts, mode string) *OLTPBench {
+	return &OLTPBench{opts: option, rwMode: mode}
 }
 
 func (o *OLTPBench) Init(ctx context.Context) error {
@@ -257,7 +261,7 @@ func (o *OLTPBench) Event(ctx context.Context) (reads uint64, writes uint64, oth
 			numReads += 1
 		}
 
-		if o.opts.ReadWrite {
+		if o.rwMode == rwModeReadWrite {
 			for i := 0; i < numIndexUpdates; i++ {
 				_, err := tx.ExecContext(ctx, fmt.Sprintf(stmts["stmtIndexUpdates"], tableNum), sbRand(0, o.opts.TableSize))
 				if err != nil {

cmd/go-sysbench/main.go

@@ -17,7 +17,6 @@ package main
 // 61. ignore-error 数のレポート
 // 62. --mysql-ignore-errors の場合 others にカウントする
 
-
 import (
 	"log"
 	"os"