jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: track exact number of transactions (#2343)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-21 20:14:39 +02:00
committed by GitHub
parent 0664ee108b
commit 1169d75d1d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/stages/src/stages/tx_lookup.rs
View File

@ -75,14 +75,17 @@ impl<DB: Database> Stage<DB> for TransactionLookupStage {
let tx_walker =
tx_cursor.walk_range(first_block.first_tx_num()..=last_block.last_tx_num())?;
let mut channels = Vec::new();
let chunk_size = 100_000 / rayon::current_num_threads();
let mut channels = Vec::with_capacity(chunk_size);
let mut transaction_count = 0;
for chunk in &tx_walker.chunks(100_000 / rayon::current_num_threads()) {
for chunk in &tx_walker.chunks(chunk_size) {
let (tx, rx) = mpsc::unbounded_channel();
channels.push(rx);
// Note: Unfortunate side-effect of how chunk is designed in itertools (it is not Send)
let chunk: Vec<_> = chunk.collect();
transaction_count += chunk.len();
// closure that will calculate the TxHash
let calculate_hash =
@ -105,8 +108,7 @@ impl<DB: Database> Stage<DB> for TransactionLookupStage {
});
}
let mut tx_list =
Vec::with_capacity((last_block.last_tx_num() - first_block.first_tx_num()) as usize);
let mut tx_list = Vec::with_capacity(transaction_count);
// Iterate over channels and append the tx hashes to be sorted out later
for mut channel in channels {

3
crates/storage/db/src/tables/models/blocks.rs
View File

@ -40,6 +40,9 @@ impl StoredBlockBodyIndices {
}
/// First transaction index.
///
/// Caution: If the block is empty, this is the number of the first transaction
/// in the next non-empty block.
pub fn first_tx_num(&self) -> TxNumber {
self.first_tx_num
}