to new namespace

This commit is contained in:
Nikolay Volf 2016-02-21 15:19:08 +03:00
parent a6316b1e20
commit bcc4ca48ab

View File

@ -69,7 +69,7 @@ pub struct Database {
impl Database { impl Database {
/// Open database with default settings. /// Open database with default settings.
pub fn open_default(path: &str) -> Result<Database, String> { pub fn open_default(path: &str) -> Result<Database, String> {
Database::open(&DatabaseConfig { prefix_size: None }, path) Database::open(&DatabaseConfig { prefix_size: None }, path)
} }
/// Open database file. Creates if it does not exist. /// Open database file. Creates if it does not exist.
@ -120,7 +120,7 @@ impl Database {
pub fn write(&self, tr: DBTransaction) -> Result<(), String> { pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
self.db.write(tr.batch) self.db.write(tr.batch)
} }
/// Get value by key. /// Get value by key.
pub fn get(&self, key: &[u8]) -> Result<Option<DBVector>, String> { pub fn get(&self, key: &[u8]) -> Result<Option<DBVector>, String> {
self.db.get(key) self.db.get(key)
@ -152,7 +152,7 @@ impl Database {
mod tests { mod tests {
use hash::*; use hash::*;
use super::*; use super::*;
use tests::helpers::RandomTempPath; use devtools::*;
use std::str::FromStr; use std::str::FromStr;
use std::ops::Deref; use std::ops::Deref;
@ -185,7 +185,7 @@ mod tests {
db.write(transaction).unwrap(); db.write(transaction).unwrap();
assert!(db.get(&key1).unwrap().is_none()); assert!(db.get(&key1).unwrap().is_none());
assert_eq!(db.get(&key3).unwrap().unwrap().deref(), b"elephant"); assert_eq!(db.get(&key3).unwrap().unwrap().deref(), b"elephant");
if config.prefix_size.is_some() { if config.prefix_size.is_some() {
assert_eq!(db.get_by_prefix(&key3).unwrap().deref(), b"elephant"); assert_eq!(db.get_by_prefix(&key3).unwrap().deref(), b"elephant");
assert_eq!(db.get_by_prefix(&key2).unwrap().deref(), b"dog"); assert_eq!(db.get_by_prefix(&key2).unwrap().deref(), b"dog");