fix compilation error

This commit is contained in:
Jonathan de Jong 2024-02-25 21:26:09 +01:00
parent fb8688df45
commit 77a604fa50
6 changed files with 16 additions and 9 deletions

View file

@ -17,6 +17,6 @@ rocksdb = { version = "0.17.0", features = ["multi-threaded-cf", "zstd"], option
persy = { version = "1.2", optional = true }
[features]
default = ["sled", "persy", "heed", "sqlite", "rocksdb"]
default = []
sqlite = ["rusqlite"]
sqlite = ["rusqlite"]

View file

@ -17,7 +17,7 @@ pub type TreeKVIter<'a> = Box<dyn Iterator<Item = (Vec<u8>, KVIter<'a>)> + 'a>;
#[derive(Clone, Copy)]
pub struct Config {
ignore_broken_rows: bool,
pub ignore_broken_rows: bool,
}
pub trait Database {

View file

@ -18,4 +18,4 @@ sled = ["conduit_iface/sled"]
persy = ["conduit_iface/persy"]
heed = ["conduit_iface/heed"]
sqlite = ["conduit_iface/sqlite"]
rocksdb = ["conduit_iface/rocksdb"]
rocksdb = ["conduit_iface/rocksdb"]

View file

@ -165,9 +165,11 @@ fn main() -> anyhow::Result<()> {
let ignore_broken_rows = matches.is_present("ignore_broken_rows");
let mut src_db = Database::new(matches.value_of("from").unwrap(), src_dir)?;
let config = Config { ignore_broken_rows };
let mut dst_db = Database::new(matches.value_of("to").unwrap(), dst_dir)?;
let mut src_db = Database::new(matches.value_of("from").unwrap(), src_dir, config)?;
let mut dst_db = Database::new(matches.value_of("to").unwrap(), dst_dir, config)?;
copy_database(&mut *src_db, &mut *dst_db, 1000)?;

View file

@ -8,4 +8,4 @@ edition = "2018"
[dependencies]
clap = "2.33.3"
anyhow = "1.0.41"
conduit_iface = { path = "../iface/" }
conduit_iface = { path = "../iface/", features=["sled", "sqlite"] }

View file

@ -2,7 +2,7 @@ use std::path::Path;
use clap::{App, Arg};
use conduit_iface::db::{copy_database, sled, sqlite};
use conduit_iface::db::{copy_database, sled, sqlite, Config};
fn main() -> anyhow::Result<()> {
let matches = App::new("Conduit Sled to Sqlite Migrator")
@ -44,7 +44,12 @@ fn main() -> anyhow::Result<()> {
let mut sled = sled::SledDB::new(sled::new_db(source_dir)?);
let mut sqlite = sqlite::SqliteDB::new(sqlite::new_conn(dest_dir)?);
let mut sqlite = sqlite::SqliteDB::new(
sqlite::new_conn(dest_dir)?,
Config {
ignore_broken_rows: false,
},
);
copy_database(&mut sled, &mut sqlite, 1000)?;