Merge branch 'master' into child_trie_w3_change

Cargo.toml

@@ -123,6 +123,7 @@ members = [
 	"primitives/consensus/vrf",
 	"primitives/core",
 	"primitives/chain-spec",
+	"primitives/database",
 	"primitives/debug-derive",
 	"primitives/storage",
 	"primitives/externalities",

bin/node/cli/Cargo.toml

@@ -148,7 +148,7 @@ cli = [
 	"node-transaction-factory",
 	"sc-cli",
 	"frame-benchmarking-cli",
-	"sc-service/rocksdb",
+	"sc-service/db",
 	"structopt",
 	"substrate-build-script-utils",
 ]

bin/node/testing/Cargo.toml

@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 pallet-balances = { version = "2.0.0-dev", path = "../../../frame/balances" }
 sc-client = { version = "0.8.0-dev", path = "../../../client/" }
-sc-client-db = { version = "0.8.0-dev", path = "../../../client/db/", features = ["kvdb-rocksdb"] }
+sc-client-db = { version = "0.8.0-dev", path = "../../../client/db/", features = ["kvdb-rocksdb", "parity-db"] }
 sc-client-api = { version = "2.0.0-dev", path = "../../../client/api/" }
 codec = { package = "parity-scale-codec", version = "1.3.0" }
 pallet-contracts = { version = "2.0.0-dev", path = "../../../frame/contracts" }
@@ -54,4 +54,4 @@ fs_extra = "1"
 [dev-dependencies]
 criterion = "0.3.0"
 sc-cli = { version = "0.8.0-dev", path = "../../../client/cli" }
-sc-service = { version = "0.8.0-dev", path = "../../../client/service", features = ["rocksdb"] }
+sc-service = { version = "0.8.0-dev", path = "../../../client/service", features = ["db"] }

bin/node/testing/src/bench.rs

@@ -184,7 +184,7 @@ impl BenchDb {
 			state_cache_size: 16*1024*1024,
 			state_cache_child_ratio: Some((0, 100)),
 			pruning: PruningMode::ArchiveAll,
-			source: sc_client_db::DatabaseSettingsSrc::Path {
+			source: sc_client_db::DatabaseSettingsSrc::RocksDb {
 				path: dir.into(),
 				cache_size: 512,
 			},

client/Cargo.toml

@@ -38,6 +38,7 @@ sp-blockchain = { version = "2.0.0-dev", path = "../primitives/blockchain" }
 sp-state-machine = { version = "0.8.0-dev", path = "../primitives/state-machine" }
 sc-telemetry = { version = "2.0.0-dev", path = "telemetry" }
 sp-trie = { version = "2.0.0-dev", path = "../primitives/trie" }
+sp-database = { version = "2.0.0-dev", path = "../primitives/database" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0-dev", path = "../utils/prometheus" }
 tracing = "0.1.10"
 

client/cli/src/arg_enums.rs

@@ -122,6 +122,20 @@ impl ExecutionStrategy {
 	}
 }
 
+arg_enum! {
+	/// Database backend
+	#[allow(missing_docs)]
+	#[derive(Debug, Clone, Copy)]
+	pub enum Database {
+		// Facebooks RocksDB
+		RocksDb,
+		// Subdb. https://github.com/paritytech/subdb/
+		SubDb,
+		// ParityDb. https://github.com/paritytech/parity-db/
+		ParityDb,
+	}
+}
+
 /// Default value for the `--execution-syncing` parameter.
 pub const DEFAULT_EXECUTION_SYNCING: ExecutionStrategy = ExecutionStrategy::NativeElseWasm;
 /// Default value for the `--execution-import-block` parameter.

client/cli/src/commands/export_blocks_cmd.rs

@@ -74,7 +74,7 @@ impl ExportBlocksCmd {
 		<<<BB as BlockT>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
 		<BB as BlockT>::Hash: std::str::FromStr,
 	{
-		if let DatabaseConfig::Path { ref path, .. } = &config.database {
+		if let DatabaseConfig::RocksDb { ref path, .. } = &config.database {
 			info!("DB path: {}", path.display());
 		}
 

client/cli/src/commands/mod.rs

@@ -204,9 +204,16 @@ macro_rules! substrate_cli_subcommands {
 				&self,
 				base_path: &::std::path::PathBuf,
 				cache_size: usize,
+				database: $crate::Database,
 			) -> $crate::Result<::sc_service::config::DatabaseConfig> {
 				match self {
-					$($enum::$variant(cmd) => cmd.database_config(base_path, cache_size)),*
+					$($enum::$variant(cmd) => cmd.database_config(base_path, cache_size, database)),*
+				}
+			}
+
+			fn database(&self) -> $crate::Result<::std::option::Option<$crate::Database>> {
+				match self {
+					$($enum::$variant(cmd) => cmd.database()),*
 				}
 			}
 

client/cli/src/commands/purge_chain_cmd.rs

@@ -39,7 +39,7 @@ impl PurgeChainCmd {
 	/// Run the purge command
 	pub fn run(&self, config: Configuration) -> error::Result<()> {
 		let db_path = match &config.database {
-			DatabaseConfig::Path { path, .. } => path,
+			DatabaseConfig::RocksDb { path, .. } => path,
 			_ => {
 				eprintln!("Cannot purge custom database implementation");
 				return Ok(());

client/cli/src/config.rs

@@ -21,6 +21,7 @@ use crate::{
 	init_logger, ImportParams, KeystoreParams, NetworkParams, NodeKeyParams,
 	PruningParams, SharedParams, SubstrateCli,
 };
+use crate::arg_enums::Database;
 use app_dirs::{AppDataType, AppInfo};
 use names::{Generator, Name};
 use sc_service::config::{
@@ -152,11 +153,26 @@ pub trait CliConfiguration: Sized {
 			.unwrap_or(Default::default()))
 	}
 
+	/// Get the database backend variant.
+	///
+	/// By default this is retrieved from `ImportParams` if it is available. Otherwise its `None`.
+	fn database(&self) -> Result<Option<Database>> {
+		Ok(self.import_params().map(|x| x.database()))
+	}
+
 	/// Get the database configuration.
 	///
 	/// By default this is retrieved from `SharedParams`
-	fn database_config(&self, base_path: &PathBuf, cache_size: usize) -> Result<DatabaseConfig> {
-		Ok(self.shared_params().database_config(base_path, cache_size))
+	fn database_config(&self,
+		base_path: &PathBuf,
+		cache_size: usize,
+		database: Database,
+	) -> Result<DatabaseConfig> {
+		Ok(self.shared_params().database_config(
+			base_path,
+			cache_size,
+			database,
+		))
 	}
 
 	/// Get the state cache size.
@@ -376,6 +392,7 @@ pub trait CliConfiguration: Sized {
 		let net_config_dir = config_dir.join(DEFAULT_NETWORK_CONFIG_PATH);
 		let client_id = C::client_id();
 		let database_cache_size = self.database_cache_size()?.unwrap_or(128);
+		let database = self.database()?.unwrap_or(Database::RocksDb);
 		let node_key = self.node_key(&net_config_dir)?;
 		let role = self.role(is_dev)?;
 		let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
@@ -394,7 +411,7 @@ pub trait CliConfiguration: Sized {
 				node_key,
 			)?,
 			keystore: self.keystore_config(&config_dir)?,
-			database: self.database_config(&config_dir, database_cache_size)?,
+			database: self.database_config(&config_dir, database_cache_size, database)?,
 			state_cache_size: self.state_cache_size()?,
 			state_cache_child_ratio: self.state_cache_child_ratio()?,
 			pruning: self.pruning(is_dev, &role)?,

client/cli/src/params/import_params.rs

@@ -17,7 +17,7 @@
 use crate::arg_enums::{
 	ExecutionStrategy, TracingReceiver, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
 	DEFAULT_EXECUTION_IMPORT_BLOCK, DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER,
-	DEFAULT_EXECUTION_SYNCING,
+	DEFAULT_EXECUTION_SYNCING, Database,
 };
 use crate::params::PruningParams;
 use crate::Result;
@@ -54,6 +54,16 @@ pub struct ImportParams {
 	#[structopt(flatten)]
 	pub execution_strategies: ExecutionStrategiesParams,
 
+	/// Select database backend to use.
+	#[structopt(
+		long = "database",
+		alias = "db",
+		value_name = "DB",
+		case_insensitive = true,
+		default_value = "RocksDb"
+	)]
+	pub database: Database,
+
 	/// Limit the memory the database cache can use.
 	#[structopt(long = "db-cache", value_name = "MiB")]
 	pub database_cache_size: Option<usize>,
@@ -132,6 +142,11 @@ impl ImportParams {
 	pub fn database_cache_size(&self) -> Option<usize> {
 		self.database_cache_size
 	}
+
+	/// Limit the memory the database cache can use.
+	pub fn database(&self) -> Database {
+		self.database
+	}
 }
 
 /// Execution strategies parameters.