Skip to content
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.

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

chore: remove useless code #630

Merged
merged 2 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 0 additions & 15 deletions analytic_engine/src/instance/alter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,6 @@ use crate::{
table_options,
};

/// Policy of how to perform flush operation.
#[derive(Default, Debug, Clone, Copy)]
pub enum TableAlterSchemaPolicy {
/// Unknown flush policy, this is the default value.
#[default]
Unknown,
/// Perform Alter Schema operation.
Alter,
// TODO: use this policy and remove "allow(dead_code)"
/// Ignore this operation.
#[allow(dead_code)]
Noop,
}

impl Instance {
// Alter schema need to be handled by write worker.
pub async fn alter_schema_of_table(
Expand Down Expand Up @@ -88,7 +74,6 @@ impl Instance {
worker_local: &mut WorkerLocal,
table_data: &TableDataRef,
request: AlterSchemaRequest,
#[allow(unused_variables)] policy: TableAlterSchemaPolicy,
) -> Result<()> {
// Validate alter schema request.
self.validate_before_alter(table_data, &request)?;
Expand Down
12 changes: 0 additions & 12 deletions analytic_engine/src/instance/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ use crate::{
meta_data::cache::MetaCacheRef,
},
table::data::{TableDataRef, TableShardInfo},
wal_synchronizer::WalSynchronizer,
TableOptions,
};

Expand All @@ -55,11 +54,6 @@ pub enum Error {
StopScheduler {
source: crate::compaction::scheduler::Error,
},

#[snafu(display("Failed to stop WAL Synchronizer, err:{}", source))]
StopWalSynchronizer {
source: crate::wal_synchronizer::Error,
},
}

define_result!(Error);
Expand Down Expand Up @@ -166,7 +160,6 @@ pub struct Instance {
// End of write group options.
compaction_scheduler: CompactionSchedulerRef,
file_purger: FilePurger,
wal_synchronizer: WalSynchronizer,

meta_cache: Option<MetaCacheRef>,
/// Engine memtable memory usage collector
Expand All @@ -187,11 +180,6 @@ impl Instance {
pub async fn close(&self) -> Result<()> {
self.file_purger.stop().await.context(StopFilePurger)?;

self.wal_synchronizer
.stop()
.await
.context(StopWalSynchronizer)?;

self.space_store.close().await?;

self.compaction_scheduler
Expand Down
6 changes: 0 additions & 6 deletions analytic_engine/src/instance/open.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ use crate::{
file::FilePurger,
},
table::data::{TableData, TableDataRef},
wal_synchronizer::{WalSynchronizer, WalSynchronizerConfig},
};

impl Instance {
Expand Down Expand Up @@ -74,10 +73,6 @@ impl Instance {

let file_purger = FilePurger::start(&bg_runtime, store_picker.default_store().clone());

let mut wal_synchronizer =
WalSynchronizer::new(WalSynchronizerConfig::default(), wal_manager);
wal_synchronizer.start(&bg_runtime).await;

let iter_options = IterOptions {
batch_size: ctx.config.scan_batch_size,
sst_background_read_parallelism: ctx.config.sst_background_read_parallelism,
Expand All @@ -92,7 +87,6 @@ impl Instance {
write_group_command_channel_cap: ctx.config.write_group_command_channel_cap,
compaction_scheduler,
file_purger,
wal_synchronizer,
meta_cache: ctx.meta_cache.clone(),
mem_usage_collector: Arc::new(MemUsageCollector::default()),
db_write_buffer_size: ctx.config.db_write_buffer_size,
Expand Down
15 changes: 0 additions & 15 deletions analytic_engine/src/instance/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,6 @@ impl EncodeContext {
}
}

/// Policy of how to perform flush operation.
#[derive(Default, Debug, Clone, Copy)]
pub enum TableWritePolicy {
/// Unknown policy, this is the default value.
#[default]
Unknown,
/// A full write operation. Write to both memtable and WAL.
Full,
// TODO: use this policy and remove "allow(dead_code)"
/// Only write to memtable.
#[allow(dead_code)]
MemOnly,
}

impl Instance {
/// Write data to the table under give space.
pub async fn write_to_table(
Expand Down Expand Up @@ -215,7 +201,6 @@ impl Instance {
space: &SpaceRef,
table_data: &TableDataRef,
request: WriteRequest,
#[allow(unused_variables)] policy: TableWritePolicy,
) -> Result<usize> {
let mut encode_ctx = EncodeContext::new(request.row_group);

Expand Down
16 changes: 2 additions & 14 deletions analytic_engine/src/instance/write_worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use table_engine::{
};
use tokio::sync::{mpsc, oneshot, watch, watch::Ref, Mutex, Notify};

use super::alter::TableAlterSchemaPolicy;
use crate::{
compaction::{TableCompactionRequest, WaitResult},
instance::{
Expand Down Expand Up @@ -805,13 +804,7 @@ impl WriteWorker {

let write_res = self
.instance
.process_write_table_command(
&mut self.local,
&space,
&table_data,
request,
write::TableWritePolicy::Unknown,
)
.process_write_table_command(&mut self.local, &space, &table_data, request)
.await;
if let Err(res) = tx.send(write_res) {
error!(
Expand Down Expand Up @@ -900,12 +893,7 @@ impl WriteWorker {

let alter_res = self
.instance
.process_alter_schema_command(
&mut self.local,
&table_data,
request,
TableAlterSchemaPolicy::Unknown,
)
.process_alter_schema_command(&mut self.local, &table_data, request)
.await
.map_err(|e| Box::new(e) as GenericError)
.context(Channel);
Expand Down
2 changes: 0 additions & 2 deletions analytic_engine/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ mod instance;
mod manifest;
pub mod memtable;
mod payload;
mod role_table;
pub mod row_iter;
mod sampler;
pub mod setup;
Expand All @@ -18,7 +17,6 @@ pub mod sst;
mod storage_options;
pub mod table;
pub mod table_options;
mod wal_synchronizer;

#[cfg(any(test, feature = "test"))]
pub mod tests;
Expand Down
183 changes: 0 additions & 183 deletions analytic_engine/src/role_table/leader.rs

This file was deleted.

Loading