Skip to content

Commit cc50ccc

Browse files
committed
fix: clippy
1 parent ee09f02 commit cc50ccc

File tree

35 files changed

+190
-2690
lines changed

35 files changed

+190
-2690
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/catalog/src/system.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ pub struct TableEntryValue {
367367

368368
#[cfg(test)]
369369
mod tests {
370-
use log_store::fs::noop::NoopLogStore;
370+
use log_store::NoopLogStore;
371371
use mito::config::EngineConfig;
372372
use mito::engine::MitoEngine;
373373
use object_store::ObjectStore;

src/datanode/src/instance.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use catalog::remote::MetaKvBackend;
2121
use catalog::CatalogManagerRef;
2222
use common_grpc::channel_manager::{ChannelConfig, ChannelManager};
2323
use common_telemetry::logging::info;
24-
use log_store::fs::config::LogConfig;
25-
use log_store::fs::log::LocalFileLogStore;
24+
use log_store::raft_engine::log_store::RaftEngineLogstore;
25+
use log_store::LogConfig;
2626
use meta_client::client::{MetaClient, MetaClientBuilder};
2727
use meta_client::MetaClientOpts;
2828
use mito::config::EngineConfig as TableEngineConfig;
@@ -53,7 +53,7 @@ mod grpc;
5353
mod script;
5454
mod sql;
5555

56-
pub(crate) type DefaultEngine = MitoEngine<EngineImpl<LocalFileLogStore>>;
56+
pub(crate) type DefaultEngine = MitoEngine<EngineImpl<RaftEngineLogstore>>;
5757

5858
// An abstraction to read/write services.
5959
pub struct Instance {
@@ -63,7 +63,7 @@ pub struct Instance {
6363
pub(crate) script_executor: ScriptExecutor,
6464
pub(crate) table_id_provider: Option<TableIdProviderRef>,
6565
pub(crate) heartbeat_task: Option<HeartbeatTask>,
66-
pub(crate) logstore: Arc<LocalFileLogStore>,
66+
pub(crate) logstore: Arc<RaftEngineLogstore>,
6767
}
6868

6969
pub type InstanceRef = Arc<Instance>;
@@ -278,7 +278,7 @@ async fn new_metasrv_client(node_id: u64, meta_config: &MetaClientOpts) -> Resul
278278

279279
pub(crate) async fn create_local_file_log_store(
280280
path: impl AsRef<str>,
281-
) -> Result<LocalFileLogStore> {
281+
) -> Result<RaftEngineLogstore> {
282282
let path = path.as_ref();
283283
// create WAL directory
284284
fs::create_dir_all(path::Path::new(path)).context(error::CreateDirSnafu { dir: path })?;
@@ -290,9 +290,6 @@ pub(crate) async fn create_local_file_log_store(
290290
..Default::default()
291291
};
292292

293-
let log_store = LocalFileLogStore::open(&log_config)
294-
.await
295-
.context(error::OpenLogStoreSnafu)?;
296-
297-
Ok(log_store)
293+
let logstore = RaftEngineLogstore::new(log_config);
294+
Ok(logstore)
298295
}

src/datanode/src/sql.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ mod tests {
125125
use datatypes::prelude::ConcreteDataType;
126126
use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef};
127127
use datatypes::value::Value;
128-
use log_store::fs::noop::NoopLogStore;
128+
use log_store::NoopLogStore;
129129
use mito::config::EngineConfig as TableEngineConfig;
130130
use mito::engine::MitoEngine;
131131
use object_store::services::fs::Builder;

src/log-store/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use protobuf_build::Builder;
1717
fn main() {
1818
let base = std::env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".to_string());
1919
Builder::new()
20-
.search_dir_for_protos(&format!("{}/proto", base))
21-
.includes(&[format!("{}/include", base), format!("{}/proto", base)])
20+
.search_dir_for_protos(&format!("{base}/proto"))
21+
.includes(&[format!("{base}/include"), format!("{base}/proto")])
2222
.include_google_protos()
2323
.generate()
2424
}

src/log-store/src/fs.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/log-store/src/fs/chunk.rs

Lines changed: 0 additions & 233 deletions
This file was deleted.

src/log-store/src/fs/crc.rs

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)