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(exex): filter only WAL files when walking the directory (#11802)

Browse Source
This commit is contained in:
Alexey Shekhirin
2024-10-16 20:23:15 +01:00
committed by GitHub
parent 756a47e4e2
commit a2249b0b04
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
crates/exex/exex/src/wal/storage.rs
View File

@ -9,6 +9,8 @@ use reth_exex_types::ExExNotification;
use reth_tracing::tracing::debug;
use tracing::instrument;
static FILE_EXTENSION: &str = "wal";
/// The underlying WAL storage backed by a directory of files.
///
/// Each notification is represented by a single file that contains a MessagePack-encoded
@ -29,7 +31,7 @@ impl Storage {
}
fn file_path(&self, id: u32) -> PathBuf {
self.path.join(format!("{id}.wal"))
self.path.join(format!("{id}.{FILE_EXTENSION}"))
}
fn parse_filename(filename: &str) -> eyre::Result<u32> {
@ -70,11 +72,14 @@ impl Storage {
for entry in reth_fs_util::read_dir(&self.path)? {
let entry = entry?;
let file_name = entry.file_name();
let file_id = Self::parse_filename(&file_name.to_string_lossy())?;
min_id = min_id.map_or(Some(file_id), |min_id: u32| Some(min_id.min(file_id)));
max_id = max_id.map_or(Some(file_id), |max_id: u32| Some(max_id.max(file_id)));
if entry.path().extension() == Some(FILE_EXTENSION.as_ref()) {
let file_name = entry.file_name();
let file_id = Self::parse_filename(&file_name.to_string_lossy())?;
min_id = min_id.map_or(Some(file_id), |min_id: u32| Some(min_id.min(file_id)));
max_id = max_id.map_or(Some(file_id), |max_id: u32| Some(max_id.max(file_id)));
}
}
Ok(min_id.zip(max_id).map(|(min_id, max_id)| min_id..=max_id))
@ -167,7 +172,7 @@ impl Storage {
#[cfg(test)]
mod tests {
use std::sync::Arc;
use std::{fs::File, sync::Arc};
use eyre::OptionExt;
use reth_exex_types::ExExNotification;
@ -206,4 +211,24 @@ mod tests {
Ok(())
}
#[test]
fn test_files_range() -> eyre::Result<()> {
let temp_dir = tempfile::tempdir()?;
let storage = Storage::new(&temp_dir)?;
// Create WAL files
File::create(storage.file_path(1))?;
File::create(storage.file_path(2))?;
File::create(storage.file_path(3))?;
// Create non-WAL files that should be ignored
File::create(temp_dir.path().join("0.tmp"))?;
File::create(temp_dir.path().join("4.tmp"))?;
// Check files range
assert_eq!(storage.files_range()?, Some(1..=3));
Ok(())
}
}