Merge branch 'db' of github.com:ethcore/parity into db

This commit is contained in:
arkpar 2016-02-22 13:48:43 +01:00
commit 764f6e9347

View File

@ -94,7 +94,8 @@ impl Database {
opts.set_max_background_compactions(4); opts.set_max_background_compactions(4);
opts.set_max_background_flushes(4); opts.set_max_background_flushes(4);
opts.set_filter_deletes(false); opts.set_filter_deletes(false);
opts.set_disable_auto_compactions(false);*/ opts.set_disable_auto_compactions(false);
*/
if let Some(size) = config.prefix_size { if let Some(size) = config.prefix_size {
let mut block_opts = BlockBasedOptions::new(); let mut block_opts = BlockBasedOptions::new();
@ -147,12 +148,11 @@ impl Database {
} }
} }
#[cfg(test)] #[cfg(test)]
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;