From e31c08dbb02868feda2aaa9d2b1afc208a7becf5 Mon Sep 17 00:00:00 2001 From: Sayan Nandan Date: Sat, 27 Mar 2021 18:03:14 +0530 Subject: [PATCH] Fix outdated comments and ident naming Signed-off-by: Sayan Nandan --- examples/config-files/{sdb.toml => skyd.toml} | 0 server/src/cli.yml | 2 +- server/src/config/mod.rs | 8 ++++---- server/src/kvengine/mod.rs | 2 +- server/src/main.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename examples/config-files/{sdb.toml => skyd.toml} (100%) diff --git a/examples/config-files/sdb.toml b/examples/config-files/skyd.toml similarity index 100% rename from examples/config-files/sdb.toml rename to examples/config-files/skyd.toml diff --git a/server/src/cli.yml b/server/src/cli.yml index 589288af..3903f49d 100644 --- a/server/src/cli.yml +++ b/server/src/cli.yml @@ -8,7 +8,7 @@ args: required: false long: withconfig value_name: cfgfile - help: Sets a configuration file to start sdb + help: Sets a configuration file to start skyd takes_value: true - restore: short: r diff --git a/server/src/config/mod.rs b/server/src/config/mod.rs index 6544455d..040302ae 100644 --- a/server/src/config/mod.rs +++ b/server/src/config/mod.rs @@ -648,24 +648,24 @@ mod tests { #[test] fn test_config_file_ok() { - let file = get_toml_from_examples_dir("sdb.toml".to_owned()).unwrap(); + let file = get_toml_from_examples_dir("skyd.toml".to_owned()).unwrap(); let cfg = ParsedConfig::new_from_toml_str(file).unwrap(); assert_eq!(cfg, ParsedConfig::default()); } #[test] fn test_config_file_err() { - let file = get_toml_from_examples_dir("sdb.toml".to_owned()).unwrap(); + let file = get_toml_from_examples_dir("skyd.toml".to_owned()).unwrap(); let cfg = ParsedConfig::new_from_file(file); assert!(cfg.is_err()); } #[test] fn test_args() { - let cmdlineargs = vec!["sdb", "--withconfig", "../examples/config-files/sdb.toml"]; + let cmdlineargs = vec!["skyd", "--withconfig", "../examples/config-files/skyd.toml"]; let cfg_layout = load_yaml!("../cli.yml"); let matches = App::from_yaml(cfg_layout).get_matches_from(cmdlineargs); let filename = matches.value_of("config").unwrap(); - assert_eq!("../examples/config-files/sdb.toml", filename); + assert_eq!("../examples/config-files/skyd.toml", filename); let cfg = ParsedConfig::new_from_toml_str(std::fs::read_to_string(filename).unwrap()).unwrap(); assert_eq!(cfg, ParsedConfig::default()); diff --git a/server/src/kvengine/mod.rs b/server/src/kvengine/mod.rs index 8ff00490..c9fb3fe5 100644 --- a/server/src/kvengine/mod.rs +++ b/server/src/kvengine/mod.rs @@ -26,7 +26,7 @@ //! # The Key/Value Engine //! This is Skytable's K/V engine. It contains utilities to interface with -//! sdb's K/V store +//! Skytable's K/V store pub mod dbsize; pub mod del; diff --git a/server/src/main.rs b/server/src/main.rs index 42c6d2b9..353027cd 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -26,7 +26,7 @@ //! # Skytable //! -//! The `sdb` crate (or the `server` folder) is Skytable's database server and maybe +//! The `skyd` crate (or the `server` folder) is Skytable's database server and maybe //! is the most important part of the project. There are several modules within this crate; see //! the modules for their respective documentation.