Abstract database behind generic interface and implement alternative drivers #322

Merged
lx merged 64 commits from db-abstraction into main 2022-06-08 08:01:56 +00:00
6 changed files with 33 additions and 12 deletions
Showing only changes of commit 4f5d17d464 - Show all commits

1
Cargo.lock generated
View file

@ -1060,6 +1060,7 @@ dependencies = [
"hexdump",
"log",
"mktemp",
"pretty_env_logger",
"rusqlite",
"sled",
]

View file

@ -27,9 +27,10 @@ sled = "0.34"
# cli deps
clap = { version = "3.1.18", optional = true, features = ["derive", "env"] }
pretty_env_logger = { version = "0.4", optional = true }
[dev-dependencies]
mktemp = "0.4"
[features]
cli = ["clap"]
cli = ["clap", "pretty_env_logger"]

View file

@ -25,6 +25,8 @@ struct Args {
fn main() {
let args = Args::parse();
pretty_env_logger::init();
match do_conversion(args) {
Ok(()) => println!("Success!"),
Err(e) => eprintln!("Error: {}", e),

View file

@ -198,16 +198,25 @@ impl Db {
let ex_tree = other.open_tree(&name)?;
let mut i = 0;
for item in ex_tree.iter()? {
let (k, v) = item?;
tree.insert(k, v)?;
i += 1;
if i % 1000 == 0 {
println!("{}: imported {}", name, i);
let tx_res = self.transaction(|mut tx| {
let mut i = 0;
for item in ex_tree.iter()? {
let (k, v) = item?;
tx.insert(&tree, k, v)?;
i += 1;
if i % 1000 == 0 {
println!("{}: imported {}", name, i);
}
}
}
println!("{}: finished importing, {} items", name, i);
Ok::<_, TxError<()>>(i)
});
let total = match tx_res {
Err(TxError::Db(e)) => return Err(e),
Err(TxError::Abort(_)) => unreachable!(),
Ok(x) => x,
};
println!("{}: finished importing, {} items", name, total);
}
Ok(())
}

View file

@ -230,7 +230,10 @@ impl<'a, 'db> ITx for LmdbTx<'a, 'db> {
fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value<'_>>> {
let tree = self.get_tree(tree)?;
match tree.get(&self.tx, &key)? {
Some(v) => Ok(Some(Value(Box::new(v)))),
Some(v) => {
let v: &'_ [u8] = v;
Ok(Some(v.into()))
}
None => Ok(None),
}
}
@ -372,7 +375,11 @@ where
match iter_ref.unwrap().next() {
None => None,
Some(Err(e)) => Some(Err(e.into())),
Some(Ok((k, v))) => Some(Ok((k.into(), v.into()))),
Some(Ok((k, v))) => {
let k: &'a [u8] = k;
let v: &'a [u8] = v;
Some(Ok((k.into(), v.into())))
}
}
}
}

View file

@ -97,6 +97,7 @@ impl IDb for SqliteDb {
while let Some(row) = rows.next()? {
let name = row.get::<_, String>(0)?;
let name = name.replace("_COLON_", ":");
let name = name.strip_prefix("tree_").unwrap().to_string();
trees.push(name);
}
Ok(trees)