Skip to content

Initialize newChildren with node.Children to avoid nil child during replaceIdxSort #3195

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

Merged
merged 2 commits into from
Sep 5, 2025
Merged

Initialize newChildren with node.Children to avoid nil child during replaceIdxSort #3195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25d94b4
Copy children to newChildren to avoid nil child
angelamayxie Sep 4, 2025
927e83a
set newChildren with node.Children() instead of copy
angelamayxie Sep 5, 2025
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
23 changes: 23 additions & 0 deletions enginetest/queries/script_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11757,6 +11757,29 @@ select * from t1 except (
},
},
},
{
// https://github.com/dolthub/dolt/issues/9789
Name: "order by on empty set from joins",
SetUpScript: []string{
"create table t0(c0 int, primary key(c0))",
"create table t1(c0 int)",
"create table t2(c0 int)",
"create table t3(c0 int)",
"insert into t0 values (1)",
"insert into t1 values (1)",
"insert into t2 values (1)",
},
Assertions: []ScriptTestAssertion{
{
Query: "select * from t2, t3, t0, t1",
Expected: []sql.Row{},
},
{
Query: "select * from t2, t3, t0, t1 order by t0.c0",
Expected: []sql.Row{},
},
},
},
}

var SpatialScriptTests = []ScriptTest{
Expand Down
9 changes: 4 additions & 5 deletions sql/analyzer/replace_sort.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,10 @@ func replaceIdxSortHelper(ctx *sql.Context, scope *plan.Scope, node sql.Node, so
}

allSame := transform.SameTree
newChildren := make([]sql.Node, len(node.Children()))
for i, child := range node.Children() {
children := node.Children()
newChildren := make([]sql.Node, len(children))
copy(newChildren, children)
for i, child := range children {
var err error
same := transform.SameTree
switch c := child.(type) {
Expand Down Expand Up @@ -213,14 +215,11 @@ func replaceIdxSortHelper(ctx *sql.Context, scope *plan.Scope, node sql.Node, so
c.IsReversed = true
}
}

newChildren[i], err = c.WithChildren(newLeft, newRight)
if err != nil {
return nil, transform.SameTree, err
}
allSame = false
default:
newChildren[i] = c
}
if err != nil {
return nil, transform.SameTree, err
Expand Down
Loading