misc changes

Author: ethanyzhang

stage/map.go

@@ -94,8 +94,10 @@ func ParseStage(stage *Stage, stages Map) (*Stage, error) {
 			nextStagePath = filepath.Join(stage.BaseDir, nextStagePath)
 			stage.NextStagePaths[i] = nextStagePath
 		}
-		if _, err := os.Stat(nextStagePath); err != nil {
+		if fileInfo, err := os.Stat(nextStagePath); err != nil {
 			return nil, fmt.Errorf("%s links to an invalid next stage file %s: %w", stage.Id, nextStagePath, err)
+		} else if fileInfo.IsDir() {
+			return nil, fmt.Errorf("%s links to a directory as next stage: %s", stage.Id, nextStagePath)
 		}
 	}
 	stages[stage.Id] = stage

stage/stage.go

@@ -225,7 +225,7 @@ func (s *Stage) run(ctx context.Context) (returnErr error) {
 	s.prepareClient()
 	s.propagateStates()
 	if len(s.Queries)+len(s.QueryFiles) > 0 {
-		if s.RandomExecution != nil && *s.RandomExecution {
+		if *s.RandomExecution {
 			returnErr = s.runRandomly(ctx)
 		} else {
 			returnErr = s.runSequentially(ctx)
@@ -271,7 +271,7 @@ func (s *Stage) runSequentially(ctx context.Context) (returnErr error) {
 }
 
 func (s *Stage) runQueryFile(ctx context.Context, queryFile string, expectedRowCountStartIndex *int, fileAlias *string) error {
-	file, err := os.Open(queryFile)
+	// fileAlias is the query file name we will report. We try to make it short, so try to use relative path when possible.
 	if fileAlias == nil {
 		if relPath, relErr := filepath.Rel(s.BaseDir, queryFile); relErr == nil {
 			fileAlias = &relPath
@@ -280,6 +280,7 @@ func (s *Stage) runQueryFile(ctx context.Context, queryFile string, expectedRowC
 		}
 	}
 
+	file, err := os.Open(queryFile)
 	var queries []string
 	if err == nil {
 		queries, err = presto.SplitQueries(file)
@@ -320,7 +321,7 @@ func (s *Stage) runRandomly(ctx context.Context) error {
 	} else {
 		err := fmt.Errorf("failed to parse randomly_execute_until %s", *s.RandomlyExecuteUntil)
 		if *s.AbortOnError {
-			s.States.exitCode.CompareAndSwap(0, 5)
+			s.States.exitCode.CompareAndSwap(0, 2) // syntax error
 			return err
 		} else {
 			log.Error().Err(err).Send()

stage/stage_utils.go

@@ -179,6 +179,9 @@ func (s *Stage) prepareClient() {
 
 func (s *Stage) setDefaults() {
 	falseValue := false
+	if s.RandomExecution == nil {
+		s.RandomExecution = &falseValue
+	}
 	if s.AbortOnError == nil {
 		s.AbortOnError = &falseValue
 	}