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

refactor: implement xline conflict pools #769

Merged
merged 8 commits into from
Apr 28, 2024

Conversation

bsbds
Copy link
Collaborator

@bsbds bsbds commented Apr 9, 2024

Please briefly answer these questions:

  • what problem are you trying to solve? (or if there's no problem, what's the motivation for this change?)

  • what changes does this pull request make?

    This PR implements the conflict pool data structures in xline.

  • are there any non-obvious implications of these changes? (does it break compatibility with previous versions, etc)

Copy link

codecov bot commented Apr 9, 2024

Codecov Report

Attention: Patch coverage is 85.46099% with 82 lines in your changes are missing coverage. Please review.

Project coverage is 75.57%. Comparing base (e35b35a) to head (0ab29e9).
Report is 35 commits behind head on master.

Files Patch % Lines
crates/curp/src/server/conflict/test_pools.rs 0.00% 53 Missing ⚠️
crates/xline/src/conflict/uncommitted_pool.rs 92.25% 5 Missing and 7 partials ⚠️
crates/xline/src/conflict/spec_pool.rs 91.20% 3 Missing and 5 partials ⚠️
crates/xline/src/conflict/tests.rs 97.35% 0 Missing and 6 partials ⚠️
crates/xline/src/conflict/mod.rs 90.90% 1 Missing and 1 partial ⚠️
crates/xlineapi/src/command.rs 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #769      +/-   ##
==========================================
+ Coverage   75.55%   75.57%   +0.02%     
==========================================
  Files         180      187       +7     
  Lines       26938    27563     +625     
  Branches    26938    27563     +625     
==========================================
+ Hits        20353    20831     +478     
- Misses       5366     5450      +84     
- Partials     1219     1282      +63     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bsbds bsbds marked this pull request as ready for review April 9, 2024 07:08
@Phoenix500526 Phoenix500526 self-requested a review April 17, 2024 00:27
crates/xline/src/conflict/mod.rs Show resolved Hide resolved
crates/xline/src/conflict/mod.rs Outdated Show resolved Hide resolved
crates/xline/src/conflict/spec_pool.rs Show resolved Hide resolved
crates/xline/src/conflict/uncommitted_pool.rs Show resolved Hide resolved
crates/xline/src/conflict/uncommitted_pool.rs Show resolved Hide resolved
@mergify mergify bot requested a review from a team April 19, 2024 04:38
Copy link

mergify bot commented Apr 19, 2024

@bsbds Convert your pr to draft since CI failed

@mergify mergify bot marked this pull request as draft April 19, 2024 07:53
@bsbds bsbds force-pushed the impl-xline-conflict-pool branch 2 times, most recently from 3de0765 to bf2e69b Compare April 19, 2024 09:52
@bsbds bsbds marked this pull request as ready for review April 19, 2024 10:35
crates/xline/src/conflict/spec_pool.rs Show resolved Hide resolved
crates/xline/src/conflict/spec_pool.rs Show resolved Hide resolved
crates/xline/src/conflict/spec_pool.rs Show resolved Hide resolved
crates/xline/src/conflict/uncommitted_pool.rs Show resolved Hide resolved
crates/xline/src/conflict/tests.rs Outdated Show resolved Hide resolved
crates/xline/src/conflict/tests.rs Outdated Show resolved Hide resolved
crates/xline/src/conflict/tests.rs Outdated Show resolved Hide resolved
crates/xline/src/conflict/tests.rs Outdated Show resolved Hide resolved
@mergify mergify bot requested a review from a team April 24, 2024 08:53
Copy link

mergify bot commented Apr 25, 2024

@bsbds Convert your pr to draft since CI failed

@mergify mergify bot marked this pull request as draft April 25, 2024 02:14
@bsbds bsbds force-pushed the impl-xline-conflict-pool branch 2 times, most recently from 6d8f8cb to e442e29 Compare April 25, 2024 02:17
@bsbds bsbds marked this pull request as ready for review April 25, 2024 02:17
Copy link

mergify bot commented Apr 25, 2024

@bsbds Convert your pr to draft since CI failed

1 similar comment
Copy link

mergify bot commented Apr 25, 2024

@bsbds Convert your pr to draft since CI failed

@mergify mergify bot marked this pull request as draft April 25, 2024 02:19
@bsbds bsbds marked this pull request as ready for review April 25, 2024 02:30
@mergify mergify bot marked this pull request as draft April 25, 2024 02:31
@Phoenix500526
Copy link
Collaborator

@Mergifyio rebase

Copy link

mergify bot commented Apr 25, 2024

rebase

✅ Branch has been successfully rebased

@Phoenix500526 Phoenix500526 force-pushed the impl-xline-conflict-pool branch from e442e29 to 5b5c201 Compare April 25, 2024 14:59
@Phoenix500526 Phoenix500526 marked this pull request as ready for review April 25, 2024 14:59
Copy link

mergify bot commented Apr 25, 2024

@bsbds Convert your pr to draft since CI failed

@mergify mergify bot marked this pull request as draft April 25, 2024 15:09
@bsbds bsbds force-pushed the impl-xline-conflict-pool branch from 5b5c201 to b68a781 Compare April 26, 2024 02:40
@bsbds bsbds marked this pull request as ready for review April 26, 2024 02:40
@bsbds bsbds force-pushed the impl-xline-conflict-pool branch from b68a781 to 0ab29e9 Compare April 26, 2024 03:28
@mergify mergify bot requested a review from a team April 26, 2024 06:33
Copy link
Collaborator

@Phoenix500526 Phoenix500526 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mergify mergify bot requested a review from a team April 26, 2024 07:48
@bsbds bsbds merged commit d77d55f into xline-kv:master Apr 28, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants