From 2d5d7a703152345f380139fe9314d9e4c29b61ae Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 10 Oct 2023 12:06:27 +0200 Subject: Move convert_db command into main garage binary --- src/db/Cargo.toml | 5 ---- src/db/bin/convert.rs | 69 -------------------------------------------- src/garage/cli/convert_db.rs | 65 +++++++++++++++++++++++++++++++++++++++++ src/garage/cli/mod.rs | 2 ++ src/garage/cli/structs.rs | 6 ++++ src/garage/main.rs | 3 ++ 6 files changed, 76 insertions(+), 74 deletions(-) delete mode 100644 src/db/bin/convert.rs create mode 100644 src/garage/cli/convert_db.rs diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml index 2f6f06be..fa1a4419 100644 --- a/src/db/Cargo.toml +++ b/src/db/Cargo.toml @@ -11,11 +11,6 @@ readme = "../../README.md" [lib] path = "lib.rs" -[[bin]] -name = "convert" -path = "bin/convert.rs" -required-features = ["cli"] - [dependencies] err-derive = "0.3" hexdump = "0.1" diff --git a/src/db/bin/convert.rs b/src/db/bin/convert.rs deleted file mode 100644 index bbde2048..00000000 --- a/src/db/bin/convert.rs +++ /dev/null @@ -1,69 +0,0 @@ -use std::path::PathBuf; - -use garage_db::*; - -use clap::Parser; - -/// K2V command line interface -#[derive(Parser, Debug)] -#[clap(author, version, about, long_about = None)] -struct Args { - /// Input DB path - #[clap(short = 'i')] - input_path: PathBuf, - /// Input DB engine - #[clap(short = 'a')] - input_engine: String, - - /// Output DB path - #[clap(short = 'o')] - output_path: PathBuf, - /// Output DB engine - #[clap(short = 'b')] - output_engine: String, -} - -fn main() { - let args = Args::parse(); - pretty_env_logger::init(); - - match do_conversion(args) { - Ok(()) => println!("Success!"), - Err(e) => eprintln!("Error: {}", e), - } -} - -fn do_conversion(args: Args) -> Result<()> { - let input = open_db(args.input_path, args.input_engine)?; - let output = open_db(args.output_path, args.output_engine)?; - output.import(&input)?; - Ok(()) -} - -fn open_db(path: PathBuf, engine: String) -> Result { - match engine.as_str() { - "sled" => { - let db = sled_adapter::sled::Config::default().path(&path).open()?; - Ok(sled_adapter::SledDb::init(db)) - } - "sqlite" | "sqlite3" | "rusqlite" => { - let db = sqlite_adapter::rusqlite::Connection::open(&path)?; - Ok(sqlite_adapter::SqliteDb::init(db)) - } - "lmdb" | "heed" => { - std::fs::create_dir_all(&path).map_err(|e| { - Error(format!("Unable to create LMDB data directory: {}", e).into()) - })?; - - let map_size = lmdb_adapter::recommended_map_size(); - - let db = lmdb_adapter::heed::EnvOpenOptions::new() - .max_dbs(100) - .map_size(map_size) - .open(&path) - .unwrap(); - Ok(lmdb_adapter::LmdbDb::init(db)) - } - e => Err(Error(format!("Invalid DB engine: {}", e).into())), - } -} diff --git a/src/garage/cli/convert_db.rs b/src/garage/cli/convert_db.rs new file mode 100644 index 00000000..f590a4b6 --- /dev/null +++ b/src/garage/cli/convert_db.rs @@ -0,0 +1,65 @@ +use std::path::PathBuf; + +use structopt::StructOpt; + +use garage_db::*; + +/// K2V command line interface +#[derive(StructOpt, Debug)] +pub struct ConvertDbOpt { + /// Input database path (not the same as metadata_dir, see + /// https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#db-engine-since-v0-8-0) + #[structopt(short = "i")] + input_path: PathBuf, + /// Input database engine (sled, lmdb or sqlite; limited by db engines + /// enabled in this build) + #[structopt(short = "a")] + input_engine: String, + + /// Output database path + #[structopt(short = "o")] + output_path: PathBuf, + /// Output database engine + #[structopt(short = "b")] + output_engine: String, +} + +pub(crate) fn do_conversion(args: ConvertDbOpt) -> Result<()> { + let input = open_db(args.input_path, args.input_engine)?; + let output = open_db(args.output_path, args.output_engine)?; + output.import(&input)?; + Ok(()) +} + +fn open_db(path: PathBuf, engine: String) -> Result { + match engine.as_str() { + #[cfg(feature = "sled")] + "sled" => { + let db = sled_adapter::sled::Config::default().path(&path).open()?; + Ok(sled_adapter::SledDb::init(db)) + } + #[cfg(feature = "sqlite")] + "sqlite" | "sqlite3" | "rusqlite" => { + let db = sqlite_adapter::rusqlite::Connection::open(&path)?; + Ok(sqlite_adapter::SqliteDb::init(db)) + } + #[cfg(feature = "lmdb")] + "lmdb" | "heed" => { + std::fs::create_dir_all(&path).map_err(|e| { + Error(format!("Unable to create LMDB data directory: {}", e).into()) + })?; + + let map_size = lmdb_adapter::recommended_map_size(); + + let db = lmdb_adapter::heed::EnvOpenOptions::new() + .max_dbs(100) + .map_size(map_size) + .open(&path) + .unwrap(); + Ok(lmdb_adapter::LmdbDb::init(db)) + } + e => Err(Error( + format!("Invalid or unsupported DB engine: {}", e).into(), + )), + } +} diff --git a/src/garage/cli/mod.rs b/src/garage/cli/mod.rs index 17a2d8ce..e131f62c 100644 --- a/src/garage/cli/mod.rs +++ b/src/garage/cli/mod.rs @@ -4,6 +4,8 @@ pub(crate) mod layout; pub(crate) mod structs; pub(crate) mod util; +pub(crate) mod convert_db; + pub(crate) use cmd::*; pub(crate) use init::*; pub(crate) use layout::*; diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs index 6e585e53..ee7c2988 100644 --- a/src/garage/cli/structs.rs +++ b/src/garage/cli/structs.rs @@ -3,6 +3,8 @@ use structopt::StructOpt; use garage_util::version::garage_version; +use crate::cli::convert_db; + #[derive(StructOpt, Debug)] pub enum Command { /// Run Garage server @@ -54,6 +56,10 @@ pub enum Command { /// Low-level debug operations on data blocks #[structopt(name = "block", version = garage_version())] Block(BlockOperation), + + /// Convert metadata db between database engine formats + #[structopt(name = "convert-db", version = garage_version())] + ConvertDb(convert_db::ConvertDbOpt), } #[derive(StructOpt, Debug)] diff --git a/src/garage/main.rs b/src/garage/main.rs index e8aee892..bec3197c 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -173,6 +173,9 @@ async fn main() { Command::OfflineRepair(repair_opt) => { repair::offline::offline_repair(opt.config_file, opt.secrets, repair_opt).await } + Command::ConvertDb(conv_opt) => { + cli::convert_db::do_conversion(conv_opt).map_err(From::from) + } Command::Node(NodeOperation::NodeId(node_id_opt)) => { node_id_command(opt.config_file, node_id_opt.quiet) } -- cgit v1.2.3