make get_protobuf_or_bincode_cells accept IntoIter on row_keys, make get_confirmed_blocks_with_data return an Iterator
This commit is contained in:
parent
f717fda9a3
commit
d8be0d9430
|
@ -683,14 +683,17 @@ impl<F: FnMut(Request<()>) -> InterceptedRequestResult> BigTable<F> {
|
||||||
pub async fn get_protobuf_or_bincode_cells<'a, B, P>(
|
pub async fn get_protobuf_or_bincode_cells<'a, B, P>(
|
||||||
&mut self,
|
&mut self,
|
||||||
table: &'a str,
|
table: &'a str,
|
||||||
row_keys: impl Iterator<Item = String>,
|
row_keys: impl IntoIterator<Item = RowKey>,
|
||||||
) -> Result<impl Iterator<Item = (RowKey, CellData<B, P>)> + 'a>
|
) -> Result<impl Iterator<Item = (RowKey, CellData<B, P>)> + 'a>
|
||||||
where
|
where
|
||||||
B: serde::de::DeserializeOwned,
|
B: serde::de::DeserializeOwned,
|
||||||
P: prost::Message + Default,
|
P: prost::Message + Default,
|
||||||
{
|
{
|
||||||
Ok(self
|
Ok(self
|
||||||
.get_multi_row_data(table, row_keys.collect::<Vec<RowKey>>().as_slice())
|
.get_multi_row_data(
|
||||||
|
table,
|
||||||
|
row_keys.into_iter().collect::<Vec<RowKey>>().as_slice(),
|
||||||
|
)
|
||||||
.await?
|
.await?
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(key, row_data)| {
|
.map(|(key, row_data)| {
|
||||||
|
|
|
@ -456,10 +456,10 @@ impl LedgerStorage {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetches and gets a vector of confirmed blocks via a multirow fetch
|
// Fetches and gets a vector of confirmed blocks via a multirow fetch
|
||||||
pub async fn get_confirmed_blocks_with_data(
|
pub async fn get_confirmed_blocks_with_data<'a>(
|
||||||
&self,
|
&self,
|
||||||
slots: &[Slot],
|
slots: &'a [Slot],
|
||||||
) -> Result<Vec<(Slot, ConfirmedBlock)>> {
|
) -> Result<impl Iterator<Item = (Slot, ConfirmedBlock)> + 'a> {
|
||||||
debug!(
|
debug!(
|
||||||
"LedgerStorage::get_confirmed_blocks_with_data request received: {:?}",
|
"LedgerStorage::get_confirmed_blocks_with_data request received: {:?}",
|
||||||
slots
|
slots
|
||||||
|
@ -467,7 +467,7 @@ impl LedgerStorage {
|
||||||
inc_new_counter_debug!("storage-bigtable-query", 1);
|
inc_new_counter_debug!("storage-bigtable-query", 1);
|
||||||
let mut bigtable = self.connection.client();
|
let mut bigtable = self.connection.client();
|
||||||
let row_keys = slots.iter().copied().map(slot_to_blocks_key);
|
let row_keys = slots.iter().copied().map(slot_to_blocks_key);
|
||||||
let data: Vec<(Slot, ConfirmedBlock)> = bigtable
|
let data = bigtable
|
||||||
.get_protobuf_or_bincode_cells("blocks", row_keys)
|
.get_protobuf_or_bincode_cells("blocks", row_keys)
|
||||||
.await?
|
.await?
|
||||||
.filter_map(
|
.filter_map(
|
||||||
|
@ -481,8 +481,7 @@ impl LedgerStorage {
|
||||||
};
|
};
|
||||||
Some((key_to_slot(&row_key).unwrap(), block))
|
Some((key_to_slot(&row_key).unwrap(), block))
|
||||||
},
|
},
|
||||||
)
|
);
|
||||||
.collect();
|
|
||||||
Ok(data)
|
Ok(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue