Fix db initialization for light client (#7130)

* Fix db initialization for light client

* Fix cache distribution
This commit is contained in:
Arkadiy Paronyan
2020-09-17 20:32:26 +02:00
committed by GitHub
parent 4472eb0a48
commit a44be5ce85
2 changed files with 45 additions and 26 deletions
+11 -7
View File
@@ -18,7 +18,7 @@
/// A `Database` adapter for parity-db.
use sp_database::{Database, Change, ColumnId, Transaction, error::DatabaseError};
use crate::utils::NUM_COLUMNS;
use crate::utils::{DatabaseType, NUM_COLUMNS};
use crate::columns;
struct DbAdapter(parity_db::Db);
@@ -32,13 +32,17 @@ fn handle_err<T>(result: parity_db::Result<T>) -> T {
}
}
/// Wrap RocksDb database into a trait object that implements `sp_database::Database`
pub fn open<H: Clone>(path: &std::path::Path) -> parity_db::Result<std::sync::Arc<dyn Database<H>>> {
/// Wrap parity-db database into a trait object that implements `sp_database::Database`
pub fn open<H: Clone>(path: &std::path::Path, db_type: DatabaseType)
-> parity_db::Result<std::sync::Arc<dyn Database<H>>>
{
let mut config = parity_db::Options::with_columns(path, NUM_COLUMNS as u8);
let mut state_col = &mut config.columns[columns::STATE as usize];
state_col.ref_counted = true;
state_col.preimage = true;
state_col.uniform = true;
if db_type == DatabaseType::Full {
let mut state_col = &mut config.columns[columns::STATE as usize];
state_col.ref_counted = true;
state_col.preimage = true;
state_col.uniform = true;
}
let db = parity_db::Db::open(&config)?;
Ok(std::sync::Arc::new(DbAdapter(db)))
}