Merge #151565

151565: opt: respect disabled rules in reorderjoins test directive r=mgartner a=mgartner

Release note: None

Co-authored-by: Marcus Gartner <[email protected]>

Author: craig[bot]

pkg/sql/opt/testutils/opttester/reorder_joins.go

@@ -33,6 +33,9 @@ import (
 func (ot *OptTester) ReorderJoins() (string, error) {
 	ot.builder.Reset()
 	o := ot.makeOptimizer()
+	o.NotifyOnMatchedRule(func(ruleName opt.RuleName) bool {
+		return !ot.Flags.DisableRules.Contains(int(ruleName))
+	})
 	jof := newJoinOrderFormatter(o)
 
 	// joinsConsidered counts the number of joins which joinOrderBuilder attempts