bench/tpcc: clean up benchmark names

Release note: None

Author: mgartner

pkg/bench/tpcc/bench_test.go

@@ -43,33 +43,28 @@ func BenchmarkTPCC(b *testing.B) {
 		}
 	})
 
-	for _, impl := range []string{"literal", "optimized"} {
-		b.Run(impl, func(b *testing.B) {
-			var baseFlag string
-			if impl == "literal" {
-				baseFlag = workloadFlag("literal-implementation", "true")
-			}
-			for _, mixFlag := range []string{
-				workloadFlag("mix", "newOrder=1"),
-				workloadFlag("mix", "payment=1"),
-				workloadFlag("mix", "orderStatus=1"),
-				workloadFlag("mix", "delivery=1"),
-				workloadFlag("mix", "stockLevel=1"),
-				workloadFlag("mix", "newOrder=10,payment=10,orderStatus=1,delivery=1,stockLevel=1"),
+	for _, impl := range []struct{ name, flag string }{
+		{"literal", "--literal-implementation=true"},
+		{"optimized", "--literal-implementation=false"},
+	} {
+		b.Run(impl.name, func(b *testing.B) {
+			for _, mix := range []struct{ name, flag string }{
+				{"new_order", "--mix=newOrder=1"},
+				{"payment", "--mix=payment=1"},
+				{"order_status", "--mix=orderStatus=1"},
+				{"delivery", "--mix=delivery=1"},
+				{"stock_level", "--mix=stockLevel=1"},
+				{"default", "--mix=newOrder=10,payment=10,orderStatus=1,delivery=1,stockLevel=1"},
 			} {
-				b.Run(mixFlag, func(b *testing.B) {
-					run(b, storeDir, []string{baseFlag, mixFlag})
+				b.Run(mix.name, func(b *testing.B) {
+					run(b, storeDir, []string{impl.flag, mix.flag})
 				})
 			}
 		})
 
 	}
 }
 
-func workloadFlag(name, value string) string {
-	return name + "=" + value
-}
-
 func run(b *testing.B, storeDir string, workloadFlags []string) {
 	pgURL, closeServer := startCockroach(b, storeDir)
 	defer closeServer()

pkg/bench/tpcc/utils_test.go

@@ -36,18 +36,16 @@ func (c cmd) withEnv(k string, v any) cmd {
 	return c
 }
 
+// exec executes the command in a subprocess. The args should be in the form
+// "--arg=value". It returns the command, which has not yet been executed, and a
+// buffer where the STDOUT and STDERR of the subprocess will be written.
 func (c cmd) exec(args ...string) (ec *exec.Cmd, output *synchronizedBuffer) {
 	ec = exec.Command(os.Args[0], "--test.run=^"+c.name+"$", "--test.v")
 	if len(args) > 0 {
+		ec.Args = append(ec.Args, "--")
 	}
-	for i, arg := range args {
-		if i == 0 {
-			ec.Args = append(ec.Args, "--")
-		}
-		ec.Args = append(ec.Args, "--"+arg)
-	}
-	ec.Env = os.Environ()
-	ec.Env = append(ec.Env, c.envVars...)
+	ec.Args = append(ec.Args, args...)
+	ec.Env = append(os.Environ(), c.envVars...)
 	output = new(synchronizedBuffer)
 	ec.Stdout, ec.Stderr = output, output
 	return ec, output