mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radicle: Remove cache entries before caching 

In case of a bug or failed cache update, there may be objects in the
cache that are no longer in storage.

When doing a full re-cache, remove all existing entries from the repo
first.
This commit is contained in:
cloudhead 2024-08-09 10:48:46 +02:00
parent bfc949d094
commit 9db69a40a6
No known key found for this signature in database
5 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicle/src/cob/cache.rs
View File

@ -203,6 +203,8 @@ pub trait Remove<T> {
///
/// This assumes that the `id` is unique across repositories.
fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError>;
/// Delete all entries from a repo.
fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError>;
}
/// An in-memory cache for storing COB objects.
@ -270,6 +272,10 @@ impl<T> Remove<T> for NoCache {
fn remove(&mut self, _id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
Ok(())
}
fn remove_all(&mut self, _rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
Ok(())
}
}
/// Track the progress of cache writes when transferring the

5
radicle/src/cob/issue.rs
View File

@ -72,6 +72,11 @@ pub enum Error {
#[source]
err: Box<dyn std::error::Error + Send + Sync + 'static>,
},
#[error("failed to remove issues from cache: {err}")]
CacheRemoveAll {
#[source]
err: Box<dyn std::error::Error + Send + Sync + 'static>,
},
}
/// Reason why an issue was closed.

23
radicle/src/cob/issue/cache.rs
View File

@ -151,8 +151,13 @@ impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
) -> Result<(), super::Error>
where
R: ReadRepository + cob::Store,
C: Update<Issue>,
C: Update<Issue> + Remove<Issue>,
{
// Start by clearing the cache. This will get rid of issues that are cached but
// no longer exist in storage.
self.remove_all(&self.rid())
.map_err(|e| super::Error::CacheRemoveAll { err: e.into() })?;
let issues = self.store.all()?;
let mut progress = cache::WriteAllProgress::new(issues.len());
for issue in self.store.all()? {
@ -266,6 +271,10 @@ where
fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
self.cache.remove(id)
}
fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
self.cache.remove_all(rid)
}
}
#[derive(Debug, Error)]
@ -321,6 +330,18 @@ impl Remove<Issue> for StoreWriter {
Ok(db.change_count() > 0)
})
}
fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
let mut stmt = self.db.prepare(
"DELETE FROM issues
WHERE repo = ?1",
)?;
stmt.bind((1, rid))?;
stmt.next()?;
Ok(self.db.change_count() > 0)
}
}
pub struct NoCacheIter<'a> {

5
radicle/src/cob/patch.rs
View File

@ -145,6 +145,11 @@ pub enum Error {
#[source]
err: Box<dyn std::error::Error + Send + Sync + 'static>,
},
#[error("failed to remove patches from cache: {err}")]
CacheRemoveAll {
#[source]
err: Box<dyn std::error::Error + Send + Sync + 'static>,
},
}
/// Patch operation.

39
radicle/src/cob/patch/cache.rs
View File

@ -218,8 +218,13 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
) -> Result<(), super::Error>
where
R: ReadRepository + cob::Store,
C: Update<Patch>,
C: Update<Patch> + Remove<Patch>,
{
// Start by clearing the cache. This will get rid of patches that are cached but
// no longer exist in storage.
self.remove_all(&self.rid())
.map_err(|e| super::Error::CacheRemoveAll { err: e.into() })?;
let patches = self.store.all()?;
let mut progress = cache::WriteAllProgress::new(patches.len());
for patch in self.store.all()? {
@ -333,6 +338,10 @@ where
fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
self.cache.remove(id)
}
fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
self.cache.remove_all(rid)
}
}
#[derive(Debug, Error)]
@ -388,6 +397,18 @@ impl Remove<Patch> for StoreWriter {
Ok(db.change_count() > 0)
})
}
fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
let mut stmt = self.db.prepare(
"DELETE FROM patches
WHERE repo = ?1",
)?;
stmt.bind((1, rid))?;
stmt.next()?;
Ok(self.db.change_count() > 0)
}
}
#[derive(Debug, Error)]
@ -395,7 +416,9 @@ pub enum Error {
#[error("object `{1}` of type `{0}` was not found")]
NotFound(TypeName, ObjectId),
#[error(transparent)]
Object(#[from] cob::object::ParseObjectId),
ObjectId(#[from] cob::object::ParseObjectId),
#[error("object {0} failed to parse: {1}")]
Object(ObjectId, serde_json::Error),
#[error(transparent)]
Json(#[from] serde_json::Error),
#[error(transparent)]
@ -413,7 +436,8 @@ pub struct PatchesIter<'a> {
impl<'a> PatchesIter<'a> {
fn parse_row(row: sql::Row) -> Result<(PatchId, Patch), Error> {
let id = PatchId::from_str(row.read::<&str, _>("id"))?;
let patch = serde_json::from_str::<Patch>(row.read::<&str, _>("patch"))?;
let patch = serde_json::from_str::<Patch>(row.read::<&str, _>("patch"))
.map_err(|e| Error::Object(id, e))?;
Ok((id, patch))
}
}
@ -558,21 +582,21 @@ mod query {
rid: &RepoId,
id: &PatchId,
) -> Result<Option<Patch>, Error> {
let id = sql::Value::String(id.to_string());
let key = sql::Value::String(id.to_string());
let mut stmt = db.prepare(
"SELECT patch
FROM patches
WHERE id = ?1 AND repo = ?2",
)?;
stmt.bind((1, id))?;
stmt.bind((1, key))?;
stmt.bind((2, rid))?;
match stmt.into_iter().next().transpose()? {
None => Ok(None),
Some(row) => {
let patch = row.read::<&str, _>("patch");
let patch = serde_json::from_str(patch)?;
let patch = serde_json::from_str(patch).map_err(|e| Error::Object(*id, e))?;
Ok(Some(patch))
}
}
@ -598,7 +622,8 @@ mod query {
None => Ok(None),
Some(row) => {
let id = PatchId::from_str(row.read::<&str, _>("id"))?;
let patch = serde_json::from_str::<Patch>(row.read::<&str, _>("patch"))?;
let patch = serde_json::from_str::<Patch>(row.read::<&str, _>("patch"))
.map_err(|e| Error::Object(id, e))?;
let revision = serde_json::from_str::<Revision>(row.read::<&str, _>("revision"))?;
Ok(Some(ByRevision {
id,