mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
rename client id -> client key
This commit is contained in:
parent
e555af8895
commit
92d629522b
11 changed files with 124 additions and 122 deletions
|
@ -2,7 +2,7 @@ use crate::api::{
|
|||
failure_to_ise, ServerState, HISTORY_SEGMENT_CONTENT_TYPE, PARENT_VERSION_ID_HEADER,
|
||||
VERSION_ID_HEADER,
|
||||
};
|
||||
use crate::server::{add_version, AddVersionResult, ClientId, VersionId, NO_VERSION_ID};
|
||||
use crate::server::{add_version, AddVersionResult, ClientKey, VersionId, NO_VERSION_ID};
|
||||
use actix_web::{error, post, web, HttpMessage, HttpRequest, HttpResponse, Result};
|
||||
use futures::StreamExt;
|
||||
|
||||
|
@ -19,11 +19,11 @@ const MAX_SIZE: usize = 100 * 1024 * 1024;
|
|||
/// parent version ID in the `X-Parent-Version-Id` header.
|
||||
///
|
||||
/// Returns other 4xx or 5xx responses on other errors.
|
||||
#[post("/client/{client_id}/add-version/{parent_version_id}")]
|
||||
#[post("/client/{client_key}/add-version/{parent_version_id}")]
|
||||
pub(crate) async fn service(
|
||||
req: HttpRequest,
|
||||
server_state: web::Data<ServerState>,
|
||||
web::Path((client_id, parent_version_id)): web::Path<(ClientId, VersionId)>,
|
||||
web::Path((client_key, parent_version_id)): web::Path<(ClientKey, VersionId)>,
|
||||
mut payload: web::Payload,
|
||||
) -> Result<HttpResponse> {
|
||||
// check content-type
|
||||
|
@ -52,16 +52,16 @@ pub(crate) async fn service(
|
|||
let mut txn = server_state.txn().map_err(failure_to_ise)?;
|
||||
|
||||
// get, or create, the client
|
||||
let client = match txn.get_client(client_id).map_err(failure_to_ise)? {
|
||||
let client = match txn.get_client(client_key).map_err(failure_to_ise)? {
|
||||
Some(client) => client,
|
||||
None => {
|
||||
txn.new_client(client_id, NO_VERSION_ID)
|
||||
txn.new_client(client_key, NO_VERSION_ID)
|
||||
.map_err(failure_to_ise)?;
|
||||
txn.get_client(client_id).map_err(failure_to_ise)?.unwrap()
|
||||
txn.get_client(client_key).map_err(failure_to_ise)?.unwrap()
|
||||
}
|
||||
};
|
||||
|
||||
let result = add_version(txn, client_id, client, parent_version_id, body.to_vec())
|
||||
let result = add_version(txn, client_key, client, parent_version_id, body.to_vec())
|
||||
.map_err(failure_to_ise)?;
|
||||
Ok(match result {
|
||||
AddVersionResult::Ok(version_id) => HttpResponse::Ok()
|
||||
|
@ -83,7 +83,7 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_success() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let version_id = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
|
@ -91,13 +91,13 @@ mod test {
|
|||
// set up the storage contents..
|
||||
{
|
||||
let mut txn = server_box.txn().unwrap();
|
||||
txn.new_client(client_id, Uuid::nil()).unwrap();
|
||||
txn.new_client(client_key, Uuid::nil()).unwrap();
|
||||
}
|
||||
|
||||
let server_state = ServerState::new(server_box);
|
||||
let mut app = test::init_service(App::new().service(app_scope(server_state))).await;
|
||||
|
||||
let uri = format!("/client/{}/add-version/{}", client_id, parent_version_id);
|
||||
let uri = format!("/client/{}/add-version/{}", client_key, parent_version_id);
|
||||
let req = test::TestRequest::post()
|
||||
.uri(&uri)
|
||||
.header(
|
||||
|
@ -119,7 +119,7 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_conflict() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let version_id = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
|
@ -127,13 +127,13 @@ mod test {
|
|||
// set up the storage contents..
|
||||
{
|
||||
let mut txn = server_box.txn().unwrap();
|
||||
txn.new_client(client_id, version_id).unwrap();
|
||||
txn.new_client(client_key, version_id).unwrap();
|
||||
}
|
||||
|
||||
let server_state = ServerState::new(server_box);
|
||||
let mut app = test::init_service(App::new().service(app_scope(server_state))).await;
|
||||
|
||||
let uri = format!("/client/{}/add-version/{}", client_id, parent_version_id);
|
||||
let uri = format!("/client/{}/add-version/{}", client_key, parent_version_id);
|
||||
let req = test::TestRequest::post()
|
||||
.uri(&uri)
|
||||
.header(
|
||||
|
@ -153,13 +153,13 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_bad_content_type() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
let server_state = ServerState::new(server_box);
|
||||
let mut app = test::init_service(App::new().service(app_scope(server_state))).await;
|
||||
|
||||
let uri = format!("/client/{}/add-version/{}", client_id, parent_version_id);
|
||||
let uri = format!("/client/{}/add-version/{}", client_key, parent_version_id);
|
||||
let req = test::TestRequest::post()
|
||||
.uri(&uri)
|
||||
.header("Content-Type", "not/correct")
|
||||
|
@ -171,13 +171,13 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_empty_body() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
let server_state = ServerState::new(server_box);
|
||||
let mut app = test::init_service(App::new().service(app_scope(server_state))).await;
|
||||
|
||||
let uri = format!("/client/{}/add-version/{}", client_id, parent_version_id);
|
||||
let uri = format!("/client/{}/add-version/{}", client_key, parent_version_id);
|
||||
let req = test::TestRequest::post()
|
||||
.uri(&uri)
|
||||
.header(
|
||||
|
|
|
@ -2,7 +2,7 @@ use crate::api::{
|
|||
failure_to_ise, ServerState, HISTORY_SEGMENT_CONTENT_TYPE, PARENT_VERSION_ID_HEADER,
|
||||
VERSION_ID_HEADER,
|
||||
};
|
||||
use crate::server::{get_child_version, ClientId, VersionId};
|
||||
use crate::server::{get_child_version, ClientKey, VersionId};
|
||||
use actix_web::{error, get, web, HttpResponse, Result};
|
||||
|
||||
/// Get a child version.
|
||||
|
@ -13,18 +13,18 @@ use actix_web::{error, get, web, HttpResponse, Result};
|
|||
///
|
||||
/// If no such child exists, returns a 404 with no content.
|
||||
/// Returns other 4xx or 5xx responses on other errors.
|
||||
#[get("/client/{client_id}/get-child-version/{parent_version_id}")]
|
||||
#[get("/client/{client_key}/get-child-version/{parent_version_id}")]
|
||||
pub(crate) async fn service(
|
||||
server_state: web::Data<ServerState>,
|
||||
web::Path((client_id, parent_version_id)): web::Path<(ClientId, VersionId)>,
|
||||
web::Path((client_key, parent_version_id)): web::Path<(ClientKey, VersionId)>,
|
||||
) -> Result<HttpResponse> {
|
||||
let mut txn = server_state.txn().map_err(failure_to_ise)?;
|
||||
|
||||
txn.get_client(client_id)
|
||||
txn.get_client(client_key)
|
||||
.map_err(failure_to_ise)?
|
||||
.ok_or_else(|| error::ErrorNotFound("no such client"))?;
|
||||
|
||||
let result = get_child_version(txn, client_id, parent_version_id).map_err(failure_to_ise)?;
|
||||
let result = get_child_version(txn, client_key, parent_version_id).map_err(failure_to_ise)?;
|
||||
if let Some(result) = result {
|
||||
Ok(HttpResponse::Ok()
|
||||
.content_type(HISTORY_SEGMENT_CONTENT_TYPE)
|
||||
|
@ -49,7 +49,7 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_success() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let version_id = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
|
@ -57,8 +57,8 @@ mod test {
|
|||
// set up the storage contents..
|
||||
{
|
||||
let mut txn = server_box.txn().unwrap();
|
||||
txn.new_client(client_id, Uuid::new_v4()).unwrap();
|
||||
txn.add_version(client_id, version_id, parent_version_id, b"abcd".to_vec())
|
||||
txn.new_client(client_key, Uuid::new_v4()).unwrap();
|
||||
txn.add_version(client_key, version_id, parent_version_id, b"abcd".to_vec())
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
|
@ -67,7 +67,7 @@ mod test {
|
|||
|
||||
let uri = format!(
|
||||
"/client/{}/get-child-version/{}",
|
||||
client_id, parent_version_id
|
||||
client_key, parent_version_id
|
||||
);
|
||||
let req = test::TestRequest::get().uri(&uri).to_request();
|
||||
let mut resp = test::call_service(&mut app, req).await;
|
||||
|
@ -92,7 +92,7 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_client_not_found() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
let server_state = ServerState::new(server_box);
|
||||
|
@ -100,7 +100,7 @@ mod test {
|
|||
|
||||
let uri = format!(
|
||||
"/client/{}/get-child-version/{}",
|
||||
client_id, parent_version_id
|
||||
client_key, parent_version_id
|
||||
);
|
||||
let req = test::TestRequest::get().uri(&uri).to_request();
|
||||
let resp = test::call_service(&mut app, req).await;
|
||||
|
@ -111,21 +111,21 @@ mod test {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn test_version_not_found() {
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let server_box: Box<dyn Storage> = Box::new(InMemoryStorage::new());
|
||||
|
||||
// create the client, but not the version
|
||||
{
|
||||
let mut txn = server_box.txn().unwrap();
|
||||
txn.new_client(client_id, Uuid::new_v4()).unwrap();
|
||||
txn.new_client(client_key, Uuid::new_v4()).unwrap();
|
||||
}
|
||||
let server_state = ServerState::new(server_box);
|
||||
let mut app = test::init_service(App::new().service(app_scope(server_state))).await;
|
||||
|
||||
let uri = format!(
|
||||
"/client/{}/get-child-version/{}",
|
||||
client_id, parent_version_id
|
||||
client_key, parent_version_id
|
||||
);
|
||||
let req = test::TestRequest::get().uri(&uri).to_request();
|
||||
let resp = test::call_service(&mut app, req).await;
|
||||
|
|
|
@ -8,7 +8,7 @@ use uuid::Uuid;
|
|||
pub const NO_VERSION_ID: VersionId = Uuid::nil();
|
||||
|
||||
pub(crate) type HistorySegment = Vec<u8>;
|
||||
pub(crate) type ClientId = Uuid;
|
||||
pub(crate) type ClientKey = Uuid;
|
||||
pub(crate) type VersionId = Uuid;
|
||||
|
||||
/// Response to get_child_version
|
||||
|
@ -21,11 +21,11 @@ pub(crate) struct GetVersionResult {
|
|||
|
||||
pub(crate) fn get_child_version<'a>(
|
||||
mut txn: Box<dyn StorageTxn + 'a>,
|
||||
client_id: ClientId,
|
||||
client_key: ClientKey,
|
||||
parent_version_id: VersionId,
|
||||
) -> Fallible<Option<GetVersionResult>> {
|
||||
Ok(txn
|
||||
.get_version_by_parent(client_id, parent_version_id)?
|
||||
.get_version_by_parent(client_key, parent_version_id)?
|
||||
.map(|version| GetVersionResult {
|
||||
version_id: version.version_id,
|
||||
parent_version_id: version.parent_version_id,
|
||||
|
@ -44,14 +44,14 @@ pub(crate) enum AddVersionResult {
|
|||
|
||||
pub(crate) fn add_version<'a>(
|
||||
mut txn: Box<dyn StorageTxn + 'a>,
|
||||
client_id: ClientId,
|
||||
client_key: ClientKey,
|
||||
client: Client,
|
||||
parent_version_id: VersionId,
|
||||
history_segment: HistorySegment,
|
||||
) -> Fallible<AddVersionResult> {
|
||||
log::debug!(
|
||||
"add_version(client_id: {}, parent_version_id: {})",
|
||||
client_id,
|
||||
"add_version(client_key: {}, parent_version_id: {})",
|
||||
client_key,
|
||||
parent_version_id,
|
||||
);
|
||||
|
||||
|
@ -71,8 +71,8 @@ pub(crate) fn add_version<'a>(
|
|||
);
|
||||
|
||||
// update the DB
|
||||
txn.add_version(client_id, version_id, parent_version_id, history_segment)?;
|
||||
txn.set_client_latest_version_id(client_id, version_id)?;
|
||||
txn.add_version(client_key, version_id, parent_version_id, history_segment)?;
|
||||
txn.set_client_latest_version_id(client_key, version_id)?;
|
||||
txn.commit()?;
|
||||
|
||||
Ok(AddVersionResult::Ok(version_id))
|
||||
|
@ -87,9 +87,9 @@ mod test {
|
|||
fn gcv_not_found() -> Fallible<()> {
|
||||
let storage = InMemoryStorage::new();
|
||||
let txn = storage.txn()?;
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
assert_eq!(get_child_version(txn, client_id, parent_version_id)?, None);
|
||||
assert_eq!(get_child_version(txn, client_key, parent_version_id)?, None);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -97,20 +97,20 @@ mod test {
|
|||
fn gcv_found() -> Fallible<()> {
|
||||
let storage = InMemoryStorage::new();
|
||||
let mut txn = storage.txn()?;
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let version_id = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let history_segment = b"abcd".to_vec();
|
||||
|
||||
txn.add_version(
|
||||
client_id,
|
||||
client_key,
|
||||
version_id,
|
||||
parent_version_id,
|
||||
history_segment.clone(),
|
||||
)?;
|
||||
|
||||
assert_eq!(
|
||||
get_child_version(txn, client_id, parent_version_id)?,
|
||||
get_child_version(txn, client_key, parent_version_id)?,
|
||||
Some(GetVersionResult {
|
||||
version_id,
|
||||
parent_version_id,
|
||||
|
@ -124,7 +124,7 @@ mod test {
|
|||
fn av_conflict() -> Fallible<()> {
|
||||
let storage = InMemoryStorage::new();
|
||||
let mut txn = storage.txn()?;
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let history_segment = b"abcd".to_vec();
|
||||
let existing_parent_version_id = Uuid::new_v4();
|
||||
|
@ -135,7 +135,7 @@ mod test {
|
|||
assert_eq!(
|
||||
add_version(
|
||||
txn,
|
||||
client_id,
|
||||
client_key,
|
||||
client,
|
||||
parent_version_id,
|
||||
history_segment.clone()
|
||||
|
@ -145,9 +145,9 @@ mod test {
|
|||
|
||||
// verify that the storage wasn't updated
|
||||
txn = storage.txn()?;
|
||||
assert_eq!(txn.get_client(client_id)?, None);
|
||||
assert_eq!(txn.get_client(client_key)?, None);
|
||||
assert_eq!(
|
||||
txn.get_version_by_parent(client_id, parent_version_id)?,
|
||||
txn.get_version_by_parent(client_key, parent_version_id)?,
|
||||
None
|
||||
);
|
||||
|
||||
|
@ -157,7 +157,7 @@ mod test {
|
|||
fn test_av_success(latest_version_id_nil: bool) -> Fallible<()> {
|
||||
let storage = InMemoryStorage::new();
|
||||
let mut txn = storage.txn()?;
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let parent_version_id = Uuid::new_v4();
|
||||
let history_segment = b"abcd".to_vec();
|
||||
let latest_version_id = if latest_version_id_nil {
|
||||
|
@ -166,12 +166,12 @@ mod test {
|
|||
parent_version_id
|
||||
};
|
||||
|
||||
txn.new_client(client_id, latest_version_id)?;
|
||||
let client = txn.get_client(client_id)?.unwrap();
|
||||
txn.new_client(client_key, latest_version_id)?;
|
||||
let client = txn.get_client(client_key)?.unwrap();
|
||||
|
||||
let result = add_version(
|
||||
txn,
|
||||
client_id,
|
||||
client_key,
|
||||
client,
|
||||
parent_version_id,
|
||||
history_segment.clone(),
|
||||
|
@ -182,10 +182,10 @@ mod test {
|
|||
|
||||
// verify that the storage was updated
|
||||
txn = storage.txn()?;
|
||||
let client = txn.get_client(client_id)?.unwrap();
|
||||
let client = txn.get_client(client_key)?.unwrap();
|
||||
assert_eq!(client.latest_version_id, new_version_id);
|
||||
let version = txn
|
||||
.get_version_by_parent(client_id, parent_version_id)?
|
||||
.get_version_by_parent(client_key, parent_version_id)?
|
||||
.unwrap();
|
||||
assert_eq!(version.version_id, new_version_id);
|
||||
assert_eq!(version.parent_version_id, parent_version_id);
|
||||
|
|
|
@ -4,10 +4,10 @@ use std::collections::HashMap;
|
|||
use std::sync::{Mutex, MutexGuard};
|
||||
|
||||
struct Inner {
|
||||
/// Clients, indexed by client_id
|
||||
/// Clients, indexed by client_key
|
||||
clients: HashMap<Uuid, Client>,
|
||||
|
||||
/// Versions, indexed by (client_id, parent_version_id)
|
||||
/// Versions, indexed by (client_key, parent_version_id)
|
||||
versions: HashMap<(Uuid, Uuid), Version>,
|
||||
}
|
||||
|
||||
|
@ -34,48 +34,48 @@ impl Storage for InMemoryStorage {
|
|||
}
|
||||
|
||||
impl<'a> StorageTxn for InnerTxn<'a> {
|
||||
fn get_client(&mut self, client_id: Uuid) -> Fallible<Option<Client>> {
|
||||
Ok(self.0.clients.get(&client_id).cloned())
|
||||
fn get_client(&mut self, client_key: Uuid) -> Fallible<Option<Client>> {
|
||||
Ok(self.0.clients.get(&client_key).cloned())
|
||||
}
|
||||
|
||||
fn new_client(&mut self, client_id: Uuid, latest_version_id: Uuid) -> Fallible<()> {
|
||||
if self.0.clients.get(&client_id).is_some() {
|
||||
return Err(format_err!("Client {} already exists", client_id));
|
||||
fn new_client(&mut self, client_key: Uuid, latest_version_id: Uuid) -> Fallible<()> {
|
||||
if self.0.clients.get(&client_key).is_some() {
|
||||
return Err(format_err!("Client {} already exists", client_key));
|
||||
}
|
||||
self.0
|
||||
.clients
|
||||
.insert(client_id, Client { latest_version_id });
|
||||
.insert(client_key, Client { latest_version_id });
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_client_latest_version_id(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
latest_version_id: Uuid,
|
||||
) -> Fallible<()> {
|
||||
if let Some(client) = self.0.clients.get_mut(&client_id) {
|
||||
if let Some(client) = self.0.clients.get_mut(&client_key) {
|
||||
client.latest_version_id = latest_version_id;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(format_err!("Client {} does not exist", client_id))
|
||||
Err(format_err!("Client {} does not exist", client_key))
|
||||
}
|
||||
}
|
||||
|
||||
fn get_version_by_parent(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
parent_version_id: Uuid,
|
||||
) -> Fallible<Option<Version>> {
|
||||
Ok(self
|
||||
.0
|
||||
.versions
|
||||
.get(&(client_id, parent_version_id))
|
||||
.get(&(client_key, parent_version_id))
|
||||
.cloned())
|
||||
}
|
||||
|
||||
fn add_version(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
version_id: Uuid,
|
||||
parent_version_id: Uuid,
|
||||
history_segment: Vec<u8>,
|
||||
|
@ -88,7 +88,7 @@ impl<'a> StorageTxn for InnerTxn<'a> {
|
|||
};
|
||||
self.0
|
||||
.versions
|
||||
.insert((client_id, version.parent_version_id), version);
|
||||
.insert((client_key, version.parent_version_id), version);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
|
@ -4,28 +4,28 @@ use kv::msgpack::Msgpack;
|
|||
use kv::{Bucket, Config, Error, Serde, Store, ValueBuf};
|
||||
use std::path::Path;
|
||||
|
||||
/// Key for versions: concatenation of client_id and parent_version_id
|
||||
type VersionKey = [u8; 32];
|
||||
/// DB Key for versions: concatenation of client_key and parent_version_id
|
||||
type VersionDbKey = [u8; 32];
|
||||
|
||||
fn version_key(client_id: Uuid, parent_version_id: Uuid) -> VersionKey {
|
||||
fn version_db_key(client_key: Uuid, parent_version_id: Uuid) -> VersionDbKey {
|
||||
let mut key = [0u8; 32];
|
||||
key[..16].clone_from_slice(client_id.as_bytes());
|
||||
key[..16].clone_from_slice(client_key.as_bytes());
|
||||
key[16..].clone_from_slice(parent_version_id.as_bytes());
|
||||
key
|
||||
}
|
||||
|
||||
/// Key for clients: just the client_id
|
||||
type ClientKey = [u8; 16];
|
||||
/// Key for clients: just the client_key
|
||||
type ClientDbKey = [u8; 16];
|
||||
|
||||
fn client_key(client_id: Uuid) -> ClientKey {
|
||||
*client_id.as_bytes()
|
||||
fn client_db_key(client_key: Uuid) -> ClientDbKey {
|
||||
*client_key.as_bytes()
|
||||
}
|
||||
|
||||
/// KVStorage is an on-disk storage backend which uses LMDB via the `kv` crate.
|
||||
pub(crate) struct KVStorage<'t> {
|
||||
store: Store,
|
||||
clients_bucket: Bucket<'t, ClientKey, ValueBuf<Msgpack<Client>>>,
|
||||
versions_bucket: Bucket<'t, VersionKey, ValueBuf<Msgpack<Version>>>,
|
||||
clients_bucket: Bucket<'t, ClientDbKey, ValueBuf<Msgpack<Client>>>,
|
||||
versions_bucket: Bucket<'t, VersionDbKey, ValueBuf<Msgpack<Version>>>,
|
||||
}
|
||||
|
||||
impl<'t> KVStorage<'t> {
|
||||
|
@ -37,9 +37,9 @@ impl<'t> KVStorage<'t> {
|
|||
let store = Store::new(config)?;
|
||||
|
||||
let clients_bucket =
|
||||
store.bucket::<ClientKey, ValueBuf<Msgpack<Client>>>(Some("clients"))?;
|
||||
store.bucket::<ClientDbKey, ValueBuf<Msgpack<Client>>>(Some("clients"))?;
|
||||
let versions_bucket =
|
||||
store.bucket::<VersionKey, ValueBuf<Msgpack<Version>>>(Some("versions"))?;
|
||||
store.bucket::<VersionDbKey, ValueBuf<Msgpack<Version>>>(Some("versions"))?;
|
||||
|
||||
Ok(KVStorage {
|
||||
store,
|
||||
|
@ -73,17 +73,17 @@ impl<'t> Txn<'t> {
|
|||
}
|
||||
}
|
||||
|
||||
fn clients_bucket(&self) -> &'t Bucket<'t, ClientKey, ValueBuf<Msgpack<Client>>> {
|
||||
fn clients_bucket(&self) -> &'t Bucket<'t, ClientDbKey, ValueBuf<Msgpack<Client>>> {
|
||||
&self.storage.clients_bucket
|
||||
}
|
||||
fn versions_bucket(&self) -> &'t Bucket<'t, VersionKey, ValueBuf<Msgpack<Version>>> {
|
||||
fn versions_bucket(&self) -> &'t Bucket<'t, VersionDbKey, ValueBuf<Msgpack<Version>>> {
|
||||
&self.storage.versions_bucket
|
||||
}
|
||||
}
|
||||
|
||||
impl<'t> StorageTxn for Txn<'t> {
|
||||
fn get_client(&mut self, client_id: Uuid) -> Fallible<Option<Client>> {
|
||||
let key = client_key(client_id);
|
||||
fn get_client(&mut self, client_key: Uuid) -> Fallible<Option<Client>> {
|
||||
let key = client_db_key(client_key);
|
||||
let bucket = self.clients_bucket();
|
||||
let kvtxn = self.kvtxn();
|
||||
|
||||
|
@ -97,8 +97,8 @@ impl<'t> StorageTxn for Txn<'t> {
|
|||
Ok(Some(client))
|
||||
}
|
||||
|
||||
fn new_client(&mut self, client_id: Uuid, latest_version_id: Uuid) -> Fallible<()> {
|
||||
let key = client_key(client_id);
|
||||
fn new_client(&mut self, client_key: Uuid, latest_version_id: Uuid) -> Fallible<()> {
|
||||
let key = client_db_key(client_key);
|
||||
let bucket = self.clients_bucket();
|
||||
let kvtxn = self.kvtxn();
|
||||
let client = Client { latest_version_id };
|
||||
|
@ -108,19 +108,19 @@ impl<'t> StorageTxn for Txn<'t> {
|
|||
|
||||
fn set_client_latest_version_id(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
latest_version_id: Uuid,
|
||||
) -> Fallible<()> {
|
||||
// implementation is the same as new_client..
|
||||
self.new_client(client_id, latest_version_id)
|
||||
self.new_client(client_key, latest_version_id)
|
||||
}
|
||||
|
||||
fn get_version_by_parent(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
parent_version_id: Uuid,
|
||||
) -> Fallible<Option<Version>> {
|
||||
let key = version_key(client_id, parent_version_id);
|
||||
let key = version_db_key(client_key, parent_version_id);
|
||||
let bucket = self.versions_bucket();
|
||||
let kvtxn = self.kvtxn();
|
||||
let version = match kvtxn.get(&bucket, key) {
|
||||
|
@ -135,12 +135,12 @@ impl<'t> StorageTxn for Txn<'t> {
|
|||
|
||||
fn add_version(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
version_id: Uuid,
|
||||
parent_version_id: Uuid,
|
||||
history_segment: Vec<u8>,
|
||||
) -> Fallible<()> {
|
||||
let key = version_key(client_id, parent_version_id);
|
||||
let key = version_db_key(client_key, parent_version_id);
|
||||
let bucket = self.versions_bucket();
|
||||
let kvtxn = self.kvtxn();
|
||||
let version = Version {
|
||||
|
@ -184,17 +184,17 @@ mod test {
|
|||
let storage = KVStorage::new(&tmp_dir.path())?;
|
||||
let mut txn = storage.txn()?;
|
||||
|
||||
let client_id = Uuid::new_v4();
|
||||
let client_key = Uuid::new_v4();
|
||||
let latest_version_id = Uuid::new_v4();
|
||||
txn.new_client(client_id, latest_version_id)?;
|
||||
txn.new_client(client_key, latest_version_id)?;
|
||||
|
||||
let client = txn.get_client(client_id)?.unwrap();
|
||||
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_id, latest_version_id)?;
|
||||
txn.set_client_latest_version_id(client_key, latest_version_id)?;
|
||||
|
||||
let client = txn.get_client(client_id)?.unwrap();
|
||||
let client = txn.get_client(client_key)?.unwrap();
|
||||
assert_eq!(client.latest_version_id, latest_version_id);
|
||||
|
||||
Ok(())
|
||||
|
@ -216,18 +216,18 @@ mod test {
|
|||
let storage = KVStorage::new(&tmp_dir.path())?;
|
||||
let mut txn = storage.txn()?;
|
||||
|
||||
let client_id = Uuid::new_v4();
|
||||
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_id,
|
||||
client_key,
|
||||
version_id,
|
||||
parent_version_id,
|
||||
history_segment.clone(),
|
||||
)?;
|
||||
let version = txn
|
||||
.get_version_by_parent(client_id, parent_version_id)?
|
||||
.get_version_by_parent(client_key, parent_version_id)?
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(
|
||||
|
|
|
@ -24,29 +24,29 @@ pub(crate) struct Version {
|
|||
|
||||
pub(crate) trait StorageTxn {
|
||||
/// Get information about the given client
|
||||
fn get_client(&mut self, client_id: Uuid) -> Fallible<Option<Client>>;
|
||||
fn get_client(&mut self, client_key: Uuid) -> Fallible<Option<Client>>;
|
||||
|
||||
/// Create a new client with the given latest_version_id
|
||||
fn new_client(&mut self, client_id: Uuid, latest_version_id: Uuid) -> Fallible<()>;
|
||||
fn new_client(&mut self, client_key: Uuid, latest_version_id: Uuid) -> Fallible<()>;
|
||||
|
||||
/// Set the client's latest_version_id
|
||||
fn set_client_latest_version_id(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
latest_version_id: Uuid,
|
||||
) -> Fallible<()>;
|
||||
|
||||
/// Get a version, indexed by parent version id
|
||||
fn get_version_by_parent(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
parent_version_id: Uuid,
|
||||
) -> Fallible<Option<Version>>;
|
||||
|
||||
/// Add a version (that must not already exist)
|
||||
fn add_version(
|
||||
&mut self,
|
||||
client_id: Uuid,
|
||||
client_key: Uuid,
|
||||
version_id: Uuid,
|
||||
parent_version_id: Uuid,
|
||||
history_segment: Vec<u8>,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue