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.

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: fix idxMergePartPlans forget to deal with RootTaskConds #58507

Merged
merged 15 commits into from
Dec 24, 2024
Merged
Prev Previous commit
Next Next commit
update
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
  • Loading branch information
hawkingrei committed Dec 24, 2024
commit ee51997d41a7dadea49c4f5e49edfaf50405ffc9
3 changes: 0 additions & 3 deletions pkg/expression/explain.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,6 @@ func sortedExplainExpressionList(ctx EvalContext, exprs []Expression, normalized
buffer := bytes.NewBufferString("")
exprInfos := make([]string, 0, len(exprs))
for _, expr := range exprs {
if expr == nil {
continue
}
if ignoreInlist {
exprInfos = append(exprInfos, expr.ExplainNormalizedInfo4InList())
} else if normalized {
Expand Down
2 changes: 1 addition & 1 deletion pkg/planner/core/optimizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ func mergeContinuousSelections(p base.PhysicalPlan) {
break
}
sel.Conditions = append(sel.Conditions, tmp.Conditions...)
slices.Compact(sel.Conditions)
sel.Conditions = slices.Compact(sel.Conditions)
sel.SetChild(0, tmp.Children()[0])
}
}
Expand Down