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

planner: check nil pointer in rule_result_reorder to avoid panic (#48100) #48116

Merged
merged 4 commits into from
Dec 12, 2023
Merged

planner: check nil pointer in rule_result_reorder to avoid panic (#48100) #48116

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7421ef4
This is an automated cherry-pick of #48100
qw4990 Oct 30, 2023
610cfbc
fixup
qw4990 Dec 8, 2023
dcacb2b
Merge branch 'release-7.1' into cherry-pick-48100-to-release-7.1
qw4990 Dec 11, 2023
aca9a38
fixup
qw4990 Dec 12, 2023
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
3 changes: 3 additions & 0 deletions planner/core/rule_result_reorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ func (rs *resultReorder) extractHandleCol(lp LogicalPlan) *expression.Column {
switch x := lp.(type) {
case *LogicalSelection, *LogicalLimit:
handleCol := rs.extractHandleCol(lp.Children()[0])
if handleCol == nil {
return nil // fail to extract handle column from the child, just return nil.
}
if x.Schema().Contains(handleCol) {
// some Projection Operator might be inlined, so check the column again here
return handleCol
Expand Down