hulthe/filereap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make handling of very small chunks slightly faster

Browse Source
This commit is contained in:
Joakim Hulthe
2022-04-15 16:18:09 +02:00
parent d1274f4ad9
commit 22a0cbc07b
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.rs
View File

@ -119,7 +119,7 @@ fn check_files_to_keep(config: &Config, files: &[FileName]) -> Result<HashSet<Fi
let now = Local::now(); let now = Local::now();
let mut cursor = now; let mut cursor = now;
for period in &config.periods { 'period: for period in &config.periods {
if files.is_empty() { if files.is_empty() {
trace!("no more files, skipping remaining periods"); trace!("no more files, skipping remaining periods");
break; break;
@ -147,7 +147,7 @@ fn check_files_to_keep(config: &Config, files: &[FileName]) -> Result<HashSet<Fi
let end_of_chunk = cursor - chunk_size; let end_of_chunk = cursor - chunk_size;
cursor = end_of_chunk; cursor = end_of_chunk;
let mut chunk_file_to_keep = None; let mut found_file_for_chunk = false;
trace!("processing chunk {end_of_chunk} -> {start_of_chunk}"); trace!("processing chunk {end_of_chunk} -> {start_of_chunk}");
loop { loop {
@ -160,18 +160,24 @@ fn check_files_to_keep(config: &Config, files: &[FileName]) -> Result<HashSet<Fi
trace!("{file} outside of chunk bounds. ignoring."); trace!("{file} outside of chunk bounds. ignoring.");
keep_files.insert(file); keep_files.insert(file);
} else if file > end_of_chunk { } else if file > end_of_chunk {
trace!("{file} is in chunk. beaten by {chunk_file_to_keep:?}"); if !found_file_for_chunk {
chunk_file_to_keep.get_or_insert(file); keep_files.insert(file);
found_file_for_chunk = true;
trace!("{file} is in chunk. keeping.");
} else {
trace!("{file} is in chunk. beaten by another file");
}
} else {
files.push(file); // put the file back in the queue
if file < period_end {
trace!("reached end of period");
continue 'period;
} else { } else {
trace!("reached end of chunk"); trace!("reached end of chunk");
files.push(file); // put the file back in the queue
break; break;
} }
} }
if let Some(file) = chunk_file_to_keep {
trace!("keeping files {file}");
keep_files.insert(file);
} }
} }