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

executor: do not build range for NullOuterVal in IndexLookUpJoin #8505

Merged
merged 5 commits into from
Nov 29, 2018
Merged

executor: do not build range for NullOuterVal in IndexLookUpJoin #8505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51a0956
executor: add check for Null-Handle when buildTableReaderForIndexJoin
XuHuaiyu Nov 29, 2018
618d3c2
Merge branch 'master' into fix_inlj_range_from_handle
zz-jason Nov 29, 2018
0c9743e
address comment
XuHuaiyu Nov 29, 2018
c7f60d3
Merge branch 'fix_inlj_range_from_handle' of https://github.com/XuHua…
XuHuaiyu Nov 29, 2018
94e0611
Merge branch 'master' into fix_inlj_range_from_handle
XuHuaiyu Nov 29, 2018
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
7 changes: 6 additions & 1 deletion executor/index_lookup_join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,12 @@ func (iw *innerWorker) constructDatumLookupKey(task *lookUpJoinTask, rowIdx int)
dLookupKey := make([]types.Datum, 0, keyLen)
for i, keyCol := range iw.outerCtx.keyCols {
outerValue := outerRow.GetDatum(keyCol, iw.outerCtx.rowTypes[keyCol])

// Join-on-condition can be promised to be equal-condition in
// IndexNestedLoopJoin, thus the filter will always be false if
// outerValue is null, and we don't need to lookup it.
if outerValue.IsNull() {
return nil, nil
}
innerColType := iw.rowTypes[iw.keyCols[i]]
innerValue, err := outerValue.ConvertTo(sc, innerColType)
if err != nil {
Expand Down
17 changes: 17 additions & 0 deletions executor/join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,23 @@ func (s *testSuite) TestIndexLookupJoin(c *C) {
`1 5 1 1`,
`1 6 1 2`,
))

tk.MustExec(`drop table if exists t1, t2, t3;`)
tk.MustExec("create table t1(a int primary key, b int)")
tk.MustExec("insert into t1 values(1, 0), (2, null)")
tk.MustExec("create table t2(a int primary key)")
tk.MustExec("insert into t2 values(0)")
tk.MustQuery("select /*+ TIDB_INLJ(t2)*/ * from t1 left join t2 on t1.b = t2.a;").Check(testkit.Rows(
`1 0 0`,
`2 <nil> <nil>`,
))

tk.MustExec("create table t3(a int, key(a))")
tk.MustExec("insert into t3 values(0)")
tk.MustQuery("select /*+ TIDB_INLJ(t3)*/ * from t1 left join t3 on t1.b = t3.a;").Check(testkit.Rows(
`1 0 0`,
`2 <nil> <nil>`,
))
}

func (s *testSuite) TestMergejoinOrder(c *C) {
Expand Down