uses Option<Slot> for SlotMeta.parent_slot #21808
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SlotMeta.parent_slot for the head of a detached chain of slots is unknown and that is indicated by u64::MAX which lacks type-safety: https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205 The commit changes the type to Option<Slot>. Backward compatibility is maintained by customizing serde serialize/deserialize implementations.
Codecov Report
@@ Coverage Diff @@
## master #21808 +/- ##
=======================================
Coverage 81.3% 81.3%
=======================================
Files 515 515
Lines 144033 144029 -4
=======================================
+ Hits 117126 117149 +23
+ Misses 26907 26880 -27 |
carllin
reviewed
Dec 14, 2021
| // TODO use Option<Slot> instead. | ||
| pub parent_slot: Slot, | ||
| // The parent slot of the head of a detached chain of slots is None. | ||
| #[serde(with = "serde_compat")] |
There was a problem hiding this comment.
This backwards compatibility looks good to me. cc @yhchiang-sol and @steviez for future blockstore changes
carllin
approved these changes
Dec 14, 2021
|
Looks good! Feel free to tag @yhchiang-sol and @steviez for future blockstore changes. They're working in this area and would like to keep abreast of developments in this area of the code |
mergify bot
pushed a commit
that referenced
this pull request
Dec 14, 2021
SlotMeta.parent_slot for the head of a detached chain of slots is unknown and that is indicated by u64::MAX which lacks type-safety: https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205 The commit changes the type to Option<Slot>. Backward compatibility is maintained by customizing serde serialize/deserialize implementations. (cherry picked from commit 8d980f0) # Conflicts: # ledger-tool/src/main.rs
mergify bot
added a commit
that referenced
this pull request
Dec 14, 2021
* uses Option<Slot> for SlotMeta.parent_slot (#21808) SlotMeta.parent_slot for the head of a detached chain of slots is unknown and that is indicated by u64::MAX which lacks type-safety: https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205 The commit changes the type to Option<Slot>. Backward compatibility is maintained by customizing serde serialize/deserialize implementations. (cherry picked from commit 8d980f0) # Conflicts: # ledger-tool/src/main.rs * removes backport merge conflicts Co-authored-by: behzad nouri <behzadnouri@gmail.com>
Closed
mergify bot
pushed a commit
that referenced
this pull request
Feb 4, 2022
SlotMeta.parent_slot for the head of a detached chain of slots is unknown and that is indicated by u64::MAX which lacks type-safety: https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205 The commit changes the type to Option<Slot>. Backward compatibility is maintained by customizing serde serialize/deserialize implementations. (cherry picked from commit 8d980f0) # Conflicts: # core/src/repair_generic_traversal.rs # ledger-tool/src/main.rs # ledger/src/blockstore.rs
mergify bot
added a commit
that referenced
this pull request
Feb 4, 2022
* uses Option<Slot> for SlotMeta.parent_slot (#21808) SlotMeta.parent_slot for the head of a detached chain of slots is unknown and that is indicated by u64::MAX which lacks type-safety: https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205 The commit changes the type to Option<Slot>. Backward compatibility is maintained by customizing serde serialize/deserialize implementations. (cherry picked from commit 8d980f0) # Conflicts: # core/src/repair_generic_traversal.rs # ledger-tool/src/main.rs # ledger/src/blockstore.rs * removes mergify merge conflicts Co-authored-by: behzad nouri <behzadnouri@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
SlotMeta.parent_slot for the head of a detached chain of slots is
unknown and that is indicated by u64::MAX which lacks type-safety:
https://github.com/solana-labs/solana/blob/6c108c8fc/ledger/src/blockstore_meta.rs#L203-L205
Summary of Changes
The commit changes the type to Option. Backward compatibility is
maintained by customizing serde serialize/deserialize implementations.