opt: use a consistent name for the unbounded cardinality penalty

`memo.UnboundedCardinality` has been renamed to
`memo.UnboundedCardinalityPenalty` to be consistent with the names of
the other cost penalties.

Release note: None

Author: mgartner

pkg/sql/opt/memo/cost.go

@@ -28,7 +28,7 @@ type Cost struct {
 // member will have a lower cost.
 var MaxCost = Cost{
 	C:         math.Inf(+1),
-	Penalties: HugeCostPenalty | FullScanPenalty | UnboundedCardinality,
+	Penalties: HugeCostPenalty | FullScanPenalty | UnboundedCardinalityPenalty,
 }
 
 // Less returns true if this cost is lower than the given cost.
@@ -95,10 +95,10 @@ const (
 	// plan is possible.
 	FullScanPenalty
 
-	// UnboundedCardinality is true if the operator or any of its descendants
-	// have no guaranteed upperbound on the number of rows that they can
-	// produce. See props.AnyCardinality.
-	UnboundedCardinality
+	// UnboundedCardinalityPenalty is true if the operator or any of its
+	// descendants have no guaranteed upperbound on the number of rows that they
+	// can produce. See props.AnyCardinality.
+	UnboundedCardinalityPenalty
 
 	// NoPenalties represents no penalties.
 	NoPenalties Penalties = 0

pkg/sql/opt/memo/cost_test.go

@@ -35,8 +35,8 @@ func TestCostLess(t *testing.T) {
 		{MaxCost, MaxCost, false},
 		{MaxCost, Cost{C: 1.0, Penalties: FullScanPenalty}, false},
 		{Cost{C: 1.0, Penalties: HugeCostPenalty}, MaxCost, true},
-		{Cost{C: 2.0}, Cost{C: 1.0, Penalties: UnboundedCardinality}, true},
-		{Cost{C: 1.0, Penalties: UnboundedCardinality}, Cost{C: 2.0}, false},
+		{Cost{C: 2.0}, Cost{C: 1.0, Penalties: UnboundedCardinalityPenalty}, true},
+		{Cost{C: 1.0, Penalties: UnboundedCardinalityPenalty}, Cost{C: 2.0}, false},
 		// Auxiliary information should not affect the comparison.
 		{Cost{C: 1.0, aux: testAux{0}}, Cost{C: 1.0, aux: testAux{1}}, false},
 	}
@@ -57,7 +57,7 @@ func TestCostAdd(t *testing.T) {
 		{Cost{C: 1.5}, Cost{C: 2.5}, Cost{C: 4.0}},
 		{Cost{C: 1.0, Penalties: FullScanPenalty}, Cost{C: 2.0}, Cost{C: 3.0, Penalties: FullScanPenalty}},
 		{Cost{C: 1.0}, Cost{C: 2.0, Penalties: HugeCostPenalty}, Cost{C: 3.0, Penalties: HugeCostPenalty}},
-		{Cost{C: 1.0, Penalties: UnboundedCardinality}, Cost{C: 2.0, Penalties: HugeCostPenalty}, Cost{C: 3.0, Penalties: HugeCostPenalty | UnboundedCardinality}},
+		{Cost{C: 1.0, Penalties: UnboundedCardinalityPenalty}, Cost{C: 2.0, Penalties: HugeCostPenalty}, Cost{C: 3.0, Penalties: HugeCostPenalty | UnboundedCardinalityPenalty}},
 		{Cost{C: 1.0, aux: testAux{1}}, Cost{C: 1.0, aux: testAux{2}}, Cost{C: 2.0, aux: testAux{3}}},
 		{Cost{C: 1.0, aux: testAux{200}}, Cost{C: 1.0, aux: testAux{100}}, Cost{C: 2.0, aux: testAux{255}}},
 	}

pkg/sql/opt/memo/expr_format.go

@@ -928,7 +928,7 @@ func (f *ExprFmtCtx) formatRelational(e RelExpr, tp treeprinter.Node) {
 			if cost.Penalties&HugeCostPenalty != 0 {
 				b.WriteString(" huge-cost-penalty")
 			}
-			if cost.Penalties&UnboundedCardinality != 0 {
+			if cost.Penalties&UnboundedCardinalityPenalty != 0 {
 				b.WriteString(" unbounded-cardinality")
 			}
 			tp.Child(b.String())

pkg/sql/opt/xform/coster.go

@@ -645,7 +645,7 @@ func (c *coster) ComputeCost(candidate memo.RelExpr, required *physical.Required
 	if candidate.Relational().Cardinality.IsUnbounded() {
 		cost.C += cpuCostFactor
 		if c.evalCtx.SessionData().OptimizerPreferBoundedCardinality {
-			cost.Penalties |= memo.UnboundedCardinality
+			cost.Penalties |= memo.UnboundedCardinalityPenalty
 		}
 	}