Deuxfleurs/garage
42
39
Fork 55
Code Issues 72 Pull requests 7 Releases 29 Wiki Activity

Use Cow<[u8]> for sort keys

Browse source
This commit is contained in:
Alex 2023-04-27 16:14:44 +02:00
parent ea3bfd2ab1
commit 6005491cd8
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/table/data.rs
View file

@ -347,9 +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> {
let mut ret = p.hash().to_vec(); [p.hash().as_slice(), s.sort_key().as_ref()].concat()
ret.extend(s.sort_key());
ret
} }
pub fn decode_entry(&self, bytes: &[u8]) -> Result<F::E, Error> { pub fn decode_entry(&self, bytes: &[u8]) -> Result<F::E, Error> {

12
src/table/schema.rs
View file

@ -1,3 +1,5 @@
use std::borrow::Cow;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use garage_db as db; use garage_db as db;
@ -32,18 +34,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) -> &[u8]; fn sort_key(&self) -> Cow<'_, [u8]>;
} }
impl SortKey for String { impl SortKey for String {
fn sort_key(&self) -> &[u8] { fn sort_key(&self) -> Cow<'_, [u8]> {
self.as_bytes() Cow::from(self.as_bytes())
} }
} }
impl SortKey for FixedBytes32 { impl SortKey for FixedBytes32 {
fn sort_key(&self) -> &[u8] { fn sort_key(&self) -> Cow<'_, [u8]> {
self.as_slice() Cow::from(self.as_slice())
} }
} }

6
src/table/util.rs
View file

@ -1,3 +1,5 @@
use std::borrow::Cow;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use garage_util::data::*; use garage_util::data::*;
@ -7,8 +9,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) -> &[u8] { fn sort_key(&self) -> Cow<'_, [u8]> {
&[] Cow::from(&[][..])
} }
} }
impl PartitionKey for EmptyKey { impl PartitionKey for EmptyKey {