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

store/tikv: support fallback from async commit (take 2) #21531

Merged
merged 29 commits into from
Dec 10, 2020
Merged

store/tikv: support fallback from async commit (take 2) #21531

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2543b3c
implement new resolver
sticnarf Dec 3, 2020
b3899e8
update proto
sticnarf Dec 4, 2020
1ff0410
disable async commit when 1pc fallback
sticnarf Dec 4, 2020
a289c9c
update kvproto
sticnarf Dec 7, 2020
2af8f9d
fix compile
sticnarf Dec 7, 2020
006fb08
add resolve lock tests
sticnarf Dec 7, 2020
6f86958
update kvproto
sticnarf Dec 7, 2020
5bf99bb
rename
sticnarf Dec 7, 2020
bd19a29
Merge branch 'master' into fallback-v2
sticnarf Dec 7, 2020
2be7b1c
more unit test
sticnarf Dec 7, 2020
4c62c04
Merge branch 'master' into fallback-v2
sticnarf Dec 7, 2020
6891747
fix unit test
sticnarf Dec 8, 2020
3cdb7ad
Merge branch 'fallback-v2' of https://github.com/sticnarf/tidb into f…
sticnarf Dec 8, 2020
e0dcc6e
Merge remote-tracking branch 'upstream/master' into fallback-v2
sticnarf Dec 8, 2020
80bd05d
update unistore to fix test
sticnarf Dec 8, 2020
b569fff
update kvproto
sticnarf Dec 8, 2020
54663b9
Merge remote-tracking branch 'upstream/master' into fallback-v2
sticnarf Dec 8, 2020
bee7dfd
Merge remote-tracking branch 'upstream/master' into fallback-v2
sticnarf Dec 8, 2020
df070a5
support commit with schema change
sticnarf Dec 8, 2020
cacb8c6
update unistore
sticnarf Dec 8, 2020
df070f3
Merge remote-tracking branch 'upstream/master' into fallback-v2
sticnarf Dec 9, 2020
caf5fe3
resolve comments
sticnarf Dec 9, 2020
9ad68e1
Merge remote-tracking branch 'upstream/master' into fallback-v2
sticnarf Dec 9, 2020
7ed4751
return error when minCommitTs is not zero during 1pc fallback
sticnarf Dec 9, 2020
1cdf3e8
Merge branch 'master' into fallback-v2
ti-srebot Dec 9, 2020
6ae246e
make lock test more stable
sticnarf Dec 10, 2020
00bc888
Merge remote-tracking branch 'upstream/master' into fallback-v2
sticnarf Dec 10, 2020
f9ce470
Merge branch 'fallback-v2' of https://github.com/sticnarf/tidb into f…
sticnarf Dec 10, 2020
b3b1acd
Merge branch 'master' into fallback-v2
ti-srebot Dec 10, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into fallback-v2
  • Loading branch information
@sticnarf
sticnarf committed Dec 9, 2020
commit 9ad68e1f3835a804a4797fd9929c348daadd5d4a

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.