Skip to content

Use new crossbeam skiplist version to skip heap allocation in point read #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use new crossbeam skiplist version to skip heap allocation in point read #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ bytes = ["value-log/bytes"]

[dependencies]
byteorder = "1.5.0"
crossbeam-skiplist = "0.1.3"
crossbeam-skiplist = { git = "https://github.com/crossbeam-rs/crossbeam", rev = "45425b032b75d40c8f79be2133eb7d33aaa1d4e4", package = "crossbeam-skiplist" }
double-ended-peekable = "0.1.0"
enum_dispatch = "0.3.13"
guardian = "1.1.0"
Expand Down
100 changes: 49 additions & 51 deletions src/key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use crate::{
SeqNo, UserKey, ValueType,
};
use byteorder::{ReadBytesExt, WriteBytesExt};
use crossbeam_skiplist::equivalent::{Comparable, Equivalent};
use std::{
cmp::Reverse,
io::{Read, Write},
Expand Down Expand Up @@ -105,54 +106,51 @@ impl Ord for InternalKey {
}
}

// TODO: wait for new crossbeam-skiplist
// TODO: https://github.com/crossbeam-rs/crossbeam/pull/1162
//
// impl Equivalent<InternalKeyRef<'_>> for InternalKey {
// fn equivalent(&self, other: &InternalKeyRef<'_>) -> bool {
// self.user_key == other.user_key && self.seqno == other.seqno
// }
// }

// impl Comparable<InternalKeyRef<'_>> for InternalKey {
// fn compare(&self, other: &InternalKeyRef<'_>) -> std::cmp::Ordering {
// (&*self.user_key, Reverse(self.seqno)).cmp(&(other.user_key, Reverse(other.seqno)))
// }
// }

// Temporary internal key without heap allocation
// #[derive(Debug, Eq)]
// pub struct InternalKeyRef<'a> {
// pub user_key: &'a [u8],
// pub seqno: SeqNo,
// pub value_type: ValueType,
// }

// impl<'a> InternalKeyRef<'a> {
// // Constructor for InternalKeyRef
// pub fn new(user_key: &'a [u8], seqno: u64, value_type: ValueType) -> Self {
// InternalKeyRef {
// user_key,
// seqno,
// value_type,
// }
// }
// }

// impl<'a> PartialEq for InternalKeyRef<'a> {
// fn eq(&self, other: &Self) -> bool {
// self.user_key == other.user_key && self.seqno == other.seqno
// }
// }

// impl<'a> PartialOrd for InternalKeyRef<'a> {
// fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
// Some(self.cmp(other))
// }
// }

// impl<'a> Ord for InternalKeyRef<'a> {
// fn cmp(&self, other: &Self) -> std::cmp::Ordering {
// (&self.user_key, Reverse(self.seqno)).cmp(&(&other.user_key, Reverse(other.seqno)))
// }
// }
impl Equivalent<InternalKeyRef<'_>> for InternalKey {
fn equivalent(&self, other: &InternalKeyRef<'_>) -> bool {
self.user_key == other.user_key && self.seqno == other.seqno
}
}

impl Comparable<InternalKeyRef<'_>> for InternalKey {
fn compare(&self, other: &InternalKeyRef<'_>) -> std::cmp::Ordering {
(&*self.user_key, Reverse(self.seqno)).cmp(&(other.user_key, Reverse(other.seqno)))
}
}

/// Temporary internal key without heap allocation
#[derive(Debug, Eq)]
pub struct InternalKeyRef<'a> {
pub user_key: &'a [u8],
pub seqno: SeqNo,
pub value_type: ValueType,
}

impl<'a> InternalKeyRef<'a> {
// Constructor for InternalKeyRef
pub fn new(user_key: &'a [u8], seqno: u64, value_type: ValueType) -> Self {
InternalKeyRef {
user_key,
seqno,
value_type,
}
}
}

impl<'a> PartialEq for InternalKeyRef<'a> {
fn eq(&self, other: &Self) -> bool {
self.user_key == other.user_key && self.seqno == other.seqno
}
}

impl<'a> PartialOrd for InternalKeyRef<'a> {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}

impl<'a> Ord for InternalKeyRef<'a> {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
(&self.user_key, Reverse(self.seqno)).cmp(&(&other.user_key, Reverse(other.seqno)))
}
}
4 changes: 2 additions & 2 deletions src/memtable/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This source code is licensed under both the Apache 2.0 and MIT License
// (found in the LICENSE-* files in the repository)

use crate::key::InternalKey;
use crate::key::{InternalKey, InternalKeyRef};
use crate::segment::block::ItemSize;
use crate::value::{InternalValue, SeqNo, UserValue, ValueType};
use crossbeam_skiplist::SkipMap;
Expand Down Expand Up @@ -84,7 +84,7 @@ impl Memtable {
// abcdef -> 6
// abcdef -> 5
//
let lower_bound = InternalKey::new(
let lower_bound = InternalKeyRef::new(
key,
match seqno {
Some(seqno) => seqno - 1,
Expand Down
Loading