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 Uncertain Results caused by MERGE_JOIN (#47078) #47080

Merged
merged 3 commits into from
Oct 19, 2023
Merged

planner: fix Uncertain Results caused by MERGE_JOIN (#47078) #47080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64c77b4
This is an automated cherry-pick of #47078
qw4990 Sep 19, 2023
3d944e1
fixup
qw4990 Oct 19, 2023
2ba20c8
fixup
qw4990 Oct 19, 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
14 changes: 14 additions & 0 deletions planner/core/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,6 +1977,20 @@ func TestIndexMergeHint4CNF(t *testing.T) {
}
}

func TestIssue46580(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test")
tk.MustExec(`CREATE TABLE t0(c0 INT);`)
tk.MustExec(`CREATE TABLE t1(c0 BOOL, c1 BOOL);`)
tk.MustExec(`INSERT INTO t1 VALUES (false, true);`)
tk.MustExec(`INSERT INTO t1 VALUES (true, true);`)
tk.MustExec(`CREATE definer='root'@'localhost' VIEW v0(c0, c1, c2) AS SELECT t1.c0, LOG10(t0.c0), t1.c0 FROM t0, t1;`)
tk.MustExec(`INSERT INTO t0(c0) VALUES (3);`)
tk.MustQuery(`SELECT /*+ MERGE_JOIN(t1, t0, v0)*/v0.c2, t1.c0 FROM v0, t0 CROSS JOIN t1 ORDER BY -v0.c1;`).Sort().Check(
testkit.Rows(`0 0`, `0 1`, `1 0`, `1 1`))
}

func TestInvisibleIndex(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
Expand Down
2 changes: 2 additions & 0 deletions planner/core/rule_inject_extra_projection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ func InjectProjBelowSort(p PhysicalPlan, orderByItems []*util.ByItems) PhysicalP
if origChildProj, isChildProj := childPlan.(*PhysicalProjection); isChildProj {
refine4NeighbourProj(bottomProj, origChildProj)
}
refine4NeighbourProj(topProj, bottomProj)

return topProj
}
Expand Down Expand Up @@ -336,6 +337,7 @@ func TurnNominalSortIntoProj(p PhysicalPlan, onlyColumn bool, orderByItems []*ut
if origChildProj, isChildProj := childPlan.(*PhysicalProjection); isChildProj {
refine4NeighbourProj(bottomProj, origChildProj)
}
refine4NeighbourProj(topProj, bottomProj)

return topProj
}