Skip to content

Commit 42f0c1b

Browse files
mgartnermgartner
authored
Merge pull request #140245 from mgartner/backport25.1-139985-140065
release-25.1: opt: add new optimizer session settings
2 parents bdb558b + 526e15f commit 42f0c1b

25 files changed

+856
-61
lines changed

‎pkg/sql/exec_util.go

+8
Original file line numberDiff line numberDiff line change
@@ -4007,6 +4007,14 @@ func (m *sessionDataMutator) SetCatalogDigestStalenessCheckEnabled(b bool) {
40074007
m.data.CatalogDigestStalenessCheckEnabled = b
40084008
}
40094009

4010+
func (m *sessionDataMutator) SetOptimizerPreferBoundedCardinality(b bool) {
4011+
m.data.OptimizerPreferBoundedCardinality = b
4012+
}
4013+
4014+
func (m *sessionDataMutator) SetOptimizerMinRowCount(val float64) {
4015+
m.data.OptimizerMinRowCount = val
4016+
}
4017+
40104018
// Utility functions related to scrubbing sensitive information on SQL Stats.
40114019

40124020
// quantizeCounts ensures that the Count field in the

‎pkg/sql/logictest/testdata/logic_test/information_schema

+2
Original file line numberDiff line numberDiff line change
@@ -4007,6 +4007,8 @@ optimizer on
40074007
optimizer_always_use_histograms on
40084008
optimizer_hoist_uncorrelated_equality_subqueries on
40094009
optimizer_merge_joins_enabled on
4010+
optimizer_min_row_count 0
4011+
optimizer_prefer_bounded_cardinality off
40104012
optimizer_prove_implication_with_virtual_computed_columns on
40114013
optimizer_push_limit_into_project_filtered_scan on
40124014
optimizer_push_offset_into_index_join on

‎pkg/sql/logictest/testdata/logic_test/pg_catalog

+6
Original file line numberDiff line numberDiff line change
@@ -3007,6 +3007,8 @@ opt_split_scan_limit 2048 N
30073007
optimizer_always_use_histograms on NULL NULL NULL string
30083008
optimizer_hoist_uncorrelated_equality_subqueries on NULL NULL NULL string
30093009
optimizer_merge_joins_enabled on NULL NULL NULL string
3010+
optimizer_min_row_count 0 NULL NULL NULL string
3011+
optimizer_prefer_bounded_cardinality off NULL NULL NULL string
30103012
optimizer_prove_implication_with_virtual_computed_columns on NULL NULL NULL string
30113013
optimizer_push_limit_into_project_filtered_scan on NULL NULL NULL string
30123014
optimizer_push_offset_into_index_join on NULL NULL NULL string
@@ -3212,6 +3214,8 @@ opt_split_scan_limit 2048 N
32123214
optimizer_always_use_histograms on NULL user NULL on on
32133215
optimizer_hoist_uncorrelated_equality_subqueries on NULL user NULL on on
32143216
optimizer_merge_joins_enabled on NULL user NULL on on
3217+
optimizer_min_row_count 0 NULL user NULL 0 0
3218+
optimizer_prefer_bounded_cardinality off NULL user NULL off off
32153219
optimizer_prove_implication_with_virtual_computed_columns on NULL user NULL on on
32163220
optimizer_push_limit_into_project_filtered_scan on NULL user NULL on on
32173221
optimizer_push_offset_into_index_join on NULL user NULL on on
@@ -3416,6 +3420,8 @@ optimizer NULL NULL NULL
34163420
optimizer_always_use_histograms NULL NULL NULL NULL NULL
34173421
optimizer_hoist_uncorrelated_equality_subqueries NULL NULL NULL NULL NULL
34183422
optimizer_merge_joins_enabled NULL NULL NULL NULL NULL
3423+
optimizer_min_row_count NULL NULL NULL NULL NULL
3424+
optimizer_prefer_bounded_cardinality NULL NULL NULL NULL NULL
34193425
optimizer_prove_implication_with_virtual_computed_columns NULL NULL NULL NULL NULL
34203426
optimizer_push_limit_into_project_filtered_scan NULL NULL NULL NULL NULL
34213427
optimizer_push_offset_into_index_join NULL NULL NULL NULL NULL

‎pkg/sql/logictest/testdata/logic_test/show_source

+2
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ opt_split_scan_limit 2048
138138
optimizer_always_use_histograms on
139139
optimizer_hoist_uncorrelated_equality_subqueries on
140140
optimizer_merge_joins_enabled on
141+
optimizer_min_row_count 0
142+
optimizer_prefer_bounded_cardinality off
141143
optimizer_prove_implication_with_virtual_computed_columns on
142144
optimizer_push_limit_into_project_filtered_scan on
143145
optimizer_push_offset_into_index_join on

‎pkg/sql/opt/exec/execbuilder/testdata/explain_redact

+5-5
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ upsert bc
678678
query T
679679
EXPLAIN (OPT, MEMO, REDACT) INSERT INTO bc SELECT a::float + 1 FROM a ON CONFLICT (b) DO UPDATE SET b = bc.b + 100
680680
----
681-
memo (optimized, ~36KB, required=[presentation: info:25] [distribution: test])
681+
memo (optimized, ~37KB, required=[presentation: info:25] [distribution: test])
682682
├── G1: (explain G2 [distribution: test])
683683
│ └── [presentation: info:25] [distribution: test]
684684
│ ├── best: (explain G2="[distribution: test]" [distribution: test])
@@ -1117,7 +1117,7 @@ update ab
11171117
query T
11181118
EXPLAIN (OPT, MEMO, REDACT) UPDATE ab SET a = a || 'ab' WHERE a > 'a'
11191119
----
1120-
memo (optimized, ~14KB, required=[presentation: info:15] [distribution: test])
1120+
memo (optimized, ~15KB, required=[presentation: info:15] [distribution: test])
11211121
├── G1: (explain G2 [distribution: test])
11221122
│ └── [presentation: info:15] [distribution: test]
11231123
│ ├── best: (explain G2="[distribution: test]" [distribution: test])
@@ -1355,7 +1355,7 @@ update e
13551355
query T
13561356
EXPLAIN (OPT, MEMO, REDACT) UPDATE e SET e = 'eee' WHERE e > 'a'
13571357
----
1358-
memo (optimized, ~17KB, required=[presentation: info:17] [distribution: test])
1358+
memo (optimized, ~18KB, required=[presentation: info:17] [distribution: test])
13591359
├── G1: (explain G2 [distribution: test])
13601360
│ └── [presentation: info:17] [distribution: test]
13611361
│ ├── best: (explain G2="[distribution: test]" [distribution: test])
@@ -1686,7 +1686,7 @@ project
16861686
query T
16871687
EXPLAIN (OPT, MEMO, REDACT) SELECT * FROM bc WHERE b >= 1.0 AND b < 2.0
16881688
----
1689-
memo (optimized, ~12KB, required=[presentation: info:7] [distribution: test])
1689+
memo (optimized, ~13KB, required=[presentation: info:7] [distribution: test])
16901690
├── G1: (explain G2 [presentation: b:1,c:2] [distribution: test])
16911691
│ └── [presentation: info:7] [distribution: test]
16921692
│ ├── best: (explain G2="[presentation: b:1,c:2] [distribution: test]" [presentation: b:1,c:2] [distribution: test])
@@ -2435,7 +2435,7 @@ project
24352435
query T
24362436
EXPLAIN (OPT, MEMO, REDACT) SELECT * FROM bc JOIN f ON b = f + 1
24372437
----
2438-
memo (optimized, ~28KB, required=[presentation: info:14] [distribution: test])
2438+
memo (optimized, ~29KB, required=[presentation: info:14] [distribution: test])
24392439
├── G1: (explain G2 [presentation: b:1,c:2,f:7] [distribution: test])
24402440
│ └── [presentation: info:14] [distribution: test]
24412441
│ ├── best: (explain G2="[presentation: b:1,c:2,f:7] [distribution: test]" [presentation: b:1,c:2,f:7] [distribution: test])

‎pkg/sql/opt/memo/cost.go

+15-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ type Cost struct {
1919
// group members during testing, by setting their cost so high that any other
2020
// member will have a lower cost.
2121
var MaxCost = Cost{
22-
C: math.Inf(+1),
23-
Flags: CostFlags{FullScanPenalty: true, HugeCostPenalty: true},
22+
C: math.Inf(+1),
23+
Flags: CostFlags{
24+
FullScanPenalty: true,
25+
HugeCostPenalty: true,
26+
UnboundedCardinality: true,
27+
},
2428
}
2529

2630
// Less returns true if this cost is lower than the given cost.
@@ -57,6 +61,10 @@ type CostFlags struct {
5761
// used when the optimizer is forced to use a particular plan, and will error
5862
// if it cannot be used.
5963
HugeCostPenalty bool
64+
// UnboundedCardinality is true if the operator or any of its descendants
65+
// have no guaranteed upperbound on the number of rows that they can
66+
// produce. See props.AnyCardinality.
67+
UnboundedCardinality bool
6068
}
6169

6270
// Less returns true if these flags indicate a lower penalty than the other
@@ -71,16 +79,20 @@ func (c CostFlags) Less(other CostFlags) bool {
7179
if c.FullScanPenalty != other.FullScanPenalty {
7280
return !c.FullScanPenalty
7381
}
82+
if c.UnboundedCardinality != other.UnboundedCardinality {
83+
return !c.UnboundedCardinality
84+
}
7485
return false
7586
}
7687

7788
// Add adds the other flags to these flags.
7889
func (c *CostFlags) Add(other CostFlags) {
7990
c.FullScanPenalty = c.FullScanPenalty || other.FullScanPenalty
8091
c.HugeCostPenalty = c.HugeCostPenalty || other.HugeCostPenalty
92+
c.UnboundedCardinality = c.UnboundedCardinality || other.UnboundedCardinality
8193
}
8294

8395
// Empty returns true if these flags are empty.
8496
func (c CostFlags) Empty() bool {
85-
return !c.FullScanPenalty && !c.HugeCostPenalty
97+
return !c.FullScanPenalty && !c.HugeCostPenalty && !c.UnboundedCardinality
8698
}

‎pkg/sql/opt/memo/cost_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ func TestCostLess(t *testing.T) {
3535
{memo.MaxCost, memo.MaxCost, false},
3636
{memo.MaxCost, memo.Cost{C: 1.0, Flags: memo.CostFlags{FullScanPenalty: true}}, false},
3737
{memo.Cost{C: 1.0, Flags: memo.CostFlags{HugeCostPenalty: true}}, memo.MaxCost, true},
38+
{memo.Cost{C: 2.0, Flags: memo.CostFlags{}}, memo.Cost{C: 1.0, Flags: memo.CostFlags{UnboundedCardinality: true}}, true},
39+
{memo.Cost{C: 1.0, Flags: memo.CostFlags{UnboundedCardinality: true}}, memo.Cost{C: 2.0, Flags: memo.CostFlags{}}, false},
3840
}
3941
for _, tc := range testCases {
4042
if tc.left.Less(tc.right) != tc.expected {
@@ -72,6 +74,8 @@ func TestCostFlagsLess(t *testing.T) {
7274
{memo.CostFlags{FullScanPenalty: true, HugeCostPenalty: true}, memo.CostFlags{FullScanPenalty: true, HugeCostPenalty: true}, false},
7375
{memo.CostFlags{FullScanPenalty: false}, memo.CostFlags{FullScanPenalty: true}, true},
7476
{memo.CostFlags{HugeCostPenalty: false}, memo.CostFlags{HugeCostPenalty: true}, true},
77+
{memo.CostFlags{UnboundedCardinality: false}, memo.CostFlags{UnboundedCardinality: true}, true},
78+
{memo.CostFlags{UnboundedCardinality: true}, memo.CostFlags{UnboundedCardinality: false}, false},
7579
}
7680
for _, tc := range testCases {
7781
if tc.left.Less(tc.right) != tc.expected {

‎pkg/sql/opt/memo/expr_format.go

+3
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,9 @@ func (f *ExprFmtCtx) formatRelational(e RelExpr, tp treeprinter.Node) {
913913
if cost.Flags.HugeCostPenalty {
914914
b.WriteString(" huge-cost-penalty")
915915
}
916+
if cost.Flags.UnboundedCardinality {
917+
b.WriteString(" unbounded-cardinality")
918+
}
916919
tp.Child(b.String())
917920
}
918921
}

‎pkg/sql/opt/memo/memo.go

+6
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ type Memo struct {
200200
pushLimitIntoProjectFilteredScan bool
201201
unsafeAllowTriggersModifyingCascades bool
202202
legacyVarcharTyping bool
203+
preferBoundedCardinality bool
204+
minRowCount float64
203205
internal bool
204206

205207
// txnIsoLevel is the isolation level under which the plan was created. This
@@ -293,6 +295,8 @@ func (m *Memo) Init(ctx context.Context, evalCtx *eval.Context) {
293295
pushLimitIntoProjectFilteredScan: evalCtx.SessionData().OptimizerPushLimitIntoProjectFilteredScan,
294296
unsafeAllowTriggersModifyingCascades: evalCtx.SessionData().UnsafeAllowTriggersModifyingCascades,
295297
legacyVarcharTyping: evalCtx.SessionData().LegacyVarcharTyping,
298+
preferBoundedCardinality: evalCtx.SessionData().OptimizerPreferBoundedCardinality,
299+
minRowCount: evalCtx.SessionData().OptimizerMinRowCount,
296300
internal: evalCtx.SessionData().Internal,
297301
txnIsoLevel: evalCtx.TxnIsoLevel,
298302
}
@@ -463,6 +467,8 @@ func (m *Memo) IsStale(
463467
m.pushLimitIntoProjectFilteredScan != evalCtx.SessionData().OptimizerPushLimitIntoProjectFilteredScan ||
464468
m.unsafeAllowTriggersModifyingCascades != evalCtx.SessionData().UnsafeAllowTriggersModifyingCascades ||
465469
m.legacyVarcharTyping != evalCtx.SessionData().LegacyVarcharTyping ||
470+
m.preferBoundedCardinality != evalCtx.SessionData().OptimizerPreferBoundedCardinality ||
471+
m.minRowCount != evalCtx.SessionData().OptimizerMinRowCount ||
466472
m.internal != evalCtx.SessionData().Internal ||
467473
m.txnIsoLevel != evalCtx.TxnIsoLevel {
468474
return true, nil

‎pkg/sql/opt/memo/memo_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,16 @@ func TestMemoIsStale(t *testing.T) {
538538
evalCtx.SessionData().LegacyVarcharTyping = false
539539
notStale()
540540

541+
evalCtx.SessionData().OptimizerPreferBoundedCardinality = true
542+
stale()
543+
evalCtx.SessionData().OptimizerPreferBoundedCardinality = false
544+
notStale()
545+
546+
evalCtx.SessionData().OptimizerMinRowCount = 1.0
547+
stale()
548+
evalCtx.SessionData().OptimizerMinRowCount = 0
549+
notStale()
550+
541551
evalCtx.SessionData().Internal = true
542552
stale()
543553
evalCtx.SessionData().Internal = false

0 commit comments

Comments
 (0)