Skip to content

fix: handle the exclude boundary logic of the memory table #140

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

Merged
merged 2 commits into from
May 5, 2025
Merged

fix: handle the exclude boundary logic of the memory table #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d06df54
fix: handle the exclude boundary logic of the memory table
Ligh0x74 May 4, 2025
3174100
add comments
skyzh May 5, 2025
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
11 changes: 3 additions & 8 deletions mini-lsm-mvcc/src/lsm_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,15 +805,10 @@ impl LsmStorageInner {
}; // drop global lock here

let mut memtable_iters = Vec::with_capacity(snapshot.imm_memtables.len() + 1);
memtable_iters.push(Box::new(snapshot.memtable.scan(
map_key_bound_plus_ts(lower, key::TS_RANGE_BEGIN),
map_key_bound_plus_ts(upper, key::TS_RANGE_END),
)));
let (begin, end) = map_key_bound_plus_ts(lower, upper, read_ts);
memtable_iters.push(Box::new(snapshot.memtable.scan(begin, end)));
for memtable in snapshot.imm_memtables.iter() {
memtable_iters.push(Box::new(memtable.scan(
map_key_bound_plus_ts(lower, key::TS_RANGE_BEGIN),
map_key_bound_plus_ts(upper, key::TS_RANGE_END),
)));
memtable_iters.push(Box::new(memtable.scan(begin, end)));
}
let memtable_iter = MergeIterator::create(memtable_iters);

Expand Down
33 changes: 21 additions & 12 deletions mini-lsm-mvcc/src/mem_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crossbeam_skiplist::map::Entry;
use ouroboros::self_referencing;

use crate::iterators::StorageIterator;
use crate::key::{KeyBytes, KeySlice, TS_DEFAULT};
use crate::key::{KeyBytes, KeySlice, TS_DEFAULT, TS_RANGE_BEGIN, TS_RANGE_END};
use crate::table::SsTableBuilder;
use crate::wal::Wal;

Expand Down Expand Up @@ -63,13 +63,24 @@ pub(crate) fn map_key_bound(bound: Bound<KeySlice>) -> Bound<KeyBytes> {
}
}

/// Create a bound of `Bytes` from a bound of `KeySlice`.
pub(crate) fn map_key_bound_plus_ts(bound: Bound<&[u8]>, ts: u64) -> Bound<KeySlice> {
match bound {
Bound::Included(x) => Bound::Included(KeySlice::from_slice(x, ts)),
Bound::Excluded(x) => Bound::Excluded(KeySlice::from_slice(x, ts)),
Bound::Unbounded => Bound::Unbounded,
}
/// Create a bound of `KeySlice` from a bound of `&[u8]`.
pub(crate) fn map_key_bound_plus_ts<'a>(
lower: Bound<&'a [u8]>,
upper: Bound<&'a [u8]>,
ts: u64,
) -> (Bound<KeySlice<'a>>, Bound<KeySlice<'a>>) {
(
match lower {
Bound::Included(x) => Bound::Included(KeySlice::from_slice(x, ts)),
Bound::Excluded(x) => Bound::Excluded(KeySlice::from_slice(x, TS_RANGE_END)),
Bound::Unbounded => Bound::Unbounded,
},
match upper {
Bound::Included(x) => Bound::Included(KeySlice::from_slice(x, TS_RANGE_END)),
Bound::Excluded(x) => Bound::Excluded(KeySlice::from_slice(x, TS_RANGE_BEGIN)),
Bound::Unbounded => Bound::Unbounded,
},
)
}

impl MemTable {
Expand Down Expand Up @@ -126,10 +137,8 @@ impl MemTable {
lower: Bound<&[u8]>,
upper: Bound<&[u8]>,
) -> MemTableIterator {
self.scan(
map_key_bound_plus_ts(lower, TS_DEFAULT),
map_key_bound_plus_ts(upper, TS_DEFAULT),
)
let (begin, end) = map_key_bound_plus_ts(lower, upper, TS_DEFAULT);
self.scan(begin, end)
}

/// Put a key-value pair into the mem-table.
Expand Down
54 changes: 54 additions & 0 deletions mini-lsm-mvcc/src/tests/week3_day3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("b"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot1
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"b"))
.unwrap(),
vec![],
);
assert_eq!(snapshot2.get(b"a").unwrap(), Some(Bytes::from_static(b"2")));
assert_eq!(snapshot2.get(b"b").unwrap(), Some(Bytes::from_static(b"1")));
assert_eq!(snapshot2.get(b"c").unwrap(), None);
Expand All @@ -59,6 +65,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("b"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot2
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"b"))
.unwrap(),
vec![],
);
assert_eq!(snapshot3.get(b"a").unwrap(), Some(Bytes::from_static(b"2")));
assert_eq!(snapshot3.get(b"b").unwrap(), None);
assert_eq!(snapshot3.get(b"c").unwrap(), Some(Bytes::from_static(b"1")));
Expand All @@ -69,6 +81,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("c"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot3
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"c"))
.unwrap(),
vec![],
);
storage
.inner
.force_freeze_memtable(&storage.inner.state_lock.lock())
Expand All @@ -91,6 +109,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("b"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot1
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"b"))
.unwrap(),
vec![],
);
assert_eq!(snapshot2.get(b"a").unwrap(), Some(Bytes::from_static(b"2")));
assert_eq!(snapshot2.get(b"b").unwrap(), Some(Bytes::from_static(b"1")));
assert_eq!(snapshot2.get(b"c").unwrap(), None);
Expand All @@ -101,6 +125,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("b"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot2
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"b"))
.unwrap(),
vec![],
);
assert_eq!(snapshot3.get(b"a").unwrap(), Some(Bytes::from_static(b"2")));
assert_eq!(snapshot3.get(b"b").unwrap(), None);
assert_eq!(snapshot3.get(b"c").unwrap(), Some(Bytes::from_static(b"1")));
Expand All @@ -111,6 +141,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("c"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot3
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"c"))
.unwrap(),
vec![],
);
assert_eq!(snapshot4.get(b"a").unwrap(), Some(Bytes::from_static(b"3")));
assert_eq!(snapshot4.get(b"b").unwrap(), Some(Bytes::from_static(b"3")));
assert_eq!(snapshot4.get(b"c").unwrap(), Some(Bytes::from_static(b"1")));
Expand All @@ -122,6 +158,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("c"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot4
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"c"))
.unwrap(),
vec![(Bytes::from("b"), Bytes::from("3"))],
);
assert_eq!(snapshot5.get(b"a").unwrap(), Some(Bytes::from_static(b"4")));
assert_eq!(snapshot5.get(b"b").unwrap(), Some(Bytes::from_static(b"3")));
assert_eq!(snapshot5.get(b"c").unwrap(), Some(Bytes::from_static(b"1")));
Expand All @@ -133,6 +175,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("c"), Bytes::from("1")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot5
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"c"))
.unwrap(),
vec![(Bytes::from("b"), Bytes::from("3"))],
);
assert_eq!(snapshot6.get(b"a").unwrap(), Some(Bytes::from_static(b"4")));
assert_eq!(snapshot6.get(b"b").unwrap(), None);
assert_eq!(snapshot6.get(b"c").unwrap(), Some(Bytes::from_static(b"5")));
Expand All @@ -143,6 +191,12 @@ fn test_task2_memtable_mvcc() {
(Bytes::from("c"), Bytes::from("5")),
],
);
check_lsm_iter_result_by_key(
&mut snapshot6
.scan(Bound::Excluded(b"a"), Bound::Excluded(b"c"))
.unwrap(),
vec![],
);
}

#[test]
Expand Down