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

fixups

Browse Source
This commit is contained in:
Rob Walker
2018-07-18 15:16:38 -07:00
parent 429ea98ace
commit 8d2bd43100
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/erasure.rs
View File

@ -424,12 +424,12 @@ pub fn recover(
let mut coding_ptrs: Vec<&mut [u8]> = Vec::with_capacity(NUM_CODING); let mut coding_ptrs: Vec<&mut [u8]> = Vec::with_capacity(NUM_CODING);
let mut data_ptrs: Vec<&mut [u8]> = Vec::with_capacity(NUM_DATA); let mut data_ptrs: Vec<&mut [u8]> = Vec::with_capacity(NUM_DATA);
for (i, l) in locks.iter_mut().enumerate() { for (i, l) in locks.iter_mut().enumerate() {
if i >= NUM_DATA { if i < NUM_DATA {
trace!("pushing coding: {}", i);
coding_ptrs.push(&mut l.data[..size.unwrap()]);
} else {
trace!("pushing data: {}", i); trace!("pushing data: {}", i);
data_ptrs.push(&mut l.data[..size.unwrap()]); data_ptrs.push(&mut l.data[..size.unwrap()]);
} else {
trace!("pushing coding: {}", i);
coding_ptrs.push(&mut l.data_mut()[..size.unwrap()]);
} }
} }
trace!( trace!(
@ -445,11 +445,14 @@ pub fn recover(
} }
for i in &erasures[..erasures.len() - 1] { for i in &erasures[..erasures.len() - 1] {
let idx = *i as usize; let idx = *i as usize;
let mut data_size = locks[idx].get_data_size().unwrap();
trace!("data_size at {} {}", *i, data_size);
let mut data_size;
if idx < NUM_DATA {
data_size = locks[idx].get_data_size().unwrap();
data_size -= BLOB_HEADER_SIZE as u64; data_size -= BLOB_HEADER_SIZE as u64;
} else {
data_size = size.unwrap() as u64;
}
locks[idx].meta = meta.clone().unwrap(); locks[idx].meta = meta.clone().unwrap();
locks[idx].set_size(data_size as usize); locks[idx].set_size(data_size as usize);