gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

encapsulate meta_cf (#2335)

Browse Source
This commit is contained in:
Rob Walker
2019-01-08 11:41:55 -08:00
committed by GitHub
parent 08924ea36a
commit bafd90807d
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/db_window.rs
View File

@@ -32,7 +32,7 @@ pub fn repair(
) -> Result<Vec<(SocketAddr, Vec<u8>)>> {
let rcluster_info = cluster_info.read().unwrap();
let mut is_next_leader = false;
let meta = db_ledger.meta_cf.get(&MetaCf::key(DEFAULT_SLOT_HEIGHT))?;
let meta = db_ledger.meta()?;
if meta.is_none() {
return Ok(vec![]);
}
@@ -325,8 +325,7 @@ pub fn process_blob(
// then stop
if max_ix != 0 && !consumed_entries.is_empty() {
let meta = db_ledger
.meta_cf
.get(&MetaCf::key(DEFAULT_SLOT_HEIGHT))?
.meta()?
.expect("Expect metadata to exist if consumed entries is nonzero");
let consumed = meta.consumed;
@@ -367,7 +366,7 @@ pub fn calculate_max_repair_entry_height(
#[cfg(feature = "erasure")]
fn try_erasure(db_ledger: &Arc<DbLedger>, consume_queue: &mut Vec<Entry>) -> Result<()> {
let meta = db_ledger.meta_cf.get(&MetaCf::key(DEFAULT_SLOT_HEIGHT))?;
let meta = db_ledger.meta()?;
if let Some(meta) = meta {
let (data, coding) = erasure::recover(db_ledger, meta.consumed_slot, meta.consumed)?;