Repository navigation
Commit 9957987
authored
[fix](cloud) Return existing rowset for concurrent commits (apache#67637)
Problem Summary:
Different BEs may generate different rowsets for the same transaction
and tablet.
After rowset A is committed, the temporary rowset key points to A while
the recycle rowset key for B still exists. The recycle key check ran
before comparing rowset IDs, so commit_rowset incorrectly treated tmp(A)
and recycle(B) as an invalid conflict.
Compare rowset IDs first and only check the tmp and recycle key conflict
when they belong to the same rowset. For different rowsets, return
ALREADY_EXISTED with rowset A.1 parent 396ad79 commit 9957987
2 files changed
Lines changed: 65 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2758 | 2758 | | |
2759 | 2759 | | |
2760 | 2760 | | |
2761 | | - | |
2762 | | - | |
2763 | | - | |
2764 | | - | |
2765 | | - | |
2766 | | - | |
2767 | | - | |
2768 | | - | |
2769 | | - | |
2770 | | - | |
2771 | | - | |
2772 | | - | |
2773 | | - | |
2774 | | - | |
2775 | | - | |
2776 | | - | |
2777 | | - | |
2778 | | - | |
2779 | | - | |
2780 | | - | |
2781 | 2761 | | |
2782 | 2762 | | |
2783 | 2763 | | |
2784 | 2764 | | |
2785 | 2765 | | |
2786 | 2766 | | |
2787 | 2767 | | |
| 2768 | + | |
| 2769 | + | |
| 2770 | + | |
| 2771 | + | |
| 2772 | + | |
| 2773 | + | |
| 2774 | + | |
| 2775 | + | |
| 2776 | + | |
| 2777 | + | |
| 2778 | + | |
| 2779 | + | |
| 2780 | + | |
| 2781 | + | |
| 2782 | + | |
| 2783 | + | |
| 2784 | + | |
| 2785 | + | |
| 2786 | + | |
| 2787 | + | |
2788 | 2788 | | |
2789 | 2789 | | |
2790 | 2790 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11268 | 11268 | | |
11269 | 11269 | | |
11270 | 11270 | | |
| 11271 | + | |
| 11272 | + | |
| 11273 | + | |
| 11274 | + | |
| 11275 | + | |
| 11276 | + | |
| 11277 | + | |
11271 | 11278 | | |
11272 | 11279 | | |
11273 | 11280 | | |
| |||
11316 | 11323 | | |
11317 | 11324 | | |
11318 | 11325 | | |
| 11326 | + | |
| 11327 | + | |
| 11328 | + | |
| 11329 | + | |
| 11330 | + | |
| 11331 | + | |
| 11332 | + | |
| 11333 | + | |
| 11334 | + | |
| 11335 | + | |
| 11336 | + | |
| 11337 | + | |
| 11338 | + | |
| 11339 | + | |
| 11340 | + | |
| 11341 | + | |
| 11342 | + | |
| 11343 | + | |
| 11344 | + | |
| 11345 | + | |
| 11346 | + | |
| 11347 | + | |
| 11348 | + | |
| 11349 | + | |
| 11350 | + | |
| 11351 | + | |
| 11352 | + | |
| 11353 | + | |
| 11354 | + | |
| 11355 | + | |
| 11356 | + | |
| 11357 | + | |
| 11358 | + | |
| 11359 | + | |
| 11360 | + | |
| 11361 | + | |
| 11362 | + | |
| 11363 | + | |
11319 | 11364 | | |
11320 | 11365 | | |
11321 | 11366 | | |
| |||
0 commit comments