separate checks into run check and load check.

Signed-off-by: mahjonp <[email protected]>
pingcap · Nov 15, 2019 · add799a · add799a
1 parent 1c9415a
commit add799a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/cmd/go-tpc/main.go b/cmd/go-tpc/main.go
@@ -56,7 +56,7 @@ func openDB() {
 
 func main() {
 	var rootCmd = &cobra.Command{
-		Use:   "dbbench",
+		Use:   "go-tpc",
 		Short: "Benchmark database with different workloads",
 	}
 

diff --git a/cmd/go-tpc/misc.go b/cmd/go-tpc/misc.go
@@ -24,11 +24,14 @@ func execute(ctx context.Context, w workload.Workloader, action string, index in
 				return err
 			}
 		}
-		return w.Prepare(ctx, index)
+		if err := w.Prepare(ctx, index); err != nil {
+			return nil
+		}
+		return w.Check(ctx, index, true)
 	case "cleanup":
 		return w.Cleanup(ctx, index)
 	case "check":
-		return w.Check(ctx, index)
+		return w.Check(ctx, index, false)
 	}
 
 	for i := 0; i < count; i++ {

diff --git a/pkg/workload/workload.go b/pkg/workload/workload.go
@@ -12,5 +12,5 @@ type Workloader interface {
 	Prepare(ctx context.Context, threadID int) error
 	Run(ctx context.Context, threadID int) error
 	Cleanup(ctx context.Context, threadID int) error
-	Check(ctx context.Context, threadID int) error
+	Check(ctx context.Context, threadID int, checkForLoad bool) error
 }
diff --git a/tpcc/check.go b/tpcc/check.go
@@ -6,13 +6,20 @@ import (
 )
 
 // Check implements Workloader interface
-func (w *Workloader) Check(ctx context.Context, threadID int) error {
+func (w *Workloader) Check(ctx context.Context, threadID int, checkForLoad bool) error {
 	// refer 3.3.2
 	checks := []func(ctx context.Context, warehouse int) error{
 		w.checkCondition1,
 		w.checkCondition2,
 		w.checkCondition3,
 		w.checkCondition4,
+	}
+
+	loadChecks := []func(ctx context.Context, warehouse int) error{
+		w.checkCondition1,
+		w.checkCondition2,
+		w.checkCondition3,
+		w.checkCondition4,
 		w.checkCondition5,
 		w.checkCondition6,
 		w.checkCondition7,
@@ -23,6 +30,10 @@ func (w *Workloader) Check(ctx context.Context, threadID int) error {
 		w.checkCondition12,
 	}
 
+	if checkForLoad {
+		checks = loadChecks
+	}
+
 	for i := threadID % w.cfg.Threads; i < w.cfg.Warehouses; i += w.cfg.Threads {
 		warehouse := i%w.cfg.Warehouses + 1
 		for i := 0; i < len(checks); i++ {