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.

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

executor: implement disk-based sort (Part 2) #14279

Merged
merged 56 commits into from
Feb 7, 2020
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
063f0a4
merge sort
wshwsh12 Dec 30, 2019
d823392
split partition
wshwsh12 Dec 30, 2019
aca5777
mem track
wshwsh12 Dec 30, 2019
ef80a75
comments
wshwsh12 Dec 30, 2019
b22f83b
address heap comments
wshwsh12 Dec 31, 2019
2ccadc6
add action
wshwsh12 Dec 22, 2019
f6c4ebe
add comments
wshwsh12 Dec 31, 2019
d83e9af
address comments
wshwsh12 Dec 31, 2019
525d779
add some test
wshwsh12 Dec 31, 2019
c461ec7
Merge branch 'master' into sort_part2
wshwsh12 Dec 31, 2019
19ec95a
remove useless field
wshwsh12 Dec 31, 2019
76af1d8
addres comments
wshwsh12 Dec 31, 2019
556a858
fix
wshwsh12 Dec 31, 2019
90e8081
address comments
wshwsh12 Jan 2, 2020
6483d74
fix
wshwsh12 Jan 2, 2020
bd11fd7
optimize
wshwsh12 Jan 2, 2020
7af4946
fix
wshwsh12 Jan 2, 2020
3773023
add comments
wshwsh12 Jan 2, 2020
86f3f83
address comments
wshwsh12 Jan 2, 2020
da8d986
Merge remote-tracking branch 'upstream/master' into sort_part2
wshwsh12 Jan 6, 2020
0a481cb
row container
wshwsh12 Jan 7, 2020
cc5bed2
address comments
wshwsh12 Jan 7, 2020
26f072f
temp
wshwsh12 Jan 7, 2020
704bf10
address comments
wshwsh12 Jan 8, 2020
1e6e992
fix
wshwsh12 Jan 8, 2020
ed0b163
fix
wshwsh12 Jan 8, 2020
2684c06
fix
wshwsh12 Jan 8, 2020
ab3ad50
Merge remote-tracking branch 'upstream/master' into sort_part2
wshwsh12 Jan 14, 2020
934f4ce
Merge remote-tracking branch 'upstream/master' into sort_part2
wshwsh12 Jan 17, 2020
45d8a16
address commets
wshwsh12 Jan 19, 2020
0179417
Merge remote-tracking branch 'upstream/master' into sort_part2
wshwsh12 Jan 19, 2020
50ecaf1
address comments 1
wshwsh12 Jan 19, 2020
0e65c36
address comments 2
wshwsh12 Jan 19, 2020
21c6203
fix
wshwsh12 Jan 19, 2020
831aae7
s/chunk /rowcontainer
wshwsh12 Jan 20, 2020
a184a1a
try 1
wshwsh12 Jan 20, 2020
25d2f90
Merge remote-tracking branch 'upstream/master' into sort_part2
wshwsh12 Jan 31, 2020
e971c49
Merge branch 'sort_benchmark' into sort_part2
wshwsh12 Jan 31, 2020
704d86f
address
wshwsh12 Jan 31, 2020
3890061
fix regression
wshwsh12 Feb 2, 2020
8517e11
fix
wshwsh12 Feb 2, 2020
07d604e
fix
wshwsh12 Feb 2, 2020
d50b58f
fix
wshwsh12 Feb 3, 2020
f99fd4c
Merge branch 'master' into sort_part2
wshwsh12 Feb 3, 2020
777da74
address comments
wshwsh12 Feb 4, 2020
11ac747
fix ci
wshwsh12 Feb 4, 2020
476560e
Merge branch 'master' into sort_part2
sre-bot Feb 5, 2020
9e37ebb
address
wshwsh12 Feb 5, 2020
06e5ef6
address
wshwsh12 Feb 5, 2020
dae9cdf
add ut
wshwsh12 Feb 5, 2020
2aeb4a6
Merge branch 'master' into sort_part2
sre-bot Feb 6, 2020
36ecd38
fix rowcontainer data race
wshwsh12 Feb 6, 2020
09b7253
fix rowcontainer data race
wshwsh12 Feb 6, 2020
f85c0f5
Merge branch 'master' into sort_part2
sre-bot Feb 6, 2020
31a0909
Merge branch 'master' into sort_part2
wshwsh12 Feb 6, 2020
3f62898
Merge branch 'master' into sort_part2
sre-bot Feb 7, 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
2 changes: 1 addition & 1 deletion executor/executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4446,7 +4446,7 @@ func (s *testSuite) TestOOMPanicAction(c *C) {
c.Assert(err.Error(), Matches, "Out Of Memory Quota!.*")
tk.MustExec("set @@tidb_mem_quota_query=10000")
tk.MustExec("insert into t1 values (1),(2),(3),(4),(5);")
tk.MustExec("set @@tidb_mem_quota_query=200;")
tk.MustExec("set @@tidb_mem_quota_query=10;")
_, err = tk.Exec("insert into t select a from t1 order by a desc;")
c.Assert(err.Error(), Matches, "Out Of Memory Quota!.*")
_, err = tk.Exec("replace into t select a from t1 order by a desc;")
Expand Down
Loading