Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

planner: fix leading hint cannot take effect in UNION ALL statements (#50277) #50322

Merged
merged 6 commits into from
Jan 12, 2024
Merged

planner: fix leading hint cannot take effect in UNION ALL statements (#50277) #50322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51fde75
This is an automated cherry-pick of #50277
hawkingrei Jan 11, 2024
24f7da4
*
hawkingrei Jan 11, 2024
67fec88
*
hawkingrei Jan 11, 2024
e466572
*
hawkingrei Jan 11, 2024
00272a4
*
hawkingrei Jan 11, 2024
73b7c03
*
hawkingrei Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions planner/core/casetest/testdata/integration_suite_out.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6134,7 +6134,7 @@
" └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warn": [
"[planner:1815]We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
"[planner:1815]leading hint is inapplicable, check if the leading hint table is valid"
]
},
{
Expand All @@ -6155,7 +6155,7 @@
" └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warn": [
"[planner:1815]We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
"[planner:1815]leading hint is inapplicable, check if the leading hint table is valid"
]
},
{
Expand Down
98 changes: 43 additions & 55 deletions planner/core/casetest/testdata/join_reorder_suite_out.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,6 @@
}
]
},

{
"Name": "TestNoIndexJoinHint",
"Cases": [
Expand Down Expand Up @@ -7970,24 +7969,21 @@
{
"SQL": "select /*+ leading(t2, t3@sel_2) */ * from t1 join t2 on t1.a=t2.a where t1.a in (select t3.a from t3)",
"Plan": [
"IndexHashJoin 4.69 root inner join, inner:IndexLookUp, outer key:test.t1.a, inner key:test.t2.a, equal cond:eq(test.t1.a, test.t2.a)",
"├─IndexHashJoin(Build) 3.75 root inner join, inner:IndexLookUp, outer key:test.t3.a, inner key:test.t1.a, equal cond:eq(test.t3.a, test.t1.a)",
"│ ├─StreamAgg(Build) 3.00 root group by:test.t3.a, funcs:firstrow(test.t3.a)->test.t3.a",
"│ │ └─IndexReader 3.00 root index:StreamAgg",
"│ │ └─StreamAgg 3.00 cop[tikv] group by:test.t3.a, ",
"│ │ └─IndexFullScan 3.00 cop[tikv] table:t3, index:a(a) keep order:true",
"│ └─IndexLookUp(Probe) 3.75 root ",
"│ ├─Selection(Build) 3.75 cop[tikv] not(isnull(test.t1.a))",
"│ │ └─IndexRangeScan 3.75 cop[tikv] table:t1, index:a(a) range: decided by [eq(test.t1.a, test.t3.a)], keep order:false, stats:pseudo",
"│ └─TableRowIDScan(Probe) 3.75 cop[tikv] table:t1 keep order:false, stats:pseudo",
"└─IndexLookUp(Probe) 4.69 root ",
" ├─Selection(Build) 4.69 cop[tikv] not(isnull(test.t2.a))",
" │ └─IndexRangeScan 4.69 cop[tikv] table:t2, index:a(a) range: decided by [eq(test.t2.a, test.t1.a)], keep order:false, stats:pseudo",
" └─TableRowIDScan(Probe) 4.69 cop[tikv] table:t2 keep order:false, stats:pseudo"
"Projection 37462.50 root test.t1.a, test.t1.b, test.t2.a, test.t2.b",
"└─HashJoin 37462.50 root inner join, equal:[eq(test.t2.a, test.t1.a) eq(test.t3.a, test.t1.a)]",
" ├─TableReader(Build) 9990.00 root data:Selection",
" │ └─Selection 9990.00 cop[tikv] not(isnull(test.t1.a))",
" │ └─TableFullScan 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo",
" └─HashJoin(Probe) 29970.00 root CARTESIAN inner join",
" ├─StreamAgg(Build) 3.00 root group by:test.t3.a, funcs:firstrow(test.t3.a)->test.t3.a",
" │ └─IndexReader 3.00 root index:StreamAgg",
" │ └─StreamAgg 3.00 cop[tikv] group by:test.t3.a, ",
" │ └─IndexFullScan 3.00 cop[tikv] table:t3, index:a(a) keep order:true",
" └─TableReader(Probe) 9990.00 root data:Selection",
" └─Selection 9990.00 cop[tikv] not(isnull(test.t2.a))",
" └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1815 We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
]
"Warning": null
},
{
"SQL": "select /*+ leading(t1, t3@sel_2) */ * from t1 join t2 on t1.a=t2.a where t1.a in (select t3.a from t3)",
Expand All @@ -8007,31 +8003,26 @@
" │ └─IndexRangeScan 4.69 cop[tikv] table:t2, index:a(a) range: decided by [eq(test.t2.a, test.t1.a)], keep order:false, stats:pseudo",
" └─TableRowIDScan(Probe) 4.69 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1815 We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
]
"Warning": null
},
{
"SQL": "select /*+ leading(t3@sel_2, t2) */ * from t1 join t2 on t1.a=t2.a where t1.a in (select t3.a from t3)",
"Plan": [
"IndexHashJoin 4.69 root inner join, inner:IndexLookUp, outer key:test.t1.a, inner key:test.t2.a, equal cond:eq(test.t1.a, test.t2.a)",
"├─IndexHashJoin(Build) 3.75 root inner join, inner:IndexLookUp, outer key:test.t3.a, inner key:test.t1.a, equal cond:eq(test.t3.a, test.t1.a)",
"│ ├─StreamAgg(Build) 3.00 root group by:test.t3.a, funcs:firstrow(test.t3.a)->test.t3.a",
"│ │ └─IndexReader 3.00 root index:StreamAgg",
"│ │ └─StreamAgg 3.00 cop[tikv] group by:test.t3.a, ",
"│ │ └─IndexFullScan 3.00 cop[tikv] table:t3, index:a(a) keep order:true",
"│ └─IndexLookUp(Probe) 3.75 root ",
"│ ├─Selection(Build) 3.75 cop[tikv] not(isnull(test.t1.a))",
"│ │ └─IndexRangeScan 3.75 cop[tikv] table:t1, index:a(a) range: decided by [eq(test.t1.a, test.t3.a)], keep order:false, stats:pseudo",
"│ └─TableRowIDScan(Probe) 3.75 cop[tikv] table:t1 keep order:false, stats:pseudo",
"└─IndexLookUp(Probe) 4.69 root ",
" ├─Selection(Build) 4.69 cop[tikv] not(isnull(test.t2.a))",
" │ └─IndexRangeScan 4.69 cop[tikv] table:t2, index:a(a) range: decided by [eq(test.t2.a, test.t1.a)], keep order:false, stats:pseudo",
" └─TableRowIDScan(Probe) 4.69 cop[tikv] table:t2 keep order:false, stats:pseudo"
"Projection 37462.50 root test.t1.a, test.t1.b, test.t2.a, test.t2.b",
"└─HashJoin 37462.50 root inner join, equal:[eq(test.t2.a, test.t1.a) eq(test.t3.a, test.t1.a)]",
" ├─TableReader(Build) 9990.00 root data:Selection",
" │ └─Selection 9990.00 cop[tikv] not(isnull(test.t1.a))",
" │ └─TableFullScan 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo",
" └─HashJoin(Probe) 29970.00 root CARTESIAN inner join",
" ├─StreamAgg(Build) 3.00 root group by:test.t3.a, funcs:firstrow(test.t3.a)->test.t3.a",
" │ └─IndexReader 3.00 root index:StreamAgg",
" │ └─StreamAgg 3.00 cop[tikv] group by:test.t3.a, ",
" │ └─IndexFullScan 3.00 cop[tikv] table:t3, index:a(a) keep order:true",
" └─TableReader(Probe) 9990.00 root data:Selection",
" └─Selection 9990.00 cop[tikv] not(isnull(test.t2.a))",
" └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1815 We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
]
"Warning": null
},
{
"SQL": "select /*+ leading(t3@sel_2, t1) */ * from t1 join t2 on t1.a=t2.a where t1.a in (select t3.a from t3)",
Expand All @@ -8051,9 +8042,7 @@
" │ └─IndexRangeScan 4.69 cop[tikv] table:t2, index:a(a) range: decided by [eq(test.t2.a, test.t1.a)], keep order:false, stats:pseudo",
" └─TableRowIDScan(Probe) 4.69 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1815 We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
]
"Warning": null
},
{
"SQL": "select /*+ leading(t4) */ * from t1 join t2 on t1.a=t2.a join t4 on t1.b = t4.b where t1.a not in (select t3.a from t3)",
Expand Down Expand Up @@ -10036,22 +10025,21 @@
{
"SQL": "select /*+ leading(t2, t3@sel_2) */ * from t1 join t2 on t1.a=t2.a where t1.a in (select t3.a from t3)",
"Plan": [
"HashJoin 12487.50 root inner join, equal:[eq(test.t1.a, test.t3.a)]",
"├─StreamAgg(Build) 7992.00 root group by:test.t3.a, funcs:firstrow(test.t3.a)->test.t3.a",
"│ └─IndexReader 7992.00 root index:StreamAgg",
"│ └─StreamAgg 7992.00 cop[tikv] group by:test.t3.a, ",
"│ └─IndexFullScan 9990.00 cop[tikv] table:t3, index:a(a) keep order:true, stats:pseudo",
"└─HashJoin(Probe) 12487.50 root inner join, equal:[eq(test.t1.a, test.t2.a)]",
"Projection 99800100.00 root test.t1.a, test.t1.b, test.t2.a, test.t2.b",
"└─HashJoin 99800100.00 root inner join, equal:[eq(test.t2.a, test.t1.a) eq(test.t3.a, test.t1.a)]",
" ├─TableReader(Build) 9990.00 root data:Selection",
" │ └─Selection 9990.00 cop[tikv] not(isnull(test.t2.a))",
" │ └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo",
" └─TableReader(Probe) 9990.00 root data:Selection",
" └─Selection 9990.00 cop[tikv] not(isnull(test.t1.a))",
" └─TableFullScan 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo"
" │ └─Selection 9990.00 cop[tikv] not(isnull(test.t1.a))",
" │ └─TableFullScan 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo",
" └─HashJoin(Probe) 79840080.00 root CARTESIAN inner join",
" ├─StreamAgg(Build) 7992.00 root group by:test.t3.a, funcs:firstrow(test.t3.a)->test.t3.a",
" │ └─IndexReader 7992.00 root index:StreamAgg",
" │ └─StreamAgg 7992.00 cop[tikv] group by:test.t3.a, ",
" │ └─IndexFullScan 9990.00 cop[tikv] table:t3, index:a(a) keep order:true, stats:pseudo",
" └─TableReader(Probe) 9990.00 root data:Selection",
" └─Selection 9990.00 cop[tikv] not(isnull(test.t2.a))",
" └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1815 We can only use one leading hint at most, when multiple leading hints are used, all leading hints will be invalid"
]
"Warning": null
},
{
"SQL": "select /*+ leading(t4) */ * from t1 left join t2 on t1.a=t2.a right join t4 on t1.b = t4.b where t1.a not in (select t3.a from t3)",
Expand Down
4 changes: 2 additions & 2 deletions planner/core/logical_plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3933,7 +3933,7 @@ func (b *PlanBuilder) pushTableHints(hints []*ast.TableOptimizerHint, currentLev
b.ctx.GetSessionVars().StmtCtx.AppendWarning(ErrInternal.FastGen("We can only use the straight_join hint, when we use the leading hint and straight_join hint at the same time, all leading hints will be invalid"))
}
}
b.tableHintInfo = append(b.tableHintInfo, tableHintInfo{
b.tableHintInfo = append(b.tableHintInfo, &tableHintInfo{
sortMergeJoinTables: sortMergeTables,
broadcastJoinTables: bcTables,
shuffleJoinTables: shuffleJoinTables,
Expand Down Expand Up @@ -4032,7 +4032,7 @@ func (b *PlanBuilder) TableHints() *tableHintInfo {
if len(b.tableHintInfo) == 0 {
return nil
}
return &(b.tableHintInfo[len(b.tableHintInfo)-1])
return b.tableHintInfo[len(b.tableHintInfo)-1]
}

func (b *PlanBuilder) buildSelect(ctx context.Context, sel *ast.SelectStmt) (p LogicalPlan, err error) {
Expand Down
2 changes: 1 addition & 1 deletion planner/core/planbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ type PlanBuilder struct {
colMapper map[*ast.ColumnNameExpr]int
// visitInfo is used for privilege check.
visitInfo []visitInfo
tableHintInfo []tableHintInfo
tableHintInfo []*tableHintInfo
// optFlag indicates the flags of the optimizer rules.
optFlag uint64
// capFlag indicates the capability flags.
Expand Down
3 changes: 3 additions & 0 deletions planner/core/rule_join_reorder_greedy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ func (s *joinReorderGreedySolver) solve(joinNodePlans []LogicalPlan, tracer *joi
// Getting here means that there is no join condition between the table used in the leading hint and other tables
// For example: select /*+ leading(t3) */ * from t1 join t2 on t1.a=t2.a cross join t3
// We can not let table t3 join first.
// TODO(hawkingrei): we find the problem in the TestHint.
// `select * from t1, t2, t3 union all select /*+ leading(t3, t2) */ * from t1, t2, t3 union all select * from t1, t2, t3`
// this sql should not return the warning. but It will not affect the result. so we will fix it as soon as possible.
s.ctx.GetSessionVars().StmtCtx.AppendWarning(ErrInternal.FastGen("leading hint is inapplicable, check if the leading hint table has join conditions with other tables"))
}
cartesianGroup = append(cartesianGroup, newNode.p)
Expand Down