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

Jump to bottom

fix(market): clean up provider_sectors when empty #1539

Merged
merged 2 commits into from
May 22, 2024
Merged

fix(market): clean up provider_sectors when empty #1539

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a3b45
fix(market): clean up provider_sectors when empty
rvagg May 16, 2024
444a205
fix(market): extend tests to ensure no empty sector/deal map
rvagg May 21, 2024
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
44 changes: 38 additions & 6 deletions actors/market/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@ impl State {
) -> Result<(), ActorError> {
let mut provider_sectors = self.load_provider_sectors(store)?;
for (provider, sector_deal_ids) in provider_sector_deal_ids {
let mut flush = false;
let mut sector_deals = load_provider_sector_deals(store, &provider_sectors, *provider)?;
for (sector_number, deals_to_remove) in sector_deal_ids {
let existing_deal_ids = sector_deals
Expand All @@ -662,20 +663,51 @@ impl State {
// pretty fast.
// Loading into a HashSet could be an improvement for large collections of deals
// in a single sector being removed at one time.
let new_deals = existing_deal_ids
let new_deals: Vec<_> = existing_deal_ids
.iter()
.filter(|deal_id| !deals_to_remove.contains(*deal_id))
.cloned()
.collect();

sector_deals
.set(sector_number, new_deals)
flush = true;

if new_deals.is_empty() {
sector_deals.delete(sector_number).with_context_code(
ExitCode::USR_ILLEGAL_STATE,
|| {
format!(
"failed to delete sector deals for {} {}",
provider, sector_number
)
},
)?;
} else {
sector_deals.set(sector_number, new_deals).with_context_code(
ExitCode::USR_ILLEGAL_STATE,
|| {
format!(
"failed to set sector deals for {} {}",
provider, sector_number
)
},
)?;
}
}
}
if flush {
if sector_deals.is_empty() {
provider_sectors
.delete(provider)
rvagg marked this conversation as resolved.
Show resolved Hide resolved
.with_context_code(ExitCode::USR_ILLEGAL_STATE, || {
format!("failed to set sector deals for {} {}", provider, sector_number)
format!("failed to delete sector deals for {}", provider)
})?;
} else {
save_provider_sector_deals(
&mut provider_sectors,
*provider,
&mut sector_deals,
)?;
}
}
save_provider_sector_deals(&mut provider_sectors, *provider, &mut sector_deals)?;
}
self.save_provider_sectors(&mut provider_sectors)?;
Ok(())
Expand Down
Loading