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

v1.16: add merkle root meta column to blockstore (backport of #33979) #34046

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2023

This is an automatic backport of pull request #33979 done by Mergify.
Cherry-pick of e457c02 has failed:

On branch mergify/bp/v1.16/pr-33979
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit e457c02879.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ledger/src/blockstore/blockstore_purge.rs
	modified:   ledger/src/blockstore_db.rs
	modified:   ledger/src/blockstore_meta.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* add merkle root meta column to blockstore

* pr feedback: remove write/reads to column

* pr feedback: u64 -> u32 + revert

* pr feedback: fec_set_index u32, use Self::Index

* pr feedback: key size 16 -> 12

(cherry picked from commit e457c02)

# Conflicts:
#	ledger/src/blockstore.rs
@AshwinSekar AshwinSekar requested a review from steviez November 13, 2023 19:16
Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Merging #34046 (aaa877e) into v1.16 (1776575) will decrease coverage by 0.1%.
The diff coverage is 53.8%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.16   #34046     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         766      766             
  Lines      209076   209102     +26     
=========================================
- Hits       171168   171130     -38     
- Misses      37908    37972     +64     

@AshwinSekar
Copy link
Contributor

This commit also includes #34091

Copy link
Contributor

@behzadnouri behzadnouri left a comment

Choose a reason for hiding this comment

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

lgtm, but please wait for Steve to confirm we are good to backport this to v1.16.

@AshwinSekar
Copy link
Contributor

backport is no longer necessary with the addition of #34174

@mergify mergify bot deleted the mergify/bp/v1.16/pr-33979 branch November 29, 2023 19:52
@steviez steviez restored the mergify/bp/v1.16/pr-33979 branch January 5, 2024 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants