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

feat: bump to Rust edition 2024 (#132)

Browse Source 
* feat: bump to Rust edition 2024

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

* allow deadcode

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

* fix deploy to pages

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

* fix fmt

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

* update actions

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

---------

Signed-off-by: Alex Chi <iskyzh@gmail.com>
This commit is contained in:
Alex Chi Z.
2025-03-09 16:11:52 -04:00
committed by GitHub
parent 662b1a855f
commit 1d9693c22f
38 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mini-lsm-starter/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "mini-lsm-starter"
version = "0.2.0"
edition = "2021"
edition = "2024"
publish = false
[dependencies]

12
mini-lsm-starter/src/iterators/two_merge_iterator.rs
View File

@@ -28,9 +28,9 @@ pub struct TwoMergeIterator<A: StorageIterator, B: StorageIterator> {
}
impl<
A: 'static + StorageIterator,
B: 'static + for<'a> StorageIterator<KeyType<'a> = A::KeyType<'a>>,
> TwoMergeIterator<A, B>
A: 'static + StorageIterator,
B: 'static + for<'a> StorageIterator<KeyType<'a> = A::KeyType<'a>>,
> TwoMergeIterator<A, B>
{
pub fn create(a: A, b: B) -> Result<Self> {
unimplemented!()
@@ -38,9 +38,9 @@ impl<
}
impl<
A: 'static + StorageIterator,
B: 'static + for<'a> StorageIterator<KeyType<'a> = A::KeyType<'a>>,
> StorageIterator for TwoMergeIterator<A, B>
A: 'static + StorageIterator,
B: 'static + for<'a> StorageIterator<KeyType<'a> = A::KeyType<'a>>,
> StorageIterator for TwoMergeIterator<A, B>
{
type KeyType<'a> = A::KeyType<'a>;

2
mini-lsm-starter/src/lsm_iterator.rs
View File

@@ -18,7 +18,7 @@
use anyhow::Result;
use crate::{
iterators::{merge_iterator::MergeIterator, StorageIterator},
iterators::{StorageIterator, merge_iterator::MergeIterator},
mem_table::MemTableIterator,
};

2
mini-lsm-starter/src/lsm_storage.rs
View File

@@ -18,8 +18,8 @@
use std::collections::HashMap;
use std::ops::Bound;
use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicUsize;
use std::sync::Arc;
use std::sync::atomic::AtomicUsize;
use anyhow::Result;
use bytes::Bytes;

2
mini-lsm-starter/src/mem_table.rs
View File

@@ -17,8 +17,8 @@
use std::ops::Bound;
use std::path::Path;
use std::sync::atomic::AtomicUsize;
use std::sync::Arc;
use std::sync::atomic::AtomicUsize;
use anyhow::Result;
use bytes::Bytes;

4
mini-lsm-starter/src/mvcc/txn.rs
View File

@@ -18,7 +18,7 @@
use std::{
collections::HashSet,
ops::Bound,
sync::{atomic::AtomicBool, Arc},
sync::{Arc, atomic::AtomicBool},
};
use anyhow::Result;
@@ -28,7 +28,7 @@ use ouroboros::self_referencing;
use parking_lot::Mutex;
use crate::{
iterators::{two_merge_iterator::TwoMergeIterator, StorageIterator},
iterators::{StorageIterator, two_merge_iterator::TwoMergeIterator},
lsm_iterator::{FusedIterator, LsmIterator},
lsm_storage::LsmStorageInner,
};