diff options
| author | Alex <alex@adnab.me> | 2020-11-21 16:01:26 +0100 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2020-11-21 16:01:26 +0100 |
| commit | b3814b15ccc233d7c4233b43816cce20db278f17 (patch) | |
| tree | f37a1ce39bfae7c3f706162e186df4064635bd74 /src/table/schema.rs | |
| parent | 5dc304ac41c2ae0699fbdd56117b60c517a1ad39 (diff) | |
| parent | a8b3c8fd5898400d64310f61bb1a41dd5fefe5ea (diff) | |
| download | garage-b3814b15ccc233d7c4233b43816cce20db278f17.tar.gz garage-b3814b15ccc233d7c4233b43816cce20db278f17.zip | |
Merge pull request 'Use cleaner CRDT data types for objects to avoid accidents like #16' (#18) from feature/better-crdt into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/18
Diffstat (limited to 'src/table/schema.rs')
| -rw-r--r-- | src/table/schema.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/table/schema.rs b/src/table/schema.rs index 49cede0a..d2ec9450 100644 --- a/src/table/schema.rs +++ b/src/table/schema.rs @@ -20,7 +20,6 @@ impl PartitionKey for Hash { } } - pub trait SortKey { fn sort_key(&self) -> &[u8]; } @@ -37,7 +36,6 @@ impl SortKey for Hash { } } - pub trait Entry<P: PartitionKey, S: SortKey>: PartialEq + Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync { @@ -47,7 +45,6 @@ pub trait Entry<P: PartitionKey, S: SortKey>: fn merge(&mut self, other: &Self); } - #[async_trait] pub trait TableSchema: Send + Sync { type P: PartitionKey + Clone + PartialEq + Serialize + for<'de> Deserialize<'de> + Send + Sync; @@ -66,4 +63,3 @@ pub trait TableSchema: Send + Sync { true } } - |