aboutsummaryrefslogtreecommitdiff
path: root/src/model/k2v
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-01-26 21:10:21 +0000
committerAlex <alex@adnab.me>2023-01-26 21:10:21 +0000
commitf2c256cac4e599335d592dd580011cf15f278a51 (patch)
tree8a7e90cf4bcf40ef7513e9ffaa636a012ebcc4a9 /src/model/k2v
parenta08e01f17a9e4bb80880e28a4a28b2d88a9aec83 (diff)
parentd6af95d20520eec64e5e4c0c873c6e3a8ac1509d (diff)
downloadgarage-f2c256cac4e599335d592dd580011cf15f278a51.tar.gz
garage-f2c256cac4e599335d592dd580011cf15f278a51.zip
Merge pull request 'Many clippy lints fixed' (#488) from k2v-watch-range-2 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/488
Diffstat (limited to 'src/model/k2v')
-rw-r--r--src/model/k2v/item_table.rs3
-rw-r--r--src/model/k2v/rpc.rs6
-rw-r--r--src/model/k2v/seen.rs8
3 files changed, 9 insertions, 8 deletions
diff --git a/src/model/k2v/item_table.rs b/src/model/k2v/item_table.rs
index 28646f37..84c05db5 100644
--- a/src/model/k2v/item_table.rs
+++ b/src/model/k2v/item_table.rs
@@ -269,6 +269,7 @@ impl CountedItem for K2VItem {
&self.partition.partition_key
}
+ #[allow(clippy::bool_to_int_with_if)]
fn counts(&self) -> Vec<(&'static str, i64)> {
let values = self.values();
@@ -313,7 +314,7 @@ mod tests {
values: vec![(6, DvvsValue::Value(vec![16])), (7, DvvsValue::Deleted)],
};
- let mut e3 = e1.clone();
+ let mut e3 = e1;
e3.merge(&e2);
assert_eq!(e2, e3);
}
diff --git a/src/model/k2v/rpc.rs b/src/model/k2v/rpc.rs
index 117103b6..37e142f6 100644
--- a/src/model/k2v/rpc.rs
+++ b/src/model/k2v/rpc.rs
@@ -37,7 +37,7 @@ use crate::k2v::sub::*;
const POLL_RANGE_EXTRA_DELAY: Duration = Duration::from_millis(200);
-const TIMESTAMP_KEY: &'static [u8] = b"timestamp";
+const TIMESTAMP_KEY: &[u8] = b"timestamp";
/// RPC messages for K2V
#[derive(Debug, Serialize, Deserialize)]
@@ -418,7 +418,7 @@ impl K2VRpcHandler {
.data
.update_entry_with(&item.partition, &item.sort_key, |tx, ent| {
let old_local_timestamp = tx
- .get(&local_timestamp_tree, TIMESTAMP_KEY)?
+ .get(local_timestamp_tree, TIMESTAMP_KEY)?
.and_then(|x| x.try_into().ok())
.map(u64::from_be_bytes)
.unwrap_or_default();
@@ -438,7 +438,7 @@ impl K2VRpcHandler {
);
tx.insert(
- &local_timestamp_tree,
+ local_timestamp_tree,
TIMESTAMP_KEY,
u64::to_be_bytes(new_local_timestamp),
)?;
diff --git a/src/model/k2v/seen.rs b/src/model/k2v/seen.rs
index 51098710..8fe3a582 100644
--- a/src/model/k2v/seen.rs
+++ b/src/model/k2v/seen.rs
@@ -63,7 +63,7 @@ impl RangeSeenMarker {
None => {
self.items.insert(item.sort_key.clone(), cc.vector_clock);
}
- Some(ent) => *ent = vclock_max(&ent, &cc.vector_clock),
+ Some(ent) => *ent = vclock_max(ent, &cc.vector_clock),
}
}
}
@@ -71,7 +71,7 @@ impl RangeSeenMarker {
pub fn canonicalize(&mut self) {
let self_vc = &self.vector_clock;
- self.items.retain(|_sk, vc| vclock_gt(&vc, self_vc))
+ self.items.retain(|_sk, vc| vclock_gt(vc, self_vc))
}
pub fn encode(&mut self) -> Result<String, Error> {
@@ -84,7 +84,7 @@ impl RangeSeenMarker {
/// Decode from msgpack+zstd+b64 representation, returns None on error.
pub fn decode(s: &str) -> Option<Self> {
- let bytes = BASE64_STANDARD.decode(&s).ok()?;
+ let bytes = BASE64_STANDARD.decode(s).ok()?;
let bytes = zstd::stream::decode_all(&mut &bytes[..]).ok()?;
nonversioned_decode(&bytes).ok()
}
@@ -99,7 +99,7 @@ impl RangeSeenMarker {
&& self
.items
.get(&item.sort_key)
- .map(|vc| vclock_gt(&cc.vector_clock, &vc))
+ .map(|vc| vclock_gt(&cc.vector_clock, vc))
.unwrap_or(true)
}
}