diff options
| author | Alex <alex@adnab.me> | 2023-06-09 15:34:09 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-06-09 15:34:09 +0000 |
| commit | 0a06fda0da35f4018c39bf6aec90e55bdf42d241 (patch) | |
| tree | d2b758400f336b63e236c431a965d191954322a8 /src/table | |
| parent | e7e164a280dfc1c4adf9d6da6f3b2a9674eca4bd (diff) | |
| parent | 3d477906d4ff418de10973db7bd3e940f2e47b2d (diff) | |
| download | garage-0a06fda0da35f4018c39bf6aec90e55bdf42d241.tar.gz garage-0a06fda0da35f4018c39bf6aec90e55bdf42d241.zip | |
Merge pull request 'Fix #204 (full Multipart Uploads semantics)' (#553) from nlnet-task1 into next
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/553
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/data.rs | 4 | ||||
| -rw-r--r-- | src/table/schema.rs | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/table/data.rs b/src/table/data.rs index 26cc3a5a..73fa93c8 100644 --- a/src/table/data.rs +++ b/src/table/data.rs @@ -347,9 +347,7 @@ impl<F: TableSchema, R: TableReplication> TableData<F, R> { // ---- Utility functions ---- pub fn tree_key(&self, p: &F::P, s: &F::S) -> Vec<u8> { - let mut ret = p.hash().to_vec(); - ret.extend(s.sort_key()); - ret + [p.hash().as_slice(), s.sort_key()].concat() } pub fn decode_entry(&self, bytes: &[u8]) -> Result<F::E, Error> { diff --git a/src/table/schema.rs b/src/table/schema.rs index 5cbf6c95..fc1a465e 100644 --- a/src/table/schema.rs +++ b/src/table/schema.rs @@ -6,6 +6,8 @@ use garage_util::migrate::Migrate; use crate::crdt::Crdt; +// =================================== PARTITION KEYS + /// Trait for field used to partition data pub trait PartitionKey: Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static @@ -29,6 +31,8 @@ impl PartitionKey for FixedBytes32 { } } +// =================================== SORT KEYS + /// Trait for field used to sort data pub trait SortKey: Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static { /// Get the key used to sort @@ -47,6 +51,8 @@ impl SortKey for FixedBytes32 { } } +// =================================== SCHEMA + /// Trait for an entry in a table. It must be sortable and partitionnable. pub trait Entry<P: PartitionKey, S: SortKey>: Crdt + PartialEq + Clone + Migrate + Send + Sync + 'static |