aboutsummaryrefslogtreecommitdiff
path: root/src/model/prev/v051
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2022-09-13 16:49:05 +0200
committerAlex <alex@adnab.me>2022-09-13 16:49:05 +0200
commit80fdbfb0aa1b7186db3aeef888c0954748a35c62 (patch)
tree20c275ab7019b9c1458e4c2daef56a1b93411f8a /src/model/prev/v051
parent11bdc971e2aaa1ef90358b7d9c1bd6a8e9743bbf (diff)
parentab722cb40f5aacf661a280b7eb025acd3aefc1bb (diff)
downloadgarage-80fdbfb0aa1b7186db3aeef888c0954748a35c62.tar.gz
garage-80fdbfb0aa1b7186db3aeef888c0954748a35c62.zip
Merge pull request 'various fixes for v0.8.0' (#380) from various-fixes-for-0.8 into mainv0.8.0-beta1
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/380
Diffstat (limited to 'src/model/prev/v051')
-rw-r--r--src/model/prev/v051/bucket_table.rs6
-rw-r--r--src/model/prev/v051/key_table.rs2
-rw-r--r--src/model/prev/v051/object_table.rs6
-rw-r--r--src/model/prev/v051/version_table.rs2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/model/prev/v051/bucket_table.rs b/src/model/prev/v051/bucket_table.rs
index 0c52b6ea..628a49dd 100644
--- a/src/model/prev/v051/bucket_table.rs
+++ b/src/model/prev/v051/bucket_table.rs
@@ -10,7 +10,7 @@ use super::key_table::PermissionSet;
/// Its parameters are not directly accessible as:
/// - It must be possible to merge paramaters, hence the use of a LWW CRDT.
/// - A bucket has 2 states, Present or Deleted and parameters make sense only if present.
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct Bucket {
/// Name of the bucket
pub name: String,
@@ -19,7 +19,7 @@ pub struct Bucket {
}
/// State of a bucket
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub enum BucketState {
/// The bucket is deleted
Deleted,
@@ -41,7 +41,7 @@ impl Crdt for BucketState {
}
/// Configuration for a bucket
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct BucketParams {
/// Map of key with access to the bucket, and what kind of access they give
pub authorized_keys: crdt::LwwMap<String, PermissionSet>,
diff --git a/src/model/prev/v051/key_table.rs b/src/model/prev/v051/key_table.rs
index fee24741..37516b1c 100644
--- a/src/model/prev/v051/key_table.rs
+++ b/src/model/prev/v051/key_table.rs
@@ -4,7 +4,7 @@ use garage_table::crdt::*;
use garage_table::*;
/// An api key
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct Key {
/// The id of the key (immutable), used as partition key
pub key_id: String,
diff --git a/src/model/prev/v051/object_table.rs b/src/model/prev/v051/object_table.rs
index cb59b309..e79e5787 100644
--- a/src/model/prev/v051/object_table.rs
+++ b/src/model/prev/v051/object_table.rs
@@ -6,7 +6,7 @@ use garage_util::data::*;
use garage_table::crdt::*;
/// An object
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct Object {
/// The bucket in which the object is stored, used as partition key
pub bucket: String,
@@ -26,7 +26,7 @@ impl Object {
}
/// Informations about a version of an object
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct ObjectVersion {
/// Id of the version
pub uuid: Uuid,
@@ -37,7 +37,7 @@ pub struct ObjectVersion {
}
/// State of an object version
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub enum ObjectVersionState {
/// The version is being received
Uploading(ObjectVersionHeaders),
diff --git a/src/model/prev/v051/version_table.rs b/src/model/prev/v051/version_table.rs
index 1e658f91..c11c62d5 100644
--- a/src/model/prev/v051/version_table.rs
+++ b/src/model/prev/v051/version_table.rs
@@ -6,7 +6,7 @@ use garage_table::crdt::*;
use garage_table::*;
/// A version of an object
-#[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
pub struct Version {
/// UUID of the version, used as partition key
pub uuid: Uuid,