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: reset INLJ.task when Close (#19513) #19566

Merged
merged 3 commits into from
Sep 1, 2020
Merged

executor: reset INLJ.task when Close (#19513) #19566

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
2def083
cherry pick #19513 to release-4.0
XuHuaiyu Aug 27, 2020
569704c
resolve conflicts
XuHuaiyu Aug 28, 2020
1414b8a
Merge branch 'release-4.0' into release-4.0-1417991cef8a
ti-srebot Sep 1, 2020
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
1 change: 1 addition & 0 deletions executor/index_lookup_join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ func (e *IndexLookUpJoin) Close() error {
}
e.workerWg.Wait()
e.memTracker = nil
e.task = nil
if e.runtimeStats != nil {
concurrency := cap(e.resultCh)
runtimeStats := &execdetails.RuntimeStatsWithConcurrencyInfo{BasicRuntimeStats: e.runtimeStats}
Expand Down
30 changes: 30 additions & 0 deletions executor/join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,3 +2182,33 @@ func (s *testSuite9) TestIssue19112(c *C) {
"1 4.064000 1 4.064000",
"3 1.010000 3 1.010000"))
}

func (s *testSuiteJoin3) TestIssue19498(c *C) {
tk := testkit.NewTestKitWithInit(c, s.store)

tk.MustExec("drop table if exists t1;")
tk.MustExec("create table t1 (c_int int, primary key (c_int));")
tk.MustExec("insert into t1 values (1),(2),(3),(4)")
tk.MustExec("drop table if exists t2;")
tk.MustExec("create table t2 (c_str varchar(40));")
tk.MustExec("insert into t2 values ('zen sammet');")
tk.MustExec("insert into t2 values ('happy fermat');")
tk.MustExec("insert into t2 values ('happy archimedes');")
tk.MustExec("insert into t2 values ('happy hypatia');")

tk.MustExec("drop table if exists t3;")
tk.MustExec("create table t3 (c_int int, c_str varchar(40), primary key (c_int), key (c_str));")
tk.MustExec("insert into t3 values (1, 'sweet hoover');")
tk.MustExec("insert into t3 values (2, 'awesome elion');")
tk.MustExec("insert into t3 values (3, 'hungry khayyam');")
tk.MustExec("insert into t3 values (4, 'objective kapitsa');")

rs := tk.MustQuery("select c_str, (select /*+ INL_JOIN(t1,t3) */ max(t1.c_int) from t1, t3 where t1.c_int = t3.c_int and t2.c_str > t3.c_str) q from t2 order by c_str;")
rs.Check(testkit.Rows("happy archimedes 2", "happy fermat 2", "happy hypatia 2", "zen sammet 4"))

rs = tk.MustQuery("select c_str, (select /*+ INL_HASH_JOIN(t1,t3) */ max(t1.c_int) from t1, t3 where t1.c_int = t3.c_int and t2.c_str > t3.c_str) q from t2 order by c_str;")
rs.Check(testkit.Rows("happy archimedes 2", "happy fermat 2", "happy hypatia 2", "zen sammet 4"))

rs = tk.MustQuery("select c_str, (select /*+ INL_MERGE_JOIN(t1,t3) */ max(t1.c_int) from t1, t3 where t1.c_int = t3.c_int and t2.c_str > t3.c_str) q from t2 order by c_str;")
rs.Check(testkit.Rows("happy archimedes 2", "happy fermat 2", "happy hypatia 2", "zen sammet 4"))
}