Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
85 changes: 84 additions & 1 deletion grit-lib-server/src/cached.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ use crate::error::{Error, Result};
use crate::ids::{RepositoryId, TenantId};
use crate::storage::{
BrowseIndex, CommitGraphStore, ConfigStore, IndexedCommit, IndexedTreeEntry, ObjectStore,
RefStore, ReflogEntry, ReflogStore, StoredObject, StoredRef,
PackMetadata, PackObjectIndex, PackStore, RefStore, ReflogEntry, ReflogStore, StoredObject,
StoredPack, StoredRef,
};

/// Storage wrapper that caches hot object and ref reads.
Expand Down Expand Up @@ -465,6 +466,88 @@ where
}
}

#[async_trait]
impl<S, C> PackStore for CachedStorage<S, C>
where
S: PackStore,
C: Cache,
{
async fn write_pack(
&self,
tenant: &TenantId,
repository: &RepositoryId,
pack: &StoredPack,
) -> Result<PackMetadata> {
let metadata = self.storage.write_pack(tenant, repository, pack).await?;
self.cache.invalidate_repository(tenant, repository).await?;
Ok(metadata)
}

async fn read_pack_metadata(
&self,
tenant: &TenantId,
repository: &RepositoryId,
pack_checksum: &[u8],
) -> Result<Option<PackMetadata>> {
self.storage
.read_pack_metadata(tenant, repository, pack_checksum)
.await
}

async fn read_pack_data(
&self,
tenant: &TenantId,
repository: &RepositoryId,
pack_checksum: &[u8],
) -> Result<Option<Vec<u8>>> {
self.storage
.read_pack_data(tenant, repository, pack_checksum)
.await
}

async fn find_packed_object(
&self,
tenant: &TenantId,
repository: &RepositoryId,
oid: &ObjectId,
) -> Result<Option<(PackMetadata, PackObjectIndex)>> {
self.storage
.find_packed_object(tenant, repository, oid)
.await
}

async fn read_pack_index_at_offset(
&self,
tenant: &TenantId,
repository: &RepositoryId,
pack_checksum: &[u8],
offset: u64,
) -> Result<Option<PackObjectIndex>> {
self.storage
.read_pack_index_at_offset(tenant, repository, pack_checksum, offset)
.await
}

async fn list_packs(
&self,
tenant: &TenantId,
repository: &RepositoryId,
) -> Result<Vec<PackMetadata>> {
self.storage.list_packs(tenant, repository).await
}

async fn list_pack_objects(
&self,
tenant: &TenantId,
repository: &RepositoryId,
pack_checksum: Option<&[u8]>,
) -> Result<Vec<(PackMetadata, PackObjectIndex)>> {
self.storage
.list_pack_objects(tenant, repository, pack_checksum)
.await
}
}

fn encode_object(object: &StoredObject) -> Result<Vec<u8>> {
serde_json::to_vec(&StoredObjectWire::from(object))
.map_err(|err| Error::Cache(format!("serialize cached object: {err}")))
Expand Down
6 changes: 4 additions & 2 deletions grit-lib-server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pub mod maintenance;
pub mod memory;
#[cfg(feature = "nats")]
pub mod nats_invalidation;
mod packfile;
pub mod policy;
pub mod protocol;
#[cfg(feature = "redis")]
Expand Down Expand Up @@ -63,8 +64,9 @@ pub mod prelude {
pub use crate::redis_cache::RedisCache;
pub use crate::repository::ServerRepository;
pub use crate::storage::{
BrowseIndex, CommitGraphStore, ConfigStore, IndexedCommit, ObjectStore, RefStore,
ReflogEntry, ReflogStore, StoredObject, StoredRef,
BrowseIndex, CommitGraphStore, ConfigStore, IndexedCommit, ObjectStore, PackMetadata,
PackObjectIndex, PackStore, PackedObject, RefStore, ReflogEntry, ReflogStore, RepackPlan,
StoredObject, StoredPack, StoredRef,
};
pub use crate::views::{
BlobView, BranchView, CommitComparison, CommitHistoryOptions, CommitHistoryPage,
Expand Down
Loading