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

add key abstraction and prepare for MVCC (#28)

Browse Source 
* add key abstraction and prepare for MVCC

Signed-off-by: Alex Chi <iskyzh@gmail.com>

* a little bit type exercise

Signed-off-by: Alex Chi <iskyzh@gmail.com>

* refactor tests

Signed-off-by: Alex Chi <iskyzh@gmail.com>

* fix clippy warnings

Signed-off-by: Alex Chi <iskyzh@gmail.com>

* refactor starter code

Signed-off-by: Alex Chi <iskyzh@gmail.com>

* final touch docs

Signed-off-by: Alex Chi <iskyzh@gmail.com>

---------

Signed-off-by: Alex Chi <iskyzh@gmail.com>
This commit is contained in:
Alex Chi Z
2024-01-25 10:59:08 +08:00
committed by GitHub
parent 2fefe3e505
commit a3a92359e1
42 changed files with 824 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mini-lsm/src/tests/week1_day4.rs
View File

@@ -4,12 +4,13 @@ use bytes::Bytes;
use tempfile::{tempdir, TempDir};
use crate::iterators::StorageIterator;
use crate::key::{KeySlice, KeyVec};
use crate::table::{SsTable, SsTableBuilder, SsTableIterator};
#[test]
fn test_sst_build_single_key() {
let mut builder = SsTableBuilder::new(16);
builder.add(b"233", b"233333");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"233"), b"233333");
let dir = tempdir().unwrap();
builder.build_for_test(dir.path().join("1.sst")).unwrap();
}
@@ -17,19 +18,19 @@ fn test_sst_build_single_key() {
#[test]
fn test_sst_build_two_blocks() {
let mut builder = SsTableBuilder::new(16);
builder.add(b"11", b"11");
builder.add(b"22", b"22");
builder.add(b"33", b"11");
builder.add(b"44", b"22");
builder.add(b"55", b"11");
builder.add(b"66", b"22");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"11"), b"11");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"22"), b"22");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"33"), b"11");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"44"), b"22");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"55"), b"11");
builder.add(KeySlice::for_testing_from_slice_no_ts(b"66"), b"22");
assert!(builder.meta.len() >= 2);
let dir = tempdir().unwrap();
builder.build_for_test(dir.path().join("1.sst")).unwrap();
}
fn key_of(idx: usize) -> Vec<u8> {
format!("key_{:03}", idx * 5).into_bytes()
fn key_of(idx: usize) -> KeyVec {
KeyVec::for_testing_from_vec_no_ts(format!("key_{:03}", idx * 5).into_bytes())
}
fn value_of(idx: usize) -> Vec<u8> {
@@ -45,7 +46,7 @@ fn generate_sst() -> (TempDir, SsTable) {
for idx in 0..num_of_keys() {
let key = key_of(idx);
let value = value_of(idx);
builder.add(&key[..], &value[..]);
builder.add(key.as_key_slice(), &value[..]);
}
let dir = tempdir().unwrap();
let path = dir.path().join("1.sst");
@@ -63,8 +64,14 @@ fn test_sst_decode() {
let meta = sst.block_meta.clone();
let new_sst = SsTable::open_for_test(sst.file).unwrap();
assert_eq!(new_sst.block_meta, meta);
assert_eq!(new_sst.first_key(), &key_of(0));
assert_eq!(new_sst.last_key(), &key_of(num_of_keys() - 1));
assert_eq!(
new_sst.first_key().for_testing_key_ref(),
key_of(0).for_testing_key_ref()
);
assert_eq!(
new_sst.last_key().for_testing_key_ref(),
key_of(num_of_keys() - 1).for_testing_key_ref()
);
}
fn as_bytes(x: &[u8]) -> Bytes {
@@ -81,11 +88,11 @@ fn test_sst_iterator() {
let key = iter.key();
let value = iter.value();
assert_eq!(
key,
key_of(i),
key.for_testing_key_ref(),
key_of(i).for_testing_key_ref(),
"expected key: {:?}, actual key: {:?}",
as_bytes(&key_of(i)),
as_bytes(key)
as_bytes(key_of(i).for_testing_key_ref()),
as_bytes(key.for_testing_key_ref())
);
assert_eq!(
value,
@@ -104,17 +111,17 @@ fn test_sst_iterator() {
fn test_sst_seek_key() {
let (_dir, sst) = generate_sst();
let sst = Arc::new(sst);
let mut iter = SsTableIterator::create_and_seek_to_key(sst, &key_of(0)).unwrap();
let mut iter = SsTableIterator::create_and_seek_to_key(sst, key_of(0).as_key_slice()).unwrap();
for offset in 1..=5 {
for i in 0..num_of_keys() {
let key = iter.key();
let value = iter.value();
assert_eq!(
key,
key_of(i),
key.for_testing_key_ref(),
key_of(i).for_testing_key_ref(),
"expected key: {:?}, actual key: {:?}",
as_bytes(&key_of(i)),
as_bytes(key)
as_bytes(key_of(i).for_testing_key_ref()),
as_bytes(key.for_testing_key_ref())
);
assert_eq!(
value,
@@ -123,9 +130,12 @@ fn test_sst_seek_key() {
as_bytes(&value_of(i)),
as_bytes(value)
);
iter.seek_to_key(&format!("key_{:03}", i * 5 + offset).into_bytes())
.unwrap();
iter.seek_to_key(KeySlice::for_testing_from_slice_no_ts(
&format!("key_{:03}", i * 5 + offset).into_bytes(),
))
.unwrap();
}
iter.seek_to_key(b"k").unwrap();
iter.seek_to_key(KeySlice::for_testing_from_slice_no_ts(b"k"))
.unwrap();
}
}