maokaihe/mini_lsm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make mvcc impl compile with new key module

Browse Source 
Signed-off-by: Alex Chi <iskyzh@gmail.com>
This commit is contained in:
Alex Chi
2024-01-25 12:27:16 +08:00
committed by Alex Chi Z
parent 753e6d4f9e
commit 971d0b1c81
11 changed files with 96 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mini-lsm-mvcc/src/lsm_storage.rs
View File

@@ -103,19 +103,19 @@ fn range_overlap(
table_end: KeySlice,
) -> bool {
match user_end {
Bound::Excluded(key) if key <= table_begin.raw_ref() => {
Bound::Excluded(key) if key <= table_begin.key_ref() => {
return false;
}
Bound::Included(key) if key < table_begin.raw_ref() => {
Bound::Included(key) if key < table_begin.key_ref() => {
return false;
}
_ => {}
}
match user_begin {
Bound::Excluded(key) if key >= table_end.raw_ref() => {
Bound::Excluded(key) if key >= table_end.key_ref() => {
return false;
}
Bound::Included(key) if key > table_end.raw_ref() => {
Bound::Included(key) if key > table_end.key_ref() => {
return false;
}
_ => {}
@@ -124,7 +124,7 @@ fn range_overlap(
}
fn key_within(user_key: &[u8], table_begin: KeySlice, table_end: KeySlice) -> bool {
table_begin.raw_ref() <= user_key && user_key <= table_end.raw_ref()
table_begin.key_ref() <= user_key && user_key <= table_end.key_ref()
}
/// The storage interface of the LSM tree.
@@ -470,7 +470,7 @@ impl LsmStorageInner {
let iter = TwoMergeIterator::create(l0_iter, MergeIterator::create(level_iters))?;
if iter.is_valid() && iter.key().raw_ref() == key && !iter.value().is_empty() {
if iter.is_valid() && iter.key().key_ref() == key && !iter.value().is_empty() {
return Ok(Some(Bytes::copy_from_slice(iter.value())));
}
Ok(None)
@@ -678,7 +678,7 @@ impl LsmStorageInner {
table,
KeySlice::from_slice(key, key::TS_DEFAULT),
)?;
if iter.is_valid() && iter.key().raw_ref() == key {
if iter.is_valid() && iter.key().key_ref() == key {
iter.next()?;
}
iter
@@ -716,7 +716,7 @@ impl LsmStorageInner {
level_ssts,
KeySlice::from_slice(key, key::TS_DEFAULT),
)?;
if iter.is_valid() && iter.key().raw_ref() == key {
if iter.is_valid() && iter.key().key_ref() == key {
iter.next()?;
}
iter