add fix for prestodb#35 as review

yabinma · Feb 12, 2025 · fa55b72 · fa55b72
1 parent 1c0e087
commit fa55b72
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/cmd/loadjson/main.go b/cmd/loadjson/main.go
@@ -36,10 +36,9 @@ var (
 	mysqlDb                  *sql.DB
 	pseudoStage              *stage.Stage
 
-	parallelismGuard     chan struct{}
-	resultChan           = make(chan *stage.QueryResult)
-	runningTasks         sync.WaitGroup
-	DefaultColdRunsValue = 1
+	parallelismGuard chan struct{}
+	resultChan       = make(chan *stage.QueryResult)
+	runningTasks     sync.WaitGroup
 )
 
 func Run(_ *cobra.Command, args []string) {
@@ -76,7 +75,7 @@ func Run(_ *cobra.Command, args []string) {
 	// To reuse the `pbench run` code, especially run recorders, we create a pseudo main stage.
 	pseudoStage = &stage.Stage{
 		Id:       "load_json",
-		ColdRuns: &DefaultColdRunsValue,
+		ColdRuns: &stage.DefaultColdRunsValue,
 		States: &stage.SharedStageStates{
 			RunName:      RunName,
 			Comment:      Comment,

diff --git a/stage/stage_utils.go b/stage/stage_utils.go
@@ -248,9 +248,9 @@ func (s *Stage) propagateStates() {
 		if nextStage.ColdRuns == nil && nextStage.WarmRuns == nil {
 			nextStage.ColdRuns = s.ColdRuns
 			nextStage.WarmRuns = s.WarmRuns
-		} else if nextStage.ColdRuns == nil && nextStage.WarmRuns != nil {
+		} else if nextStage.ColdRuns == nil {
 			nextStage.ColdRuns = &DefaultColdRunsValue
-		} else if nextStage.ColdRuns != nil && nextStage.WarmRuns == nil {
+		} else if nextStage.WarmRuns == nil {
 			nextStage.WarmRuns = &DefaultWarmRunsValue
 		}
 		if nextStage.AbortOnError == nil {