Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make clippy stop complaining about insane repair callback #3104

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Make clippy stop complaining about insane repair callback #3104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions src/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,31 +252,34 @@ impl Index {
let once = Once::new();
let progress_bar = Mutex::new(None);

let database = match Database::builder()
.set_cache_size(db_cache_size)
.set_repair_callback(move |progress: &mut RepairSession| {
once.call_once(|| println!("Index file `{}` needs recovery. This can take a long time, especially for the --index-sats index.", index_path.display()));

if !(cfg!(test) || log_enabled!(log::Level::Info) || integration_test()) {
let mut guard = progress_bar.lock().unwrap();
let repair_callback = move |progress: &mut RepairSession| {
once.call_once(|| println!("Index file `{}` needs recovery. This can take a long time, especially for the --index-sats index.", index_path.display()));

if !(cfg!(test) || log_enabled!(log::Level::Info) || integration_test()) {
let mut guard = progress_bar.lock().unwrap();

let progress_bar = guard.get_or_insert_with(|| {
let progress_bar = ProgressBar::new(100);
progress_bar.set_style(
ProgressStyle::with_template("[repairing database] {wide_bar} {pos}/{len}").unwrap(),
);
progress_bar
});

let progress_bar = guard.get_or_insert_with(|| {
let progress_bar = ProgressBar::new(100);
progress_bar.set_style(
ProgressStyle::with_template("[repairing database] {wide_bar} {pos}/{len}").unwrap(),
);
progress_bar
});
#[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
progress_bar.set_position((progress.progress() * 100.0) as u64);
}
};

#[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
progress_bar.set_position((progress.progress() * 100.0) as u64);
}
})
let database = match Database::builder()
.set_cache_size(db_cache_size)
.set_repair_callback(repair_callback)
.open(&path)
{
Ok(database) => {
{
let schema_version = database.begin_read()?
let schema_version = database
.begin_read()?
.open_table(STATISTIC_TO_COUNT)?
.get(&Statistic::Schema.key())?
.map(|x| x.value())
Expand Down Expand Up @@ -362,11 +365,7 @@ impl Index {
u64::from(options.index_transactions),
)?;

Self::set_statistic(
&mut statistics,
Statistic::Schema,
SCHEMA_VERSION,
)?;
Self::set_statistic(&mut statistics, Statistic::Schema, SCHEMA_VERSION)?;
}

tx.commit()?;
Expand Down
Loading