blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modify get_protobuf_or_bincode_cells to accept and return an iterator

This commit is contained in:
Edgar Xi 2022-03-21 18:48:51 -04:00 committed by Trent Nelson
parent fbcf6a0802
commit f717fda9a3
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage-bigtable/src/bigtable.rs
View File

@ -680,17 +680,17 @@ impl<F: FnMut(Request<()>) -> InterceptedRequestResult> BigTable<F> {
deserialize_protobuf_or_bincode_cell_data(&row_data, table, key)
}
pub async fn get_protobuf_or_bincode_cells<B, P>(
pub async fn get_protobuf_or_bincode_cells<'a, B, P>(
&mut self,
table: &str,
row_keys: &[RowKey],
) -> Result<Vec<(RowKey, CellData<B, P>)>>
table: &'a str,
row_keys: impl Iterator<Item = String>,
) -> Result<impl Iterator<Item = (RowKey, CellData<B, P>)> + 'a>
where
B: serde::de::DeserializeOwned,
P: prost::Message + Default,
{
Ok(self
.get_multi_row_data(table, row_keys)
.get_multi_row_data(table, row_keys.collect::<Vec<RowKey>>().as_slice())
.await?
.into_iter()
.map(|(key, row_data)| {
@ -699,8 +699,7 @@ impl<F: FnMut(Request<()>) -> InterceptedRequestResult> BigTable<F> {
key,
deserialize_protobuf_or_bincode_cell_data(&row_data, table, key_str).unwrap(),
)
})
.collect())
}))
}
pub async fn put_bincode_cells<T>(

27
storage-bigtable/src/lib.rs
View File

@ -466,21 +466,22 @@ impl LedgerStorage {
);
inc_new_counter_debug!("storage-bigtable-query", 1);
let mut bigtable = self.connection.client();
let row_keys: Vec<RowKey> = slots.iter().copied().map(slot_to_blocks_key).collect();
let row_keys = slots.iter().copied().map(slot_to_blocks_key);
let data: Vec<(Slot, ConfirmedBlock)> = bigtable
.get_protobuf_or_bincode_cells::<StoredConfirmedBlock, generated::ConfirmedBlock>(
"blocks",
row_keys.as_slice(),
)
.get_protobuf_or_bincode_cells("blocks", row_keys)
.await?
.into_iter()
.filter_map(|(row_key, block_cell_data)| {
let block = match block_cell_data {
bigtable::CellData::Bincode(block) => block.into(),
bigtable::CellData::Protobuf(block) => block.try_into().ok()?,
};
Some((key_to_slot(&row_key).unwrap(), block))
})
.filter_map(
|(row_key, block_cell_data): (
RowKey,
bigtable::CellData<StoredConfirmedBlock, generated::ConfirmedBlock>,
)| {
let block = match block_cell_data {
bigtable::CellData::Bincode(block) => block.into(),
bigtable::CellData::Protobuf(block) => block.try_into().ok()?,
};
Some((key_to_slot(&row_key).unwrap(), block))
},
)
.collect();
Ok(data)
}