aboutsummaryrefslogtreecommitdiff
path: root/src/model/object_table.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2021-02-23 20:25:15 +0100
committerAlex Auvolat <alex@adnab.me>2021-02-23 20:25:15 +0100
commitbf25c95fe2fda4ded2e3ca14499e3991e7243532 (patch)
tree889ced32b11186e69caba5af740b26de3e3b0659 /src/model/object_table.rs
parent28bc967c837c38ba416d9b19fd1ae96cbb292074 (diff)
downloadgarage-bf25c95fe2fda4ded2e3ca14499e3991e7243532.tar.gz
garage-bf25c95fe2fda4ded2e3ca14499e3991e7243532.zip
Make updated() be a sync function that doesn't fail
Diffstat (limited to 'src/model/object_table.rs')
-rw-r--r--src/model/object_table.rs53
1 files changed, 26 insertions, 27 deletions
diff --git a/src/model/object_table.rs b/src/model/object_table.rs
index 929b63f0..16cce72c 100644
--- a/src/model/object_table.rs
+++ b/src/model/object_table.rs
@@ -1,11 +1,9 @@
-use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use std::collections::BTreeMap;
use std::sync::Arc;
use garage_util::background::BackgroundRunner;
use garage_util::data::*;
-use garage_util::error::Error;
use garage_table::table_sharded::*;
use garage_table::*;
@@ -191,41 +189,42 @@ pub struct ObjectTable {
pub version_table: Arc<Table<VersionTable, TableShardedReplication>>,
}
-#[async_trait]
impl TableSchema for ObjectTable {
type P = String;
type S = String;
type E = Object;
type Filter = DeletedFilter;
- async fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) -> Result<(), Error> {
+ fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) {
let version_table = self.version_table.clone();
- if let (Some(old_v), Some(new_v)) = (old, new) {
- // Propagate deletion of old versions
- for v in old_v.versions.iter() {
- let newly_deleted = match new_v
- .versions
- .binary_search_by(|nv| nv.cmp_key().cmp(&v.cmp_key()))
- {
- Err(_) => true,
- Ok(i) => {
- new_v.versions[i].state == ObjectVersionState::Aborted
- && v.state != ObjectVersionState::Aborted
+ self.background.spawn(async move {
+ if let (Some(old_v), Some(new_v)) = (old, new) {
+ // Propagate deletion of old versions
+ for v in old_v.versions.iter() {
+ let newly_deleted = match new_v
+ .versions
+ .binary_search_by(|nv| nv.cmp_key().cmp(&v.cmp_key()))
+ {
+ Err(_) => true,
+ Ok(i) => {
+ new_v.versions[i].state == ObjectVersionState::Aborted
+ && v.state != ObjectVersionState::Aborted
+ }
+ };
+ if newly_deleted {
+ let deleted_version = Version::new(
+ v.uuid,
+ old_v.bucket.clone(),
+ old_v.key.clone(),
+ true,
+ vec![],
+ );
+ version_table.insert(&deleted_version).await?;
}
- };
- if newly_deleted {
- let deleted_version = Version::new(
- v.uuid,
- old_v.bucket.clone(),
- old_v.key.clone(),
- true,
- vec![],
- );
- version_table.insert(&deleted_version).await?;
}
}
- }
- Ok(())
+ Ok(())
+ })
}
fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {