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

perf: Do not allocate much when backfilling ranges

Browse Source
This commit is contained in:
sprites0
2025-08-01 17:30:33 +00:00
parent 2d6b5e5cd2
commit 77158aa164
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/pseudo_peer/sources/hl_node.rs
View File

@ -74,10 +74,17 @@ fn line_to_evm_block(line: &str) -> serde_json::Result<(BlockAndReceipts, u64)>
Ok((parsed_block, height)) Ok((parsed_block, height))
} }
fn scan_hour_file(path: &Path, last_line: &mut usize, start_height: u64) -> ScanResult { struct ScanOptions {
start_height: u64,
only_load_ranges: bool,
}
fn scan_hour_file(path: &Path, last_line: &mut usize, options: ScanOptions) -> ScanResult {
let file = File::open(path).expect("Failed to open hour file path"); let file = File::open(path).expect("Failed to open hour file path");
let reader = BufReader::new(file); let reader = BufReader::new(file);
let ScanOptions { start_height, only_load_ranges } = options;
let mut new_blocks = Vec::new(); let mut new_blocks = Vec::new();
let mut last_height = start_height; let mut last_height = start_height;
let lines: Vec<String> = reader.lines().collect::<Result<_, _>>().unwrap(); let lines: Vec<String> = reader.lines().collect::<Result<_, _>>().unwrap();
@ -95,7 +102,9 @@ fn scan_hour_file(path: &Path, last_line: &mut usize, start_height: u64) -> Scan
Ok((parsed_block, height)) => { Ok((parsed_block, height)) => {
if height >= start_height { if height >= start_height {
last_height = last_height.max(height); last_height = last_height.max(height);
new_blocks.push(parsed_block); if !only_load_ranges {
new_blocks.push(parsed_block);
}
*last_line = line_idx; *last_line = line_idx;
} }
if matches!(current_range, Some((_, end)) if end + 1 == height) { if matches!(current_range, Some((_, end)) if end + 1 == height) {
@ -219,7 +228,11 @@ impl HlNodeBlockSource {
}; };
info!("Loading block data from {:?}", path); info!("Loading block data from {:?}", path);
u_cache.load_scan_result(scan_hour_file(&path, &mut 0, 0)); u_cache.load_scan_result(scan_hour_file(
&path,
&mut 0,
ScanOptions { start_height: 0, only_load_ranges: false },
));
u_cache.cache.get(&height).cloned() u_cache.cache.get(&height).cloned()
} }
@ -272,7 +285,11 @@ impl HlNodeBlockSource {
warn!("Failed to parse last line of file, fallback to slow path: {:?}", subfile); warn!("Failed to parse last line of file, fallback to slow path: {:?}", subfile);
} }
let mut scan_result = scan_hour_file(&subfile, &mut 0, cutoff_height); let mut scan_result = scan_hour_file(
&subfile,
&mut 0,
ScanOptions { start_height: cutoff_height, only_load_ranges: true },
);
// Only store the block ranges for now; actual block data will be loaded lazily later to optimize memory usage // Only store the block ranges for now; actual block data will be loaded lazily later to optimize memory usage
scan_result.new_blocks.clear(); scan_result.new_blocks.clear();
u_cache.load_scan_result(scan_result); u_cache.load_scan_result(scan_result);
@ -319,7 +336,11 @@ impl HlNodeBlockSource {
let hour_file = root.join(HOURLY_SUBDIR).join(&day_str).join(format!("{hour}")); let hour_file = root.join(HOURLY_SUBDIR).join(&day_str).join(format!("{hour}"));
if hour_file.exists() { if hour_file.exists() {
let scan_result = scan_hour_file(&hour_file, &mut last_line, next_height); let scan_result = scan_hour_file(
&hour_file,
&mut last_line,
ScanOptions { start_height: next_height, only_load_ranges: false },
);
next_height = scan_result.next_expected_height; next_height = scan_result.next_expected_height;
let mut u_cache = cache.lock().await; let mut u_cache = cache.lock().await;