pretty Usage

Author: samitani

benchmark/benchmark.go

@@ -9,6 +9,9 @@ const (
 	DBDriverMySQL   = "mysql"
 	DBDriverPgSQL   = "pgsql"
 	DBDriverSpanner = "spanner"
+
+	NameOLTPReadOnly  = "oltp_read_only"
+	NameOLTPReadWrite = "oltp_read_write"
 )
 
 type (
@@ -38,11 +41,15 @@ func BenchmarkFactory(testname string, opt *BenchmarkOpts) (Benchmark, error) {
 		opt.TableSize = opt.TableSizeP
 	}
 
-	if testname == "oltp_read_only" {
+	if testname == NameOLTPReadOnly {
 		return newOLTPBench(opt, rwModeReadOnly), nil
-	} else if testname == "oltp_read_write" {
+	} else if testname == NameOLTPReadWrite {
 		return newOLTPBench(opt, rwModeReadWrite), nil
 	}
 	return nil, fmt.Errorf("Unknown benchmark: %s", testname)
 
 }
+
+func BenchmarkNames() []string {
+	return []string{NameOLTPReadOnly, NameOLTPReadWrite}
+}

cmd/go-sysbench/main.go

@@ -7,17 +7,15 @@ package main
 
 // 20. PreparedStatement の実装
 
-// 40. --mysql-ignore-errors の場合 others にカウントする
+// 30. --mysql-ignore-errors の場合 others にカウントする
 
-// 50. README に 日本語を書く
-// 51. README に 性能差分について書く
-
-// 71. help に testname を表示
+// 40. README に 日本語を書く
+// 41. README に 性能差分について書く
 
 import (
 	"fmt"
-	"log"
 	"os"
+	"strings"
 
 	"github.com/jessevdk/go-flags"
 
@@ -39,10 +37,12 @@ func main() {
 	opts := CmdOpts{}
 
 	parser := flags.NewParser(&opts, flags.HelpFlag|flags.PassDoubleDash)
+	parser.Usage = fmt.Sprintf("[options]... [%s] [prepare|run]", strings.Join(benchmark.BenchmarkNames(), "|"))
 
 	args, err := parser.Parse()
 	if err != nil {
-		log.Fatal(err)
+		fmt.Println(err)
+		os.Exit(1)
 	}
 
 	if opts.Version {
@@ -62,7 +62,8 @@ func main() {
 	bench, err := benchmark.BenchmarkFactory(testname, &opts.BenchmarkOpts)
 
 	if err != nil {
-		log.Fatal(err)
+		fmt.Println(err)
+		os.Exit(1)
 	}
 
 	if command == "run" {
@@ -72,6 +73,7 @@ func main() {
 	}
 
 	if err != nil {
-		log.Fatal(err)
+		fmt.Println(err)
+		os.Exit(1)
 	}
 }

runner/runner.go

@@ -19,7 +19,7 @@ const (
 	histogramMin  = 0.001
 	histogramMax  = 100000
 
-	n2m  = 1000000.0
+	n2m = 1000000.0
 )
 
 type (