add get_version to server storage api

This commit is contained in:
Dustin J. Mitchell
2021-09-29 02:19:57 +00:00
parent eadce9f15a
commit 8d2be3b495
3 changed files with 173 additions and 33 deletions

View File

@@ -6,8 +6,11 @@ struct Inner {
/// Clients, indexed by client_key
clients: HashMap<Uuid, Client>,
/// Versions, indexed by (client_key, parent_version_id)
/// Versions, indexed by (client_key, version_id)
versions: HashMap<(Uuid, Uuid), Version>,
/// Child versions, indexed by (client_key, parent_version_id)
children: HashMap<(Uuid, Uuid), Uuid>,
}
pub struct InMemoryStorage(Mutex<Inner>);
@@ -18,6 +21,7 @@ impl InMemoryStorage {
Self(Mutex::new(Inner {
clients: HashMap::new(),
versions: HashMap::new(),
children: HashMap::new(),
}))
}
}
@@ -66,11 +70,23 @@ impl<'a> StorageTxn for InnerTxn<'a> {
client_key: Uuid,
parent_version_id: Uuid,
) -> anyhow::Result<Option<Version>> {
Ok(self
.0
.versions
.get(&(client_key, parent_version_id))
.cloned())
if let Some(parent_version_id) = self.0.children.get(&(client_key, parent_version_id)) {
Ok(self
.0
.versions
.get(&(client_key, *parent_version_id))
.cloned())
} else {
Ok(None)
}
}
fn get_version(
&mut self,
client_key: Uuid,
version_id: Uuid,
) -> anyhow::Result<Option<Version>> {
Ok(self.0.versions.get(&(client_key, version_id)).cloned())
}
fn add_version(
@@ -86,9 +102,12 @@ impl<'a> StorageTxn for InnerTxn<'a> {
parent_version_id,
history_segment,
};
self.0
.children
.insert((client_key, version.parent_version_id), version.version_id);
self.0
.versions
.insert((client_key, version.parent_version_id), version);
.insert((client_key, version.version_id), version);
Ok(())
}
@@ -96,3 +115,89 @@ impl<'a> StorageTxn for InnerTxn<'a> {
Ok(())
}
}
#[cfg(test)]
mod test {
use super::*;
#[test]
fn test_emtpy_dir() -> anyhow::Result<()> {
let storage = InMemoryStorage::new();
let mut txn = storage.txn()?;
let maybe_client = txn.get_client(Uuid::new_v4())?;
assert!(maybe_client.is_none());
Ok(())
}
#[test]
fn test_get_client_empty() -> anyhow::Result<()> {
let storage = InMemoryStorage::new();
let mut txn = storage.txn()?;
let maybe_client = txn.get_client(Uuid::new_v4())?;
assert!(maybe_client.is_none());
Ok(())
}
#[test]
fn test_client_storage() -> anyhow::Result<()> {
let storage = InMemoryStorage::new();
let mut txn = storage.txn()?;
let client_key = Uuid::new_v4();
let latest_version_id = Uuid::new_v4();
txn.new_client(client_key, latest_version_id)?;
let client = txn.get_client(client_key)?.unwrap();
assert_eq!(client.latest_version_id, latest_version_id);
let latest_version_id = Uuid::new_v4();
txn.set_client_latest_version_id(client_key, latest_version_id)?;
let client = txn.get_client(client_key)?.unwrap();
assert_eq!(client.latest_version_id, latest_version_id);
Ok(())
}
#[test]
fn test_gvbp_empty() -> anyhow::Result<()> {
let storage = InMemoryStorage::new();
let mut txn = storage.txn()?;
let maybe_version = txn.get_version_by_parent(Uuid::new_v4(), Uuid::new_v4())?;
assert!(maybe_version.is_none());
Ok(())
}
#[test]
fn test_add_version_and_get_version() -> anyhow::Result<()> {
let storage = InMemoryStorage::new();
let mut txn = storage.txn()?;
let client_key = Uuid::new_v4();
let version_id = Uuid::new_v4();
let parent_version_id = Uuid::new_v4();
let history_segment = b"abc".to_vec();
txn.add_version(
client_key,
version_id,
parent_version_id,
history_segment.clone(),
)?;
let expected = Version {
version_id,
parent_version_id,
history_segment,
};
let version = txn
.get_version_by_parent(client_key, parent_version_id)?
.unwrap();
assert_eq!(version, expected);
let version = txn.get_version(client_key, version_id)?.unwrap();
assert_eq!(version, expected);
Ok(())
}
}