Deuxfleurs/garage
41
56
Fork 73
Code Issues 98 Pull requests 14 Releases 30 Wiki Activity

undo sort_key() returning Cow

Browse source
This commit is contained in:
Alex 2023-05-09 12:38:55 +02:00
parent 412ab77b08
commit 53bf2f070c
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/table/data.rs
View file

@ -347,7 +347,7 @@ impl<F: TableSchema, R: TableReplication> TableData<F, R> {
// ---- Utility functions ---- // ---- Utility functions ----
pub fn tree_key(&self, p: &F::P, s: &F::S) -> Vec<u8> { pub fn tree_key(&self, p: &F::P, s: &F::S) -> Vec<u8> {
[p.hash().as_slice(), s.sort_key().as_ref()].concat() [p.hash().as_slice(), s.sort_key()].concat()
} }
pub fn decode_entry(&self, bytes: &[u8]) -> Result<F::E, Error> { pub fn decode_entry(&self, bytes: &[u8]) -> Result<F::E, Error> {

18
src/table/schema.rs
View file

@ -1,5 +1,3 @@
use std::borrow::Cow;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use garage_db as db; use garage_db as db;
@ -38,24 +36,18 @@ impl PartitionKey for FixedBytes32 {
/// Trait for field used to sort data /// Trait for field used to sort data
pub trait SortKey: Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static { pub trait SortKey: Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static {
/// Get the key used to sort /// Get the key used to sort
fn sort_key(&self) -> Cow<'_, [u8]>; fn sort_key(&self) -> &[u8];
} }
impl SortKey for String { impl SortKey for String {
fn sort_key(&self) -> Cow<'_, [u8]> { fn sort_key(&self) -> &[u8] {
Cow::from(self.as_bytes()) self.as_bytes()
} }
} }
impl SortKey for FixedBytes32 { impl SortKey for FixedBytes32 {
fn sort_key(&self) -> Cow<'_, [u8]> { fn sort_key(&self) -> &[u8] {
Cow::from(self.as_slice()) self.as_slice()
}
}
impl SortKey for u32 {
fn sort_key(&self) -> Cow<'_, [u8]> {
Cow::from(u32::to_be_bytes(*self).to_vec())
} }
} }

6
src/table/util.rs
View file

@ -1,5 +1,3 @@
use std::borrow::Cow;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use garage_util::data::*; use garage_util::data::*;
@ -9,8 +7,8 @@ use crate::schema::*;
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct EmptyKey; pub struct EmptyKey;
impl SortKey for EmptyKey { impl SortKey for EmptyKey {
fn sort_key(&self) -> Cow<'_, [u8]> { fn sort_key(&self) -> &[u8] {
Cow::from(&[][..]) &[]
} }
} }
impl PartitionKey for EmptyKey { impl PartitionKey for EmptyKey {