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

Fix error result union scan with apply (#19245) #19297

Merged
merged 3 commits into from
Aug 20, 2020
Merged

Fix error result union scan with apply (#19245) #19297

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e035509
cherry pick #19245 to release-3.0
ichn-hu Aug 19, 2020
95beffc
Update union_scan_test.go
ichn-hu Aug 19, 2020
32ec4a6
Merge branch 'release-3.0' into release-3.0-c15a405e20df
ti-srebot Aug 20, 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
Next Next commit
cherry pick #19245 to release-3.0 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
  • Loading branch information
@ichn-hu @ti-srebot
ichn-hu authored and ti-srebot committed Aug 19, 2020
commit e0355092ea3bc2dae8df940549dc2acb007f57b1
9 changes: 9 additions & 0 deletions executor/union_scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,15 @@ func (us *UnionScanExec) Next(ctx context.Context, req *chunk.Chunk) error {
return nil
}

// Close implements the Executor Close interface.
func (us *UnionScanExec) Close() error {
us.cursor4AddRows = 0
us.cursor4SnapshotRows = 0
us.addedRows = us.addedRows[:0]
us.snapshotRows = us.snapshotRows[:0]
return us.children[0].Close()
}

// getOneRow gets one result row from dirty table or child.
func (us *UnionScanExec) getOneRow(ctx context.Context) ([]types.Datum, error) {
for {
Expand Down
14 changes: 14 additions & 0 deletions executor/union_scan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,17 @@ func (s *testSuite4) TestForUpdateUntouchedIndex(c *C) {
tk.MustExec("commit")
tk.MustExec("admin check table t")
}

// See https://github.com/pingcap/tidb/issues/19136
func (s *testSuite7) TestForApplyAndUnionScan(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")

tk.MustExec("create table t ( c_int int, c_str varchar(40), primary key(c_int, c_str) )")
tk.MustExec("begin")
tk.MustExec("insert into t values (1, 'amazing almeida'), (2, 'boring bardeen'), (3, 'busy wescoff')")
tk.MustQuery("select c_int, (select t1.c_int from t t1 where t1.c_int = 3 and t1.c_int > t.c_int order by t1.c_int limit 1) x from t").Check(testkit.Rows("1 3", "2 3", "3 <nil>"))
tk.MustExec("commit")
tk.MustQuery("select c_int, (select t1.c_int from t t1 where t1.c_int = 3 and t1.c_int > t.c_int order by t1.c_int limit 1) x from t").Check(testkit.Rows("1 3", "2 3", "3 <nil>"))
}