fix: removing ctrl-c handle and verbose

Author: peeeuzin

Cargo.lock

@@ -21,6 +21,5 @@ hex = "0.4.3"
 lz4 = "1.24.0"
 farmhash = "1.1.5"
 bitvec = "1.0.1"
-ctrlc = {version = "3.2.3", features = ["termination"]}
 serde = {version = "1.0.148", features = ["derive"]}
 chrono = "0.4.23"

Cargo.toml

@@ -11,7 +11,6 @@ use storage::lsm;
 #[derive(Clone)]
 pub struct LsmConfig {
     pub flush_threshold: Size,
-    pub detect_exit_signals: bool,
 }
 
 /// A DustData configuration
@@ -22,7 +21,6 @@ pub struct LsmConfig {
 #[derive(Clone)]
 pub struct DustDataConfig {
     pub path: String,
-    pub verbose: bool,
     pub lsm_config: LsmConfig,
 }
 
@@ -150,16 +148,11 @@ impl DustData {
     pub fn new(configuration: DustDataConfig) -> Self {
         let path = path::Path::new(&configuration.path);
 
-        let mut lsm = storage::lsm::Lsm::new(lsm::LsmConfig {
-            verbose: configuration.verbose,
+        let lsm = storage::lsm::Lsm::new(lsm::LsmConfig {
             flush_threshold: size_to_usize(configuration.clone().lsm_config.flush_threshold),
             sstable_path: path.to_str().unwrap().to_string(),
         });
 
-        if configuration.lsm_config.detect_exit_signals {
-            lsm.handle_ctrlc();
-        }
-
         Self {
             lsm,
             config: configuration,

src/dustdata.rs

@@ -1,7 +1,6 @@
 mod bloom;
 mod dustdata;
 mod storage;
-mod utils;
 
 pub use self::{
     dustdata::DustData, dustdata::DustDataConfig, dustdata::Error, dustdata::ErrorCode,
@@ -24,10 +23,8 @@ mod dustdata_tests {
 
     fn get_default_config() -> DustDataConfig {
         DustDataConfig {
-            verbose: true,
             path: "./test_data/dustdata".to_string(),
             lsm_config: LsmConfig {
-                detect_exit_signals: false,
                 flush_threshold: Size::Megabytes(128),
             },
         }

src/lib.rs

@@ -6,7 +6,6 @@ use std::sync::{Arc, Mutex};
 
 use crate::bloom::BloomFilter;
 use crate::dustdata::{Error, ErrorCode, Result};
-use crate::logs;
 
 use self::snapshots::Snapshot;
 
@@ -20,7 +19,6 @@ mod writer;
 pub struct LsmConfig {
     pub flush_threshold: usize,
     pub sstable_path: String,
-    pub verbose: bool,
 }
 
 #[derive(Clone)]
@@ -71,53 +69,6 @@ impl Lsm {
         }
     }
 
-    pub fn handle_ctrlc(&mut self) {
-        let c_mem = Arc::clone(&self.memtable);
-        let c_den = Arc::clone(&self.dense_index);
-        let c_config = self.lsm_config.clone();
-        let c_bloom = Arc::clone(&self.bloom_filter);
-
-        ctrlc::set_handler(move || {
-            if c_config.verbose {
-                logs!("Ctrl-C detected.");
-            }
-
-            let memtable = c_mem.lock().unwrap();
-            let mut dense_index = c_den.lock().unwrap();
-
-            if memtable.is_empty() {
-                if c_config.verbose {
-                    logs!("No data to flush.");
-                }
-
-                std::process::exit(0);
-            }
-
-            if c_config.verbose {
-                logs!("Flushing memtable to disk...");
-            }
-
-            let segments =
-                sstable::Segment::from_tree(memtable.deref(), c_config.sstable_path.as_str());
-
-            for token in segments.1 {
-                dense_index.insert(token.0, token.1);
-            }
-
-            let mut keys = Vec::new();
-
-            for segment in dense_index.deref() {
-                keys.push(segment.0.clone());
-            }
-
-            index::write_index(&c_config.sstable_path, dense_index.deref());
-            filter::write_filter(&c_config.sstable_path, c_bloom.lock().unwrap().deref());
-
-            std::process::exit(0);
-        })
-        .ok();
-    }
-
     pub fn insert(&mut self, key: &str, value: bson::Bson) -> Result<()> {
         if self.contains(key) {
             return Err(Error {
@@ -211,10 +162,6 @@ impl Lsm {
     pub fn flush(&mut self) -> Result<()> {
         let memtable = self.get_memtable();
 
-        if self.lsm_config.verbose {
-            logs!("Flushing memtable to disk...");
-        }
-
         if memtable.is_empty() {
             return Ok(());
         }
@@ -302,22 +249,10 @@ impl Drop for Lsm {
         let memtable = self.memtable.lock().unwrap();
         let mut dense_index = self.dense_index.lock().unwrap();
 
-        if self.lsm_config.verbose {
-            logs!("LSM is being dropped.");
-        }
-
         if memtable.is_empty() {
-            if self.lsm_config.verbose {
-                logs!("No memtable to flush to disk.");
-            }
-
             return;
         }
 
-        if self.lsm_config.verbose {
-            logs!("Flushing memtable to disk.");
-        }
-
         let segments =
             sstable::Segment::from_tree(memtable.deref(), self.lsm_config.sstable_path.as_str());