Skip to content

[fix](cloud) fix unnecessary conflict range in lazy commit#60274

Merged
w41ter merged 5 commits intoapache:masterfrom
w41ter:cloud/improve/txn_approximate_size
Jan 29, 2026
Merged

[fix](cloud) fix unnecessary conflict range in lazy commit#60274
w41ter merged 5 commits intoapache:masterfrom
w41ter:cloud/improve/txn_approximate_size

Conversation

@w41ter
Copy link
Copy Markdown
Contributor

@w41ter w41ter commented Jan 27, 2026

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

Before:

I20260127 07:50:10.853658 2639096 meta_service_util.cpp:78] update table version txn_id=885400033280 db_id=15246789 table_id=42356789                                                                             I20260127 07:50:10.853765 2639096 meta_service_txn.cpp:2381] put_size=160197 del_size=0 num_put_keys=2002 num_del_keys=0 txn_size=12976511 txn_id=885400033280                                                    W20260127 07:50:10.924083 2639096 txn_kv.cpp:782] fdb commit error, code=2101 msg=Transaction exceeds byte limit                                                                                                  W20260127 07:50:10.924407 2639096 meta_service_txn.cpp:2391] commit txn failed due to txn size too large, txn_id=885400033280 the underlying txn size=16332642

After:

I20260127 09:02:46.518415 2656919 meta_service_util.cpp:78] update table version txn_id=5329084161024 db_id=15246789 table_id=42356789
I20260127 09:02:46.518524 2656919 meta_service_txn.cpp:2402] put_size=162198 del_size=0 num_put_keys=2002 num_del_keys=0 txn_size=690512 txn_id=5329084161024 the underlying txn size=846643
I20260127 09:02:46.554267 2657045 txn_lazy_committer.cpp:658] lazy task commit txn_id=5329084161024 retry_times=0

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@w41ter w41ter added the cloud label Jan 27, 2026
@Thearas
Copy link
Copy Markdown
Contributor

Thearas commented Jan 27, 2026

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@w41ter
Copy link
Copy Markdown
Contributor Author

w41ter commented Jan 27, 2026

run buildall

@w41ter
Copy link
Copy Markdown
Contributor Author

w41ter commented Jan 28, 2026

run buildall

gavinchou
gavinchou previously approved these changes Jan 28, 2026
View reviewed changes
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jan 28, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 28, 2026

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 28, 2026

PR approved by anyone and no changes requested.

@w41ter
Copy link
Copy Markdown
Contributor Author

w41ter commented Jan 28, 2026

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Jan 28, 2026
@w41ter
Copy link
Copy Markdown
Contributor Author

w41ter commented Jan 28, 2026

run buildall

@w41ter
Copy link
Copy Markdown
Contributor Author

w41ter commented Jan 28, 2026

run buildall

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented Jan 28, 2026

Cloud UT Coverage Report

Increment line coverage 43.66% (31/71) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 79.28% (1787/2254)
Line Coverage 64.75% (31857/49203)
Region Coverage 65.49% (15890/24264)
Branch Coverage 56.03% (8441/15066)

@w41ter w41ter requested a review from gavinchou January 29, 2026 02:14
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jan 29, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 29, 2026

PR approved by at least one committer and no changes requested.

@w41ter w41ter merged commit bca4689 into apache:master Jan 29, 2026
30 of 31 checks passed
@w41ter w41ter deleted the cloud/improve/txn_approximate_size branch January 29, 2026 07:59
github-actions bot pushed a commit that referenced this pull request Jan 29, 2026
@w41ter
[fix](cloud) fix unnecessary conflict range in lazy commit (#60274)
700bf96 
Before:

```
I20260127 07:50:10.853658 2639096 meta_service_util.cpp:78] update table version txn_id=885400033280 db_id=15246789 table_id=42356789                                                                             I20260127 07:50:10.853765 2639096 meta_service_txn.cpp:2381] put_size=160197 del_size=0 num_put_keys=2002 num_del_keys=0 txn_size=12976511 txn_id=885400033280                                                    W20260127 07:50:10.924083 2639096 txn_kv.cpp:782] fdb commit error, code=2101 msg=Transaction exceeds byte limit                                                                                                  W20260127 07:50:10.924407 2639096 meta_service_txn.cpp:2391] commit txn failed due to txn size too large, txn_id=885400033280 the underlying txn size=16332642
```

After:

```
I20260127 09:02:46.518415 2656919 meta_service_util.cpp:78] update table version txn_id=5329084161024 db_id=15246789 table_id=42356789
I20260127 09:02:46.518524 2656919 meta_service_txn.cpp:2402] put_size=162198 del_size=0 num_put_keys=2002 num_del_keys=0 txn_size=690512 txn_id=5329084161024 the underlying txn size=846643
I20260127 09:02:46.554267 2657045 txn_lazy_committer.cpp:658] lazy task commit txn_id=5329084161024 retry_times=0
```
@github-actions github-actions bot mentioned this pull request Jan 29, 2026
Merged
yiguolei pushed a commit that referenced this pull request Feb 2, 2026
@github-actions @w41ter
branch-4.0: [fix](cloud) fix unnecessary conflict range in lazy commit …
26cdbfa 
…#60274 (#60350)

Cherry-picked from #60274

Co-authored-by: walter <maochuan@selectdb.com>
ybtsdst pushed a commit to ybtsdst/doris that referenced this pull request Feb 27, 2026
@github-actions @w41ter
branch-4.0: [fix](cloud) fix unnecessary conflict range in lazy commit …
c8bd8cb 
…apache#60274 (apache#60350)

Cherry-picked from apache#60274

Co-authored-by: walter <maochuan@selectdb.com>
@yiguolei yiguolei mentioned this pull request Mar 7, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gavinchou gavinchou gavinchou approved these changes

@dataroaring dataroaring Awaiting requested review from dataroaring dataroaring is a code owner

+1 more reviewer

@0AyanamiRei 0AyanamiRei 0AyanamiRei approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. cloud dev/3.1.x dev/4.0.4-merged reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@w41ter @Thearas @hello-stephen @gavinchou @0AyanamiRei @yiguolei