Merge branch 'main' into next

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"

src/db/bin/convert.rs

@@ -1,73 +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<Db> {
-	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)?;
-			db.pragma_update(None, "journal_mode", &"WAL")?;
-			db.pragma_update(None, "synchronous", &"NORMAL")?;
-			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 mut env_builder = lmdb_adapter::heed::EnvOpenOptions::new();
-			env_builder.max_dbs(100);
-			env_builder.map_size(map_size);
-			unsafe {
-				env_builder.flag(heed::flags::Flags::MdbNoMetaSync);
-			}
-			let db = env_builder.open(&path)?;
-			Ok(lmdb_adapter::LmdbDb::init(db))
-		}
-		e => Err(Error(format!("Invalid DB engine: {}", e).into())),
-	}
-}