From a398ee5fb2aa623f035875625dafad2a0bb32e7a Mon Sep 17 00:00:00 2001 From: David Palm Date: Mon, 11 Nov 2019 19:44:50 +0100 Subject: [PATCH 01/14] Use upstream rocksdb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …by way of https://github.com/paritytech/parity-common/pull/257 by @ordian. --- Cargo.lock | 284 +++++++++++++-------- Cargo.toml | 9 +- ethcore/Cargo.toml | 6 +- ethcore/account-db/Cargo.toml | 2 +- ethcore/account-state/Cargo.toml | 2 +- ethcore/blockchain/Cargo.toml | 2 +- ethcore/client-traits/Cargo.toml | 2 +- ethcore/db/Cargo.toml | 2 +- ethcore/engines/validator-set/Cargo.toml | 2 +- ethcore/executive-state/Cargo.toml | 2 +- ethcore/light/Cargo.toml | 2 +- ethcore/pod/Cargo.toml | 2 +- ethcore/private-tx/Cargo.toml | 2 +- ethcore/service/Cargo.toml | 4 +- ethcore/snapshot/Cargo.toml | 4 +- ethcore/snapshot/snapshot-tests/Cargo.toml | 4 +- ethcore/state-db/Cargo.toml | 2 +- ethcore/trace/Cargo.toml | 2 +- miner/local-store/Cargo.toml | 2 +- secret-store/Cargo.toml | 4 +- util/journaldb/Cargo.toml | 2 +- util/migration-rocksdb/Cargo.toml | 4 +- util/migration-rocksdb/src/lib.rs | 7 +- util/migration-rocksdb/tests/tests.rs | 2 +- 24 files changed, 210 insertions(+), 146 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 541e0f418f5..5b4d855b5b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -24,7 +24,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -285,6 +285,28 @@ dependencies = [ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "bindgen" +version = "0.49.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "bit-set" version = "0.4.0" @@ -455,12 +477,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "cc" version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "jobserver 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "cesu8" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "cexpr" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "cfg-if" version = "0.1.10" @@ -494,6 +528,16 @@ dependencies = [ "multihash 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "clang-sys" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "clap" version = "2.33.0" @@ -530,7 +574,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethcore-miner 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "registrar 0.0.1", "stats 0.1.0", @@ -1073,9 +1117,9 @@ dependencies = [ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-memorydb 0.1.2", + "kvdb-rocksdb 0.1.6", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -1142,8 +1186,8 @@ dependencies = [ "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1200,7 +1244,7 @@ version = "0.1.0" dependencies = [ "common-types 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1248,8 +1292,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "memory-cache 0.1.0", @@ -1400,7 +1444,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1447,8 +1491,8 @@ dependencies = [ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-server-utils 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-rocksdb 0.1.6", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1483,8 +1527,8 @@ dependencies = [ "ethcore-private-tx 1.0.0", "ethcore-sync 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-rocksdb 0.1.6", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "snapshot 0.1.0", "spec 0.1.0", @@ -1527,7 +1571,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "macros 0.1.0", @@ -1700,7 +1744,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1884,14 +1928,6 @@ dependencies = [ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "getopts" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "getrandom" version = "0.1.11" @@ -1902,6 +1938,11 @@ dependencies = [ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "globset" version = "0.4.2" @@ -2259,6 +2300,16 @@ name = "jni-sys" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "jobserver" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "journaldb" version = "0.2.0" @@ -2269,8 +2320,8 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2420,36 +2471,34 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.1.1" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.1", ] [[package]] name = "kvdb-memorydb" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-rocksdb" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.1.6" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-rocksdb 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rocksdb 0.12.3 (git+https://github.com/rust-rocksdb/rust-rocksdb)", ] [[package]] @@ -2484,19 +2533,20 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "librocksdb-sys" +version = "6.2.4" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb#473b1671c75153502e980808d66cdeb3da7b7f73" +dependencies = [ + "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] -name = "local-encoding" -version = "0.2.0" +name = "linked-hash-map" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "skeptic 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "lock_api" @@ -2667,8 +2717,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "migration-rocksdb" version = "0.1.0" dependencies = [ - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-rocksdb 0.1.6", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2809,7 +2859,7 @@ dependencies = [ "ethcore-network 1.12.0", "ethcore-network-devp2p 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2822,6 +2872,15 @@ name = "nodrop" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "null-engine" version = "0.1.0" @@ -2934,6 +2993,14 @@ dependencies = [ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "owning_ref" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "panic_hook" version = "0.1.0" @@ -2946,6 +3013,10 @@ name = "parity-bytes" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "parity-bytes" +version = "0.1.1" + [[package]] name = "parity-clib" version = "1.12.0" @@ -3032,8 +3103,8 @@ dependencies = [ "journaldb 0.2.0", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-rocksdb 0.1.6", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "migration-rocksdb 0.1.0", "node-filter 1.12.0", @@ -3123,8 +3194,8 @@ dependencies = [ "common-types 0.1.0", "ethcore-io 1.12.0", "ethkey 0.4.0", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3138,27 +3209,6 @@ name = "parity-path" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "parity-rocksdb" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-rocksdb-sys 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "parity-rocksdb-sys" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cmake 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-snappy-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "parity-rpc" version = "1.12.0" @@ -3460,6 +3510,11 @@ dependencies = [ "subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "percent-encoding" version = "1.0.1" @@ -3533,7 +3588,7 @@ dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3658,14 +3713,6 @@ dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "pulldown-cmark" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "pwasm-run-test" version = "0.1.0" @@ -4017,6 +4064,15 @@ dependencies = [ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rocksdb" +version = "0.12.3" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb#473b1671c75153502e980808d66cdeb3da7b7f73" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "librocksdb-sys 6.2.4 (git+https://github.com/rust-rocksdb/rust-rocksdb)", +] + [[package]] name = "rpassword" version = "1.0.2" @@ -4213,23 +4269,19 @@ dependencies = [ ] [[package]] -name = "siphasher" -version = "0.2.3" +name = "shlex" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "siphasher" -version = "0.3.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "skeptic" -version = "0.4.0" +name = "siphasher" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "slab" @@ -4278,8 +4330,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-rocksdb 0.1.6", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4324,8 +4376,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", + "kvdb-rocksdb 0.1.6", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4378,7 +4430,7 @@ dependencies = [ "instant-seal 0.1.0", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "null-engine 0.1.0", @@ -4416,7 +4468,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", @@ -4871,7 +4923,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "evm 0.1.0", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5103,7 +5155,7 @@ dependencies = [ "ethjson 0.1.0", "executive-state 0.1.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -5271,6 +5323,15 @@ dependencies = [ "webpki 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "which" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "winapi" version = "0.2.8" @@ -5407,6 +5468,7 @@ dependencies = [ "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" "checksum bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9f04a5e50dc80b3d5d35320889053637d15011aed5e66b66b37ae798c65da6f7" +"checksum bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)" = "846a1fba6535362a01487ef6b10f0275faa12e5c5d835c5c1c627aabc46ccbd6" "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" @@ -5428,9 +5490,11 @@ dependencies = [ "checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" "checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" "checksum cesu8 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" "checksum cid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0e37fba0087d9f3f4e269827a55dc511abf3e440cc097a0c154ff4e6584f988" +"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum cmake 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "6ec65ee4f9c9d16f335091d23693457ed4928657ba4982289d7fafee03bc614a" @@ -5489,8 +5553,8 @@ dependencies = [ "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" -"checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797" "checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4743617a7464bbda3c8aec8558ff2f9429047e025771037df561d383337ff865" "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" "checksum hamming 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1" @@ -5529,6 +5593,7 @@ dependencies = [ "checksum jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9f0cd42ac65f758063fea55126b0148b1ce0a6354ff78e07a4d6806bc65c4ab3" "checksum jni 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "294eca097d1dc0bf59de5ab9f7eafa5f77129e9f6464c957ed3ddeb705fb4292" "checksum jni-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +"checksum jobserver 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "f74e73053eaf95399bf926e48fc7a2a3ce50bd0eaaa2357d391e95b2dcdd4f10" "checksum jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "34651edf3417637cc45e70ed0182ecfa9ced0b7e8131805fccf7400d989845ca" "checksum jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d5c31575cc70a8b21542599028472c80a9248394aeea4d8918a045a0ab08a3" "checksum jsonrpc-http-server 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "aa54c4c2d88cb5e04b251a5031ba0f2ee8c6ef30970e31228955b89a80c3b611" @@ -5540,15 +5605,12 @@ dependencies = [ "checksum keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e563fa6fe52b2686094846118bf2cb2e6f75e6b8cec6c3aba09be8e835c7f998" "checksum keccak-hasher 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bf18164fd7ce989041f8fc4a1ae72a8bd1bec3575f2aeaf1d4968fc053aabef" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "72ae89206cea31c32014b39d5a454b96135894221610dbfd19cf4d2d044fa546" -"checksum kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "296c12309ed36cb74d59206406adbf1971c3baa56d5410efdb508d8f1c60a351" -"checksum kvdb-rocksdb 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96eb0e0112bb66fe5401294ca0f43c9cb771456af9270443545026e55fd00912" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" "checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" +"checksum librocksdb-sys 6.2.4 (git+https://github.com/rust-rocksdb/rust-rocksdb)" = "" "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" -"checksum local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1ceb20f39ff7ae42f3ff9795f3986b1daad821caaa1e1732a0944103a5a1a66" "checksum lock_api 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "775751a3e69bde4df9b38dd00a1b5d6ac13791e4223d4a0506577f0dd27cfb7a" "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" @@ -5576,6 +5638,7 @@ dependencies = [ "checksum nan-preserving-float 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34d4f00fcc2f4c9efa8cc971db0da9e28290e28e97af47585e48691ef10ff31f" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" +"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" "checksum num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" @@ -5589,12 +5652,11 @@ dependencies = [ "checksum order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb" "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5168b4cf41f3835e4bc6ffb32f51bc9365dc50cb351904595b3931d917fd0c" "checksum parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "27a9c2b525c93d717a234eb220c26474f8d97b08ac50d79faeac4cb6c74bf0b9" "checksum parity-daemonize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "69b1910b2793ff52713fca0a4ee92544ebec59ccd218ea74560be6f947b4ca77" "checksum parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5962540f99d3895d9addf535f37ab1397886bc2c68e59efd040ef458e5f8c3f7" -"checksum parity-rocksdb 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d17caf6640e24b70242f3f48615e3f0764f98871e8c7aea25584e29833eb5a8" -"checksum parity-rocksdb-sys 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9581e6b8c63f3808500638372ee56faaaffb57c4d349974bff591606b94d5f57" "checksum parity-scale-codec 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "65582b5c02128a4b0fa60fb3e070216e9c84be3e4a8f1b74bc37e15a25e58daf" "checksum parity-secp256k1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4fca4f82fccae37e8bbdaeb949a4a218a1bbc485d11598f193d2a908042e5fc1" "checksum parity-snappy 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2c5f9d149b13134b8b354d93a92830efcbee6fe5b73a2e6e540fe70d4dd8a63" @@ -5608,6 +5670,7 @@ dependencies = [ "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" @@ -5628,7 +5691,6 @@ dependencies = [ "checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8" "checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee" "checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" -"checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" "checksum pwasm-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9135bed7b452e20dbb395a2d519abaf0c46d60e7ecc02daeeab447d29bada1" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5" @@ -5663,6 +5725,7 @@ dependencies = [ "checksum ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "426bc186e3e95cac1e4a4be125a4aca7e84c2d616ffc02244eef36e2a60a093c" "checksum ripemd160 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" "checksum rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fa2f7f9c612d133da9101ef7bcd3e603ca7098901eca852e71f87a83dd3e6b59" +"checksum rocksdb 0.12.3 (git+https://github.com/rust-rocksdb/rust-rocksdb)" = "" "checksum rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b273c91bd242ca03ad6d71c143b6f17a48790e61f21a6c78568fa2b6774a24a4" "checksum rprompt 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1601f32bc5858aae3cbfa1c645c96c4d820cc5c16be0194f089560c00b6eb625" "checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395" @@ -5688,9 +5751,9 @@ dependencies = [ "checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" "checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" "checksum siphasher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9913c75df657d84a03fa689c016b0bb2863ff0b497b26a8d6e9703f8d5df03a8" -"checksum skeptic 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24ebf8a06f5f8bae61ae5bbc7af7aac4ef6907ae975130faba1199e5fe82256a" "checksum slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6dbdd334bd28d328dad1c41b0ea662517883d8880d8533895ef96c8003dec9c4" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d" @@ -5777,6 +5840,7 @@ dependencies = [ "checksum wasmi 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b4a6d379e9332b1b1f52c5a87f2481c85c7c931d8ec411963dfb8f26b1ec1e3" "checksum webpki 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f7e1cd7900a3a6b65a3e8780c51a3e6b59c0e2c55c6dc69578c288d69f7d082" "checksum webpki-roots 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c10fa4212003ba19a564f25cd8ab572c6791f99a03cc219c13ed35ccab00de0e" +"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/Cargo.toml b/Cargo.toml index c81f5acb356..7c85712aed4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,8 +39,8 @@ futures = "0.1" journaldb = { path = "util/journaldb" } jsonrpc-core = "14.0.3" keccak-hash = "0.4.0" -kvdb = "0.1" -kvdb-rocksdb = "0.1.5" +kvdb = "0.1.1" +kvdb-rocksdb = "0.1.6" log = "0.4" migration-rocksdb = { path = "util/migration-rocksdb" } node-filter = { path = "ethcore/node-filter" } @@ -135,3 +135,8 @@ members = [ "evmbin", "parity-clib", ] + +[patch.crates-io] +kvdb-rocksdb = { path = "../parity-common/kvdb-rocksdb" } +kvdb-memorydb = { path = "../parity-common/kvdb-memorydb" } +kvdb = { path = "../parity-common/kvdb" } diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index ffbcdeaf662..abc80b16bd5 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -31,9 +31,9 @@ hash-db = "0.15.0" itertools = "0.5" journaldb = { path = "../util/journaldb" } keccak-hash = "0.4.0" -kvdb = "0.1" +kvdb = "0.1.1" kvdb-memorydb = { version = "0.1.2", optional = true } -kvdb-rocksdb = { version = "0.1.5", optional = true } +kvdb-rocksdb = { version = "0.1.6", optional = true } lazy_static = { version = "1.3", optional = true } log = "0.4" macros = { path = "../util/macros", optional = true } @@ -80,7 +80,7 @@ ethjson = { path = "../json", features = ["test-helpers"] } parity-crypto = { version = "0.4.2", features = ["publickey"] } fetch = { path = "../util/fetch" } kvdb-memorydb = "0.1.2" -kvdb-rocksdb = "0.1.5" +kvdb-rocksdb = "0.1.6" lazy_static = "1.3" machine = { path = "./machine", features = ["test-helpers"] } macros = { path = "../util/macros" } diff --git a/ethcore/account-db/Cargo.toml b/ethcore/account-db/Cargo.toml index c1a18bf1057..546d9b17f50 100644 --- a/ethcore/account-db/Cargo.toml +++ b/ethcore/account-db/Cargo.toml @@ -11,5 +11,5 @@ ethereum-types = "0.8.0" hash-db = "0.15.0" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" rlp = "0.4" diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml index 6c9c208b895..1579e5529d9 100644 --- a/ethcore/account-state/Cargo.toml +++ b/ethcore/account-state/Cargo.toml @@ -16,7 +16,7 @@ hash-db = "0.15.0" journaldb = { path = "../../util/journaldb" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" lru-cache = "0.1.2" memory-db = "0.15.0" diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml index 3eb0b2ecb3e..64511bf0e98 100644 --- a/ethcore/blockchain/Cargo.toml +++ b/ethcore/blockchain/Cargo.toml @@ -16,7 +16,7 @@ ethereum-types = "0.8.0" keccak-hash = "0.4.0" parity-util-mem = "0.2.0" itertools = "0.5" -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" parity-bytes = "0.1" rand = "0.7" diff --git a/ethcore/client-traits/Cargo.toml b/ethcore/client-traits/Cargo.toml index 611d00bed59..4bc525bdf0b 100644 --- a/ethcore/client-traits/Cargo.toml +++ b/ethcore/client-traits/Cargo.toml @@ -15,7 +15,7 @@ common-types = { path = "../types" } ethcore-db = { path = "../db" } ethcore-miner = { path = "../../miner" } ethereum-types = "0.8.0" -kvdb = "0.1" +kvdb = "0.1.1" registrar = { path = "../../util/registrar" } stats = { path = "../../util/stats" } trace = { path = "../trace" } diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml index 7fb7a03bb57..fff21e62f65 100644 --- a/ethcore/db/Cargo.toml +++ b/ethcore/db/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] common-types = { path = "../types" } ethereum-types = "0.8.0" -kvdb = "0.1" +kvdb = "0.1.1" parity-util-mem = "0.2.0" parking_lot = "0.9" rlp = "0.4.0" diff --git a/ethcore/engines/validator-set/Cargo.toml b/ethcore/engines/validator-set/Cargo.toml index 958ea4b480d..8bc3dd47ecc 100644 --- a/ethcore/engines/validator-set/Cargo.toml +++ b/ethcore/engines/validator-set/Cargo.toml @@ -17,7 +17,7 @@ ethereum-types = "0.8.0" ethjson = { path = "../../../json" } executive-state = { path = "../../executive-state" } keccak-hash = "0.4.0" -kvdb = "0.1" +kvdb = "0.1.1" lazy_static = "1.3.0" log = "0.4.8" machine = { path = "../../machine" } diff --git a/ethcore/executive-state/Cargo.toml b/ethcore/executive-state/Cargo.toml index 311d99ecc9b..0bd9732a2a9 100644 --- a/ethcore/executive-state/Cargo.toml +++ b/ethcore/executive-state/Cargo.toml @@ -14,7 +14,7 @@ common-types = { path = "../types" } ethereum-types = "0.8.0" hash-db = "0.15.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4.8" machine = { path = "../machine" } trace = { path = "../trace" } diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index e52faf85434..05c21c3eb5b 100644 --- a/ethcore/light/Cargo.toml +++ b/ethcore/light/Cargo.toml @@ -43,7 +43,7 @@ stats = { path = "../../util/stats" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" } -kvdb = "0.1" +kvdb = "0.1.1" memory-cache = { path = "../../util/memory-cache" } journaldb = { path = "../../util/journaldb" } verification = { path = "../verification" } diff --git a/ethcore/pod/Cargo.toml b/ethcore/pod/Cargo.toml index 7af891e1d06..7d4b2d626c9 100644 --- a/ethcore/pod/Cargo.toml +++ b/ethcore/pod/Cargo.toml @@ -15,7 +15,7 @@ hash-db = "0.15.0" itertools = "0.8" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" parity-bytes = "0.1.0" rlp = "0.4" diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml index 6cc26383b3d..358a7240f7d 100644 --- a/ethcore/private-tx/Cargo.toml +++ b/ethcore/private-tx/Cargo.toml @@ -26,7 +26,7 @@ parity-util-mem = "0.2.0" hash-db = "0.15.0" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" machine = { path = "../machine" } journaldb = { path = "../../util/journaldb" } diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index ffb640e874e..078c1b39448 100644 --- a/ethcore/service/Cargo.toml +++ b/ethcore/service/Cargo.toml @@ -14,7 +14,7 @@ ethcore-io = { path = "../../util/io" } ethcore-private-tx = { path = "../private-tx" } ethcore-sync = { path = "../sync" } ethereum-types = "0.8.0" -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" snapshot = { path = "../snapshot" } spec = { path = "../spec" } @@ -23,5 +23,5 @@ trace-time = "0.1" [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } ethcore-db = { path = "../db" } -kvdb-rocksdb = "0.1.5" +kvdb-rocksdb = "0.1.6" tempdir = "0.3" diff --git a/ethcore/snapshot/Cargo.toml b/ethcore/snapshot/Cargo.toml index 00b9ab6ea10..f2028077289 100644 --- a/ethcore/snapshot/Cargo.toml +++ b/ethcore/snapshot/Cargo.toml @@ -25,7 +25,7 @@ itertools = "0.5" journaldb = { path = "../../util/journaldb" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4.8" num_cpus = "1.10.1" rand = "0.7" @@ -48,7 +48,7 @@ ethabi-contract = "9.0.0" ethabi-derive = "9.0.1" ethcore = { path = "..", features = ["test-helpers"] } ethkey = { path = "../../accounts/ethkey" } -kvdb-rocksdb = { version = "0.1.5" } +kvdb-rocksdb = "0.1.6" lazy_static = { version = "1.3" } spec = { path = "../spec" } tempdir = "0.3" diff --git a/ethcore/snapshot/snapshot-tests/Cargo.toml b/ethcore/snapshot/snapshot-tests/Cargo.toml index fbdfc2e7072..922f6e05ef4 100644 --- a/ethcore/snapshot/snapshot-tests/Cargo.toml +++ b/ethcore/snapshot/snapshot-tests/Cargo.toml @@ -23,8 +23,8 @@ hash-db = "0.15.0" journaldb = { path = "../../../util/journaldb" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../../util/keccak-hasher" } -kvdb = "0.1" -kvdb-rocksdb = { version = "0.1.5" } +kvdb = "0.1.1" +kvdb-rocksdb = "0.1.6" log = "0.4.8" parking_lot = "0.9" parity-crypto = { version = "0.4.2", features = ["publickey"] } diff --git a/ethcore/state-db/Cargo.toml b/ethcore/state-db/Cargo.toml index 64d173210be..e79f2e981b4 100644 --- a/ethcore/state-db/Cargo.toml +++ b/ethcore/state-db/Cargo.toml @@ -16,7 +16,7 @@ hash-db = "0.15.0" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } journaldb = { path = "../../util/journaldb" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4.6" lru-cache = "0.1.2" memory-cache = { path = "../../util/memory-cache" } diff --git a/ethcore/trace/Cargo.toml b/ethcore/trace/Cargo.toml index 73fe803a336..beed52e3feb 100644 --- a/ethcore/trace/Cargo.toml +++ b/ethcore/trace/Cargo.toml @@ -11,7 +11,7 @@ ethcore-blockchain = { path = "../blockchain" } ethcore-db = { path = "../db" } ethereum-types = "0.8.0" evm = { path = "../evm" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" parity-bytes = "0.1.0" parity-util-mem = "0.2.0" diff --git a/miner/local-store/Cargo.toml b/miner/local-store/Cargo.toml index 6af34096696..e59732f3d39 100644 --- a/miner/local-store/Cargo.toml +++ b/miner/local-store/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] common-types = { path = "../../ethcore/types" } ethcore-io = { path = "../../util/io" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" rlp = "0.4.0" serde = "1.0" diff --git a/secret-store/Cargo.toml b/secret-store/Cargo.toml index 37a8e1a5fae..ae6ea3f735c 100644 --- a/secret-store/Cargo.toml +++ b/secret-store/Cargo.toml @@ -20,7 +20,7 @@ ethereum-types = "0.8.0" futures = "0.1" hyper = { version = "0.12", default-features = false } keccak-hash = "0.4.0" -kvdb = "0.1" +kvdb = "0.1.1" lazy_static = "1.0" log = "0.4" parity-bytes = "0.1" @@ -45,7 +45,7 @@ env_logger = "0.5" ethkey = { path = "../accounts/ethkey" } ethcore = { path = "../ethcore", features = ["test-helpers"] } tempdir = "0.3" -kvdb-rocksdb = "0.1.5" +kvdb-rocksdb = "0.1.6" [features] accounts = ["ethcore-accounts"] diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml index d4ba964a2b9..f1b75b9e553 100644 --- a/util/journaldb/Cargo.toml +++ b/util/journaldb/Cargo.toml @@ -12,7 +12,7 @@ ethereum-types = "0.8.0" hash-db = "0.15.0" malloc_size_of = { version = "0.2", package = "parity-util-mem" } keccak-hasher = { path = "../keccak-hasher" } -kvdb = "0.1" +kvdb = "0.1.1" log = "0.4" memory-db = "0.15.0" parking_lot = "0.9" diff --git a/util/migration-rocksdb/Cargo.toml b/util/migration-rocksdb/Cargo.toml index 042dee68a32..f2567ef53b7 100644 --- a/util/migration-rocksdb/Cargo.toml +++ b/util/migration-rocksdb/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Parity Technologies "] [dependencies] log = "0.4" macros = { path = "../macros" } -kvdb = "0.1" -kvdb-rocksdb = "0.1.5" +kvdb = "0.1.1" +kvdb-rocksdb = "0.1.6" [dev-dependencies] tempdir = "0.3" diff --git a/util/migration-rocksdb/src/lib.rs b/util/migration-rocksdb/src/lib.rs index 4085d20bc11..feec90f1571 100644 --- a/util/migration-rocksdb/src/lib.rs +++ b/util/migration-rocksdb/src/lib.rs @@ -134,12 +134,7 @@ impl Migration for T { let migration_needed = col == SimpleMigration::migrated_column_index(self); let mut batch = Batch::new(config, col); - let iter = match source.iter(col) { - Some(iter) => iter, - None => return Ok(()), - }; - - for (key, value) in iter { + for (key, value) in source.iter(col) { if migration_needed { if let Some((key, value)) = self.simple_migrate(key.into_vec(), value.into_vec()) { batch.insert(key, value, dest)?; diff --git a/util/migration-rocksdb/tests/tests.rs b/util/migration-rocksdb/tests/tests.rs index 7458c2d3222..3fa638cd54a 100644 --- a/util/migration-rocksdb/tests/tests.rs +++ b/util/migration-rocksdb/tests/tests.rs @@ -116,7 +116,7 @@ impl Migration for AddsColumn { fn migrate(&mut self, source: Arc, config: &Config, dest: &mut Database, col: Option) -> io::Result<()> { let mut batch = Batch::new(config, col); - for (key, value) in source.iter(col).into_iter().flat_map(|inner| inner) { + for (key, value) in source.iter(col) { batch.insert(key.into_vec(), value.into_vec(), dest)?; } From 77462f287f474bce1eea31e3a5b263d1854f7f7c Mon Sep 17 00:00:00 2001 From: David Palm Date: Tue, 12 Nov 2019 18:30:13 +0100 Subject: [PATCH 02/14] Hint at how `parity db reset` works in the error message --- Cargo.lock | 4 ++-- ethcore/src/client/client.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5b4d855b5b0..f329f07cbdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2535,7 +2535,7 @@ dependencies = [ [[package]] name = "librocksdb-sys" version = "6.2.4" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#473b1671c75153502e980808d66cdeb3da7b7f73" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb#52ebdb5219b0559e0c0abd5144bbf490c627b90a" dependencies = [ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4067,7 +4067,7 @@ dependencies = [ [[package]] name = "rocksdb" version = "0.12.3" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#473b1671c75153502e980808d66cdeb3da7b7f73" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb#52ebdb5219b0559e0c0abd5144bbf490c627b90a" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "librocksdb-sys 6.2.4 (git+https://github.com/rust-rocksdb/rust-rocksdb)", diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index d29c8ac6f52..5295aa415fc 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -1309,9 +1309,9 @@ impl DatabaseRestore for Client { impl BlockChainReset for Client { fn reset(&self, num: u32) -> Result<(), String> { if num as u64 > self.pruning_history() { - return Err("Attempting to reset to block with pruned state".into()) + return Err(format!("Attempting to reset the chain {} blocks back failed: state is pruned (max available: {})", num, self.pruning_history()).into()) } else if num == 0 { - return Err("invalid number of blocks to reset".into()) + return Err("0 is an invalid number of blocks to reset".into()) } let mut blocks_to_delete = Vec::with_capacity(num as usize); From d1c94bbea16e47a8a6e1b07d57923e1e1aae9d76 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Mon, 18 Nov 2019 17:27:58 +0100 Subject: [PATCH 03/14] migration-rocksdb: fix build --- Cargo.lock | 14 +++++++------- util/migration-rocksdb/src/lib.rs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f329f07cbdd..6f0393a15ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2498,7 +2498,7 @@ dependencies = [ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rocksdb 0.12.3 (git+https://github.com/rust-rocksdb/rust-rocksdb)", + "rocksdb 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2535,7 +2535,7 @@ dependencies = [ [[package]] name = "librocksdb-sys" version = "6.2.4" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#52ebdb5219b0559e0c0abd5144bbf490c627b90a" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4066,11 +4066,11 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.12.3" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#52ebdb5219b0559e0c0abd5144bbf490c627b90a" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "librocksdb-sys 6.2.4 (git+https://github.com/rust-rocksdb/rust-rocksdb)", + "librocksdb-sys 6.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5609,7 +5609,7 @@ dependencies = [ "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" "checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" -"checksum librocksdb-sys 6.2.4 (git+https://github.com/rust-rocksdb/rust-rocksdb)" = "" +"checksum librocksdb-sys 6.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0785e816e1e11e7599388a492c61ef80ddc2afc91e313e61662cce537809be" "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" "checksum lock_api 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "775751a3e69bde4df9b38dd00a1b5d6ac13791e4223d4a0506577f0dd27cfb7a" "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" @@ -5725,7 +5725,7 @@ dependencies = [ "checksum ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "426bc186e3e95cac1e4a4be125a4aca7e84c2d616ffc02244eef36e2a60a093c" "checksum ripemd160 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" "checksum rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fa2f7f9c612d133da9101ef7bcd3e603ca7098901eca852e71f87a83dd3e6b59" -"checksum rocksdb 0.12.3 (git+https://github.com/rust-rocksdb/rust-rocksdb)" = "" +"checksum rocksdb 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12069b106981c6103d3eab7dd1c86751482d0779a520b7c14954c8b586c1e643" "checksum rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b273c91bd242ca03ad6d71c143b6f17a48790e61f21a6c78568fa2b6774a24a4" "checksum rprompt 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1601f32bc5858aae3cbfa1c645c96c4d820cc5c16be0194f089560c00b6eb625" "checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395" diff --git a/util/migration-rocksdb/src/lib.rs b/util/migration-rocksdb/src/lib.rs index feec90f1571..ed4aae4f12f 100644 --- a/util/migration-rocksdb/src/lib.rs +++ b/util/migration-rocksdb/src/lib.rs @@ -244,9 +244,9 @@ impl Manager { trace!(target: "migration", "Expecting database to contain {:?} columns", columns); let mut db_config = DatabaseConfig { max_open_files: 64, - memory_budget: None, compaction: config.compaction_profile, - columns: columns, + columns, + ..Default::default() }; let db_root = database_path(old_path); From 19ac58dbf6c420862a00d05f0c5462be44f30c18 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 19 Nov 2019 10:28:49 +0100 Subject: [PATCH 04/14] Cargo.toml: use git dependency instead of path --- Cargo.lock | 88 ++++++++++++++++++++++++++++-------------------------- Cargo.toml | 4 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f0393a15ca..d18ca792d5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -24,7 +24,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -574,7 +574,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethcore-miner 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "registrar 0.0.1", "stats 0.1.0", @@ -1117,9 +1117,9 @@ dependencies = [ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", - "kvdb-memorydb 0.1.2", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -1186,8 +1186,8 @@ dependencies = [ "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", - "kvdb-memorydb 0.1.2", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1244,7 +1244,7 @@ version = "0.1.0" dependencies = [ "common-types 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1292,8 +1292,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", - "kvdb-memorydb 0.1.2", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "memory-cache 0.1.0", @@ -1444,7 +1444,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1491,8 +1491,8 @@ dependencies = [ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-server-utils 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1527,8 +1527,8 @@ dependencies = [ "ethcore-private-tx 1.0.0", "ethcore-sync 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "snapshot 0.1.0", "spec 0.1.0", @@ -1571,7 +1571,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "macros 0.1.0", @@ -1744,7 +1744,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2320,8 +2320,8 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", - "kvdb-memorydb 0.1.2", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2472,27 +2472,30 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-bytes 0.1.1", + "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-memorydb" version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-rocksdb" version = "0.1.6" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#df8d61422ec0e92faaba8e91f0f9d685daa7af6f" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2717,8 +2720,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "migration-rocksdb" version = "0.1.0" dependencies = [ - "kvdb 0.1.1", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2859,7 +2862,7 @@ dependencies = [ "ethcore-network 1.12.0", "ethcore-network-devp2p 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3013,10 +3016,6 @@ name = "parity-bytes" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "parity-bytes" -version = "0.1.1" - [[package]] name = "parity-clib" version = "1.12.0" @@ -3103,8 +3102,8 @@ dependencies = [ "journaldb 0.2.0", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "migration-rocksdb 0.1.0", "node-filter 1.12.0", @@ -3194,8 +3193,8 @@ dependencies = [ "common-types 0.1.0", "ethcore-io 1.12.0", "ethkey 0.4.0", - "kvdb 0.1.1", - "kvdb-memorydb 0.1.2", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3588,7 +3587,7 @@ dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4330,8 +4329,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4376,8 +4375,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", - "kvdb-rocksdb 0.1.6", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4430,7 +4429,7 @@ dependencies = [ "instant-seal 0.1.0", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "null-engine 0.1.0", @@ -4468,7 +4467,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", @@ -4923,7 +4922,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "evm 0.1.0", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5155,7 +5154,7 @@ dependencies = [ "ethjson 0.1.0", "executive-state 0.1.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -5605,6 +5604,9 @@ dependencies = [ "checksum keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e563fa6fe52b2686094846118bf2cb2e6f75e6b8cec6c3aba09be8e835c7f998" "checksum keccak-hasher 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bf18164fd7ce989041f8fc4a1ae72a8bd1bec3575f2aeaf1d4968fc053aabef" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b2f251f01a7224426abdb2563707d856f7de995d821744fd8fa8e2874f69e3" +"checksum kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "296c12309ed36cb74d59206406adbf1971c3baa56d5410efdb508d8f1c60a351" +"checksum kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" diff --git a/Cargo.toml b/Cargo.toml index 7c85712aed4..1ad9a8ea2e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -137,6 +137,4 @@ members = [ ] [patch.crates-io] -kvdb-rocksdb = { path = "../parity-common/kvdb-rocksdb" } -kvdb-memorydb = { path = "../parity-common/kvdb-memorydb" } -kvdb = { path = "../parity-common/kvdb" } +kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } From 30433a370b057f4a1eb437889640349d10fd269d Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Mon, 25 Nov 2019 15:28:30 +0100 Subject: [PATCH 05/14] update to latest kvdb-rocksdb --- Cargo.lock | 80 ++++++++++++++++++---------------- Cargo.toml | 2 + parity/db/rocksdb/helpers.rs | 22 ++++++++-- parity/db/rocksdb/migration.rs | 2 +- parity/db/rocksdb/mod.rs | 2 +- 5 files changed, 66 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96b83f9a3dd..11573b3c58b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -24,7 +24,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -566,7 +566,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethcore-miner 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "registrar 0.0.1", "stats 0.1.0", @@ -1091,8 +1091,8 @@ dependencies = [ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1160,8 +1160,8 @@ dependencies = [ "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1218,7 +1218,7 @@ version = "0.1.0" dependencies = [ "common-types 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1266,8 +1266,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "memory-cache 0.1.0", @@ -1418,7 +1418,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1465,7 +1465,7 @@ dependencies = [ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-server-utils 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1501,7 +1501,7 @@ dependencies = [ "ethcore-private-tx 1.0.0", "ethcore-sync 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "snapshot 0.1.0", @@ -1545,7 +1545,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "macros 0.1.0", @@ -1718,7 +1718,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2293,8 +2293,8 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2445,30 +2445,30 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", ] [[package]] name = "kvdb-memorydb" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" dependencies = [ - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-rocksdb" version = "0.1.6" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#df8d61422ec0e92faaba8e91f0f9d685daa7af6f" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2693,7 +2693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "migration-rocksdb" version = "0.1.0" dependencies = [ - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", @@ -2835,7 +2835,7 @@ dependencies = [ "ethcore-network 1.12.0", "ethcore-network-devp2p 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2989,6 +2989,11 @@ name = "parity-bytes" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "parity-bytes" +version = "0.1.1" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" + [[package]] name = "parity-clib" version = "1.12.0" @@ -3075,7 +3080,7 @@ dependencies = [ "journaldb 0.2.0", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "migration-rocksdb 0.1.0", @@ -3166,8 +3171,8 @@ dependencies = [ "common-types 0.1.0", "ethcore-io 1.12.0", "ethkey 0.4.0", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3560,7 +3565,7 @@ dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4303,7 +4308,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4349,7 +4354,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4403,7 +4408,7 @@ dependencies = [ "instant-seal 0.1.0", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "null-engine 0.1.0", @@ -4441,7 +4446,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", @@ -4896,7 +4901,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "evm 0.1.0", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5128,7 +5133,7 @@ dependencies = [ "ethjson 0.1.0", "executive-state 0.1.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -5575,8 +5580,8 @@ dependencies = [ "checksum keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e563fa6fe52b2686094846118bf2cb2e6f75e6b8cec6c3aba09be8e835c7f998" "checksum keccak-hasher 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bf18164fd7ce989041f8fc4a1ae72a8bd1bec3575f2aeaf1d4968fc053aabef" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b2f251f01a7224426abdb2563707d856f7de995d821744fd8fa8e2874f69e3" -"checksum kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "296c12309ed36cb74d59206406adbf1971c3baa56d5410efdb508d8f1c60a351" +"checksum kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" +"checksum kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" "checksum kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" @@ -5627,6 +5632,7 @@ dependencies = [ "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5168b4cf41f3835e4bc6ffb32f51bc9365dc50cb351904595b3931d917fd0c" +"checksum parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" "checksum parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "27a9c2b525c93d717a234eb220c26474f8d97b08ac50d79faeac4cb6c74bf0b9" "checksum parity-daemonize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "69b1910b2793ff52713fca0a4ee92544ebec59ccd218ea74560be6f947b4ca77" "checksum parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5962540f99d3895d9addf535f37ab1397886bc2c68e59efd040ef458e5f8c3f7" diff --git a/Cargo.toml b/Cargo.toml index 1ad9a8ea2e6..408da3df498 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,3 +138,5 @@ members = [ [patch.crates-io] kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } +kvdb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } +kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } diff --git a/parity/db/rocksdb/helpers.rs b/parity/db/rocksdb/helpers.rs index 9829cb5a62c..3308bbb31e8 100644 --- a/parity/db/rocksdb/helpers.rs +++ b/parity/db/rocksdb/helpers.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity Ethereum. If not, see . +use std::collections::HashMap; use std::path::Path; -use ethcore_db::NUM_COLUMNS; use ethcore::client::{ClientConfig, DatabaseCompactionProfile}; use super::kvdb_rocksdb::{CompactionProfile, DatabaseConfig}; @@ -27,10 +27,26 @@ pub fn compaction_profile(profile: &DatabaseCompactionProfile, db_path: &Path) - } } +pub fn memory_per_column(total: Option) -> HashMap, usize> { + let mut memory_per_column = HashMap::new(); + if let Some(budget) = total { + // spend 90% of the memory budget on the state column, but at least 256 MiB + memory_per_column.insert(ethcore_db::COL_STATE, std::cmp::max(budget * 9 / 10, 256)); + let num_columns = ethcore_db::NUM_COLUMNS.expect("NUM_COLUMNS is Some; qed"); + // spread the remaining 10% evenly across columns + let rest_budget = budget / 10 / (num_columns as usize - 1); + for i in 1..num_columns { + // but at least 16 MiB for each column + memory_per_column.insert(Some(i), std::cmp::max(rest_budget, 16)); + } + } + memory_per_column +} + pub fn client_db_config(client_path: &Path, client_config: &ClientConfig) -> DatabaseConfig { - let mut client_db_config = DatabaseConfig::with_columns(NUM_COLUMNS); + let mut client_db_config = DatabaseConfig::with_columns(ethcore_db::NUM_COLUMNS); - client_db_config.memory_budget = client_config.db_cache_size; + client_db_config.memory_budget = memory_per_column(client_config.db_cache_size); client_db_config.compaction = compaction_profile(&client_config.db_compaction, &client_path); client_db_config diff --git a/parity/db/rocksdb/migration.rs b/parity/db/rocksdb/migration.rs index f9e92570b5e..365818b964c 100644 --- a/parity/db/rocksdb/migration.rs +++ b/parity/db/rocksdb/migration.rs @@ -224,9 +224,9 @@ pub fn migrate(path: &Path, compaction_profile: &DatabaseCompactionProfile) -> R println!("Migrating blooms to blooms-db..."); let db_config = DatabaseConfig { max_open_files: 64, - memory_budget: None, compaction: compaction_profile, columns: ethcore_db::NUM_COLUMNS, + ..Default::default() }; migrate_blooms(&db_path, &db_config).map_err(Error::BloomsDB)?; diff --git a/parity/db/rocksdb/mod.rs b/parity/db/rocksdb/mod.rs index bf56b4d29ee..a6c06f8260e 100644 --- a/parity/db/rocksdb/mod.rs +++ b/parity/db/rocksdb/mod.rs @@ -95,7 +95,7 @@ pub fn open_db( let path = Path::new(client_path); let db_config = DatabaseConfig { - memory_budget: Some(cache_config.blockchain() as usize * 1024 * 1024), + memory_budget: helpers::memory_per_column(Some(cache_config.blockchain() as usize)), compaction: helpers::compaction_profile(&compaction, path), .. DatabaseConfig::with_columns(NUM_COLUMNS) }; From c00c80cbeede0099ff09749e25c6495e71f35566 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Mon, 25 Nov 2019 15:39:06 +0100 Subject: [PATCH 06/14] fix tests --- ethcore/service/src/service.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethcore/service/src/service.rs b/ethcore/service/src/service.rs index 597ee6d3d4e..a7b4f10ab8c 100644 --- a/ethcore/service/src/service.rs +++ b/ethcore/service/src/service.rs @@ -293,6 +293,7 @@ where #[cfg(test)] mod tests { + use std::collections::HashMap; use std::sync::Arc; use std::{time, thread}; @@ -314,10 +315,9 @@ mod tests { let client_path = tempdir.path().join("client"); let snapshot_path = tempdir.path().join("snapshot"); - let client_config = ClientConfig::default(); let mut client_db_config = DatabaseConfig::with_columns(NUM_COLUMNS); - client_db_config.memory_budget = client_config.db_cache_size; + client_db_config.memory_budget = HashMap::new(); client_db_config.compaction = CompactionProfile::auto(&client_path); let client_db_handler = test_helpers::restoration_db_handler(client_db_config.clone()); From 0e6b6b1ea430665ce5cdd8d9650c3aaaba016276 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Mon, 25 Nov 2019 15:39:41 +0100 Subject: [PATCH 07/14] saner default for light client --- parity/db/rocksdb/helpers.rs | 12 ++++++++++++ parity/db/rocksdb/mod.rs | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/parity/db/rocksdb/helpers.rs b/parity/db/rocksdb/helpers.rs index 3308bbb31e8..3d7da968d16 100644 --- a/parity/db/rocksdb/helpers.rs +++ b/parity/db/rocksdb/helpers.rs @@ -43,6 +43,18 @@ pub fn memory_per_column(total: Option) -> HashMap, usize> { memory_per_column } +pub fn memory_per_column_light(total: usize) -> HashMap, usize> { + let mut memory_per_column = HashMap::new(); + let num_columns = ethcore_db::NUM_COLUMNS.expect("NUM_COLUMNS is Some; qed"); + // spread the memory budget evenly across columns + let per_column = total / (num_columns as usize); + for i in 1..num_columns { + // but at least 4 MiB for each column + memory_per_column.insert(Some(i), std::cmp::max(per_column, 4)); + } + memory_per_column +} + pub fn client_db_config(client_path: &Path, client_config: &ClientConfig) -> DatabaseConfig { let mut client_db_config = DatabaseConfig::with_columns(ethcore_db::NUM_COLUMNS); diff --git a/parity/db/rocksdb/mod.rs b/parity/db/rocksdb/mod.rs index a6c06f8260e..b755f3b8b23 100644 --- a/parity/db/rocksdb/mod.rs +++ b/parity/db/rocksdb/mod.rs @@ -95,7 +95,7 @@ pub fn open_db( let path = Path::new(client_path); let db_config = DatabaseConfig { - memory_budget: helpers::memory_per_column(Some(cache_config.blockchain() as usize)), + memory_budget: helpers::memory_per_column_light(cache_config.blockchain() as usize), compaction: helpers::compaction_profile(&compaction, path), .. DatabaseConfig::with_columns(NUM_COLUMNS) }; From f0029cba7d75f2efe77c56eeff981bfe263eb7e7 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Mon, 25 Nov 2019 15:48:33 +0100 Subject: [PATCH 08/14] rename open_db to open_db_light --- parity/blockchain.rs | 8 +++++--- parity/db/mod.rs | 2 +- parity/db/rocksdb/mod.rs | 4 ++-- parity/export_hardcoded_sync.rs | 8 +++++--- parity/run.rs | 8 +++++--- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/parity/blockchain.rs b/parity/blockchain.rs index 45baaaeba54..cb19c4c00ee 100644 --- a/parity/blockchain.rs +++ b/parity/blockchain.rs @@ -205,9 +205,11 @@ fn execute_import_light(cmd: ImportBlockchain) -> Result<(), String> { config.queue.verifier_settings = cmd.verifier_settings; // initialize database. - let db = db::open_db(&client_path.to_str().expect("DB path could not be converted to string."), - &cmd.cache_config, - &cmd.compaction).map_err(|e| format!("Failed to open database: {:?}", e))?; + let db = db::open_db_light( + &client_path.to_str().expect("DB path could not be converted to string."), + &cmd.cache_config, + &cmd.compaction, + ).map_err(|e| format!("Failed to open database: {:?}", e))?; // TODO: could epoch signals be available at the end of the file? let fetch = ::light::client::fetch::unavailable(); diff --git a/parity/db/mod.rs b/parity/db/mod.rs index 9b46624425b..da079d35744 100644 --- a/parity/db/mod.rs +++ b/parity/db/mod.rs @@ -19,7 +19,7 @@ #[path="rocksdb/mod.rs"] mod impls; -pub use self::impls::{open_db, restoration_db_handler, migrate}; +pub use self::impls::{open_db_light, restoration_db_handler, migrate}; #[cfg(feature = "secretstore")] pub use self::impls::open_secretstore_db; diff --git a/parity/db/rocksdb/mod.rs b/parity/db/rocksdb/mod.rs index b755f3b8b23..e22fbaa6f47 100644 --- a/parity/db/rocksdb/mod.rs +++ b/parity/db/rocksdb/mod.rs @@ -86,8 +86,8 @@ pub fn restoration_db_handler(client_path: &Path, client_config: &ClientConfig) }) } -/// Open a new main DB. -pub fn open_db( +/// Open a new light client DB. +pub fn open_db_light( client_path: &str, cache_config: &CacheConfig, compaction: &DatabaseCompactionProfile diff --git a/parity/export_hardcoded_sync.rs b/parity/export_hardcoded_sync.rs index 3d914f8537a..67250e38d79 100644 --- a/parity/export_hardcoded_sync.rs +++ b/parity/export_hardcoded_sync.rs @@ -86,9 +86,11 @@ pub fn execute(cmd: ExportHsyncCmd) -> Result { config.queue.max_mem_use = cmd.cache_config.queue() as usize * 1024 * 1024; // initialize database. - let db = db::open_db(&db_dirs.client_path(algorithm).to_str().expect("DB path could not be converted to string."), - &cmd.cache_config, - &cmd.compaction).map_err(|e| format!("Failed to open database {:?}", e))?; + let db = db::open_db_light( + &db_dirs.client_path(algorithm).to_str().expect("DB path could not be converted to string."), + &cmd.cache_config, + &cmd.compaction, + ).map_err(|e| format!("Failed to open database {:?}", e))?; let service = light_client::Service::start(config, &spec, UnavailableDataFetcher, db, cache) .map_err(|e| format!("Error starting light client: {}", e))?; diff --git a/parity/run.rs b/parity/run.rs index ca1638fbf40..7837dbd7208 100644 --- a/parity/run.rs +++ b/parity/run.rs @@ -253,9 +253,11 @@ fn execute_light_impl(cmd: RunCmd, logger: Arc, on_client_rq }; // initialize database. - let db = db::open_db(&db_dirs.client_path(algorithm).to_str().expect("DB path could not be converted to string."), - &cmd.cache_config, - &cmd.compaction).map_err(|e| format!("Failed to open database {:?}", e))?; + let db = db::open_db_light( + &db_dirs.client_path(algorithm).to_str().expect("DB path could not be converted to string."), + &cmd.cache_config, + &cmd.compaction, + ).map_err(|e| format!("Failed to open database {:?}", e))?; let service = light_client::Service::start(config, &spec, fetch, db, cache.clone()) .map_err(|e| format!("Error starting light client: {}", e))?; From ebac589aa2c9f54b5a075646a0e47da397c6e16c Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 26 Nov 2019 15:57:22 +0100 Subject: [PATCH 09/14] update to latest kvdb-rocksdb --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11573b3c58b..9b142f3a4fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", @@ -2454,7 +2454,7 @@ dependencies = [ [[package]] name = "kvdb-memorydb" version = "0.1.2" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" dependencies = [ "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2463,7 +2463,7 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" version = "0.1.6" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2992,7 +2992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-bytes" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#03a2ba08f47f4af4219280e660a1ea92cb8896bd" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" [[package]] name = "parity-clib" From e6be5c7bf759ddd552342ad7830e96a8128bcf03 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 26 Nov 2019 16:56:21 +0100 Subject: [PATCH 10/14] moar update to latest kvdb-rocksdb --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b142f3a4fa..7fefa6a31dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", @@ -2454,7 +2454,7 @@ dependencies = [ [[package]] name = "kvdb-memorydb" version = "0.1.2" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" dependencies = [ "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2463,7 +2463,7 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" version = "0.1.6" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2992,7 +2992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-bytes" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#1739d8a43336121df0e62cfd6d9bed9ecd32cb9e" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" [[package]] name = "parity-clib" From a70b3f7024c5e97a7bb060b7dd91a7e4e1d87bc8 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 27 Nov 2019 14:51:28 +0100 Subject: [PATCH 11/14] even moar update to latest kvdb-rocksdb --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fefa6a31dc..3c18d7c999d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2445,7 +2445,7 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", @@ -2454,7 +2454,7 @@ dependencies = [ [[package]] name = "kvdb-memorydb" version = "0.1.2" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" dependencies = [ "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2463,7 +2463,7 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" version = "0.1.6" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2992,7 +2992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-bytes" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#87d0aecd3969837987599111fc6a4a19a0a69f61" +source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" [[package]] name = "parity-clib" From 62cc7607a90c8533354a867bafd382a8ff61afef Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Thu, 28 Nov 2019 16:15:11 +0100 Subject: [PATCH 12/14] use kvdb-rocksdb from crates.io --- Cargo.lock | 98 ++++++++++------------ Cargo.toml | 8 +- ethcore/Cargo.toml | 6 +- ethcore/account-db/Cargo.toml | 2 +- ethcore/account-state/Cargo.toml | 2 +- ethcore/blockchain/Cargo.toml | 2 +- ethcore/client-traits/Cargo.toml | 2 +- ethcore/db/Cargo.toml | 2 +- ethcore/engines/validator-set/Cargo.toml | 2 +- ethcore/executive-state/Cargo.toml | 2 +- ethcore/light/Cargo.toml | 2 +- ethcore/pod/Cargo.toml | 2 +- ethcore/private-tx/Cargo.toml | 2 +- ethcore/service/Cargo.toml | 4 +- ethcore/snapshot/Cargo.toml | 4 +- ethcore/snapshot/snapshot-tests/Cargo.toml | 4 +- ethcore/state-db/Cargo.toml | 2 +- ethcore/trace/Cargo.toml | 2 +- miner/local-store/Cargo.toml | 2 +- secret-store/Cargo.toml | 4 +- util/journaldb/Cargo.toml | 2 +- util/migration-rocksdb/Cargo.toml | 4 +- 22 files changed, 75 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c18d7c999d..b456ee63aae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -24,7 +24,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -566,7 +566,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethcore-miner 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "registrar 0.0.1", "stats 0.1.0", @@ -1091,9 +1091,9 @@ dependencies = [ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -1160,8 +1160,8 @@ dependencies = [ "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1218,7 +1218,7 @@ version = "0.1.0" dependencies = [ "common-types 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1266,8 +1266,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "memory-cache 0.1.0", @@ -1418,7 +1418,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1465,8 +1465,8 @@ dependencies = [ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-server-utils 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1501,8 +1501,8 @@ dependencies = [ "ethcore-private-tx 1.0.0", "ethcore-sync 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "snapshot 0.1.0", "spec 0.1.0", @@ -1545,7 +1545,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "macros 0.1.0", @@ -1718,7 +1718,7 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2293,8 +2293,8 @@ dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2445,30 +2445,30 @@ dependencies = [ [[package]] name = "kvdb" version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-memorydb" version = "0.1.2" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "kvdb-rocksdb" -version = "0.1.6" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2693,8 +2693,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "migration-rocksdb" version = "0.1.0" dependencies = [ - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2835,7 +2835,7 @@ dependencies = [ "ethcore-network 1.12.0", "ethcore-network-devp2p 1.12.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2989,11 +2989,6 @@ name = "parity-bytes" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "parity-bytes" -version = "0.1.1" -source = "git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2#7eeaf7b499be306403402087df2758558f29841a" - [[package]] name = "parity-clib" version = "1.12.0" @@ -3080,8 +3075,8 @@ dependencies = [ "journaldb 0.2.0", "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "migration-rocksdb 0.1.0", "node-filter 1.12.0", @@ -3171,8 +3166,8 @@ dependencies = [ "common-types 0.1.0", "ethcore-io 1.12.0", "ethkey 0.4.0", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3565,7 +3560,7 @@ dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4308,8 +4303,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4354,8 +4349,8 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", - "kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4408,7 +4403,7 @@ dependencies = [ "instant-seal 0.1.0", "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", "null-engine 0.1.0", @@ -4446,7 +4441,7 @@ dependencies = [ "journaldb 0.2.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.1.1", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-cache 0.1.0", @@ -4901,7 +4896,7 @@ dependencies = [ "ethcore-db 0.1.0", "ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "evm 0.1.0", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-util-mem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5133,7 +5128,7 @@ dependencies = [ "ethjson 0.1.0", "executive-state 0.1.0", "keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)", + "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "machine 0.1.0", @@ -5580,9 +5575,9 @@ dependencies = [ "checksum keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e563fa6fe52b2686094846118bf2cb2e6f75e6b8cec6c3aba09be8e835c7f998" "checksum keccak-hasher 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bf18164fd7ce989041f8fc4a1ae72a8bd1bec3575f2aeaf1d4968fc053aabef" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum kvdb 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" -"checksum kvdb-memorydb 0.1.2 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" -"checksum kvdb-rocksdb 0.1.6 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" +"checksum kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c1b2f251f01a7224426abdb2563707d856f7de995d821744fd8fa8e2874f69e3" +"checksum kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "296c12309ed36cb74d59206406adbf1971c3baa56d5410efdb508d8f1c60a351" +"checksum kvdb-rocksdb 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3f82177237c1ae67d6ab208a6f790cab569a1d81c1ba02348e0736a99510be3" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" @@ -5632,7 +5627,6 @@ dependencies = [ "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5168b4cf41f3835e4bc6ffb32f51bc9365dc50cb351904595b3931d917fd0c" -"checksum parity-bytes 0.1.1 (git+https://github.com/paritytech/parity-common?branch=ao-rocksdb-switch-to-upstream2)" = "" "checksum parity-crypto 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "27a9c2b525c93d717a234eb220c26474f8d97b08ac50d79faeac4cb6c74bf0b9" "checksum parity-daemonize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "69b1910b2793ff52713fca0a4ee92544ebec59ccd218ea74560be6f947b4ca77" "checksum parity-path 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5962540f99d3895d9addf535f37ab1397886bc2c68e59efd040ef458e5f8c3f7" diff --git a/Cargo.toml b/Cargo.toml index 408da3df498..25839dd970d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,8 +39,8 @@ futures = "0.1" journaldb = { path = "util/journaldb" } jsonrpc-core = "14.0.3" keccak-hash = "0.4.0" -kvdb = "0.1.1" -kvdb-rocksdb = "0.1.6" +kvdb = "0.1" +kvdb-rocksdb = "0.2.0" log = "0.4" migration-rocksdb = { path = "util/migration-rocksdb" } node-filter = { path = "ethcore/node-filter" } @@ -136,7 +136,3 @@ members = [ "parity-clib", ] -[patch.crates-io] -kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } -kvdb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } -kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", branch = "ao-rocksdb-switch-to-upstream2" } diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index f56c3090b61..2095cfd7ea1 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -31,9 +31,9 @@ hash-db = "0.15.0" itertools = "0.5" journaldb = { path = "../util/journaldb" } keccak-hash = "0.4.0" -kvdb = "0.1.1" +kvdb = "0.1" kvdb-memorydb = { version = "0.1.2", optional = true } -kvdb-rocksdb = { version = "0.1.6", optional = true } +kvdb-rocksdb = { version = "0.2.0", optional = true } lazy_static = { version = "1.3", optional = true } log = "0.4" macros = { path = "../util/macros", optional = true } @@ -80,7 +80,7 @@ ethjson = { path = "../json", features = ["test-helpers"] } parity-crypto = { version = "0.4.2", features = ["publickey"] } fetch = { path = "../util/fetch" } kvdb-memorydb = "0.1.2" -kvdb-rocksdb = "0.1.6" +kvdb-rocksdb = "0.2.0" lazy_static = "1.3" machine = { path = "./machine", features = ["test-helpers"] } macros = { path = "../util/macros" } diff --git a/ethcore/account-db/Cargo.toml b/ethcore/account-db/Cargo.toml index 546d9b17f50..c1a18bf1057 100644 --- a/ethcore/account-db/Cargo.toml +++ b/ethcore/account-db/Cargo.toml @@ -11,5 +11,5 @@ ethereum-types = "0.8.0" hash-db = "0.15.0" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" rlp = "0.4" diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml index c50d1fc608d..96edfd88bee 100644 --- a/ethcore/account-state/Cargo.toml +++ b/ethcore/account-state/Cargo.toml @@ -16,7 +16,7 @@ hash-db = "0.15.0" journaldb = { path = "../../util/journaldb" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" lru-cache = "0.1.2" memory-db = "0.15.0" diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml index 64511bf0e98..3eb0b2ecb3e 100644 --- a/ethcore/blockchain/Cargo.toml +++ b/ethcore/blockchain/Cargo.toml @@ -16,7 +16,7 @@ ethereum-types = "0.8.0" keccak-hash = "0.4.0" parity-util-mem = "0.2.0" itertools = "0.5" -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" parity-bytes = "0.1" rand = "0.7" diff --git a/ethcore/client-traits/Cargo.toml b/ethcore/client-traits/Cargo.toml index 4bc525bdf0b..611d00bed59 100644 --- a/ethcore/client-traits/Cargo.toml +++ b/ethcore/client-traits/Cargo.toml @@ -15,7 +15,7 @@ common-types = { path = "../types" } ethcore-db = { path = "../db" } ethcore-miner = { path = "../../miner" } ethereum-types = "0.8.0" -kvdb = "0.1.1" +kvdb = "0.1" registrar = { path = "../../util/registrar" } stats = { path = "../../util/stats" } trace = { path = "../trace" } diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml index fff21e62f65..7fb7a03bb57 100644 --- a/ethcore/db/Cargo.toml +++ b/ethcore/db/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] common-types = { path = "../types" } ethereum-types = "0.8.0" -kvdb = "0.1.1" +kvdb = "0.1" parity-util-mem = "0.2.0" parking_lot = "0.9" rlp = "0.4.0" diff --git a/ethcore/engines/validator-set/Cargo.toml b/ethcore/engines/validator-set/Cargo.toml index 8bc3dd47ecc..958ea4b480d 100644 --- a/ethcore/engines/validator-set/Cargo.toml +++ b/ethcore/engines/validator-set/Cargo.toml @@ -17,7 +17,7 @@ ethereum-types = "0.8.0" ethjson = { path = "../../../json" } executive-state = { path = "../../executive-state" } keccak-hash = "0.4.0" -kvdb = "0.1.1" +kvdb = "0.1" lazy_static = "1.3.0" log = "0.4.8" machine = { path = "../../machine" } diff --git a/ethcore/executive-state/Cargo.toml b/ethcore/executive-state/Cargo.toml index 71e604f7c50..2b8dfe10c6d 100644 --- a/ethcore/executive-state/Cargo.toml +++ b/ethcore/executive-state/Cargo.toml @@ -14,7 +14,7 @@ common-types = { path = "../types" } ethereum-types = "0.8.0" hash-db = "0.15.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4.8" machine = { path = "../machine" } trace = { path = "../trace" } diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index d682d2d2032..a1756d6c1b1 100644 --- a/ethcore/light/Cargo.toml +++ b/ethcore/light/Cargo.toml @@ -43,7 +43,7 @@ stats = { path = "../../util/stats" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" } -kvdb = "0.1.1" +kvdb = "0.1" memory-cache = { path = "../../util/memory-cache" } journaldb = { path = "../../util/journaldb" } verification = { path = "../verification" } diff --git a/ethcore/pod/Cargo.toml b/ethcore/pod/Cargo.toml index c9bf2a58a2a..a22453f5a92 100644 --- a/ethcore/pod/Cargo.toml +++ b/ethcore/pod/Cargo.toml @@ -15,7 +15,7 @@ hash-db = "0.15.0" itertools = "0.8" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" parity-bytes = "0.1.0" rlp = "0.4" diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml index 9fda675faa8..2a7580b6b69 100644 --- a/ethcore/private-tx/Cargo.toml +++ b/ethcore/private-tx/Cargo.toml @@ -26,7 +26,7 @@ parity-util-mem = "0.2.0" hash-db = "0.15.0" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" machine = { path = "../machine" } journaldb = { path = "../../util/journaldb" } diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index 078c1b39448..d39af202c82 100644 --- a/ethcore/service/Cargo.toml +++ b/ethcore/service/Cargo.toml @@ -14,7 +14,7 @@ ethcore-io = { path = "../../util/io" } ethcore-private-tx = { path = "../private-tx" } ethcore-sync = { path = "../sync" } ethereum-types = "0.8.0" -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" snapshot = { path = "../snapshot" } spec = { path = "../spec" } @@ -23,5 +23,5 @@ trace-time = "0.1" [dev-dependencies] ethcore = { path = "..", features = ["test-helpers"] } ethcore-db = { path = "../db" } -kvdb-rocksdb = "0.1.6" +kvdb-rocksdb = "0.2.0" tempdir = "0.3" diff --git a/ethcore/snapshot/Cargo.toml b/ethcore/snapshot/Cargo.toml index 1da45b14c7d..1c89f971d12 100644 --- a/ethcore/snapshot/Cargo.toml +++ b/ethcore/snapshot/Cargo.toml @@ -29,7 +29,7 @@ itertools = "0.5" journaldb = { path = "../../util/journaldb" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4.8" num_cpus = "1.10.1" rand = "0.7" @@ -53,7 +53,7 @@ ethabi-contract = "9.0.0" ethabi-derive = "9.0.1" ethcore = { path = "..", features = ["test-helpers"] } ethkey = { path = "../../accounts/ethkey" } -kvdb-rocksdb = "0.1.6" +kvdb-rocksdb = "0.2.0" lazy_static = { version = "1.3" } spec = { path = "../spec" } tempdir = "0.3" diff --git a/ethcore/snapshot/snapshot-tests/Cargo.toml b/ethcore/snapshot/snapshot-tests/Cargo.toml index cf9aa0368c6..ffa41dc74e7 100644 --- a/ethcore/snapshot/snapshot-tests/Cargo.toml +++ b/ethcore/snapshot/snapshot-tests/Cargo.toml @@ -23,8 +23,8 @@ hash-db = "0.15.0" journaldb = { path = "../../../util/journaldb" } keccak-hash = "0.4.0" keccak-hasher = { path = "../../../util/keccak-hasher" } -kvdb = "0.1.1" -kvdb-rocksdb = "0.1.6" +kvdb = "0.1" +kvdb-rocksdb = "0.2.0" log = "0.4.8" parking_lot = "0.9" parity-crypto = { version = "0.4.2", features = ["publickey"] } diff --git a/ethcore/state-db/Cargo.toml b/ethcore/state-db/Cargo.toml index e79f2e981b4..64d173210be 100644 --- a/ethcore/state-db/Cargo.toml +++ b/ethcore/state-db/Cargo.toml @@ -16,7 +16,7 @@ hash-db = "0.15.0" keccak-hash = "0.4.0" keccak-hasher = { path = "../../util/keccak-hasher" } journaldb = { path = "../../util/journaldb" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4.6" lru-cache = "0.1.2" memory-cache = { path = "../../util/memory-cache" } diff --git a/ethcore/trace/Cargo.toml b/ethcore/trace/Cargo.toml index beed52e3feb..73fe803a336 100644 --- a/ethcore/trace/Cargo.toml +++ b/ethcore/trace/Cargo.toml @@ -11,7 +11,7 @@ ethcore-blockchain = { path = "../blockchain" } ethcore-db = { path = "../db" } ethereum-types = "0.8.0" evm = { path = "../evm" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" parity-bytes = "0.1.0" parity-util-mem = "0.2.0" diff --git a/miner/local-store/Cargo.toml b/miner/local-store/Cargo.toml index e59732f3d39..6af34096696 100644 --- a/miner/local-store/Cargo.toml +++ b/miner/local-store/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] common-types = { path = "../../ethcore/types" } ethcore-io = { path = "../../util/io" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" rlp = "0.4.0" serde = "1.0" diff --git a/secret-store/Cargo.toml b/secret-store/Cargo.toml index ae6ea3f735c..35ddc90f999 100644 --- a/secret-store/Cargo.toml +++ b/secret-store/Cargo.toml @@ -20,7 +20,7 @@ ethereum-types = "0.8.0" futures = "0.1" hyper = { version = "0.12", default-features = false } keccak-hash = "0.4.0" -kvdb = "0.1.1" +kvdb = "0.1" lazy_static = "1.0" log = "0.4" parity-bytes = "0.1" @@ -45,7 +45,7 @@ env_logger = "0.5" ethkey = { path = "../accounts/ethkey" } ethcore = { path = "../ethcore", features = ["test-helpers"] } tempdir = "0.3" -kvdb-rocksdb = "0.1.6" +kvdb-rocksdb = "0.2.0" [features] accounts = ["ethcore-accounts"] diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml index f1b75b9e553..d4ba964a2b9 100644 --- a/util/journaldb/Cargo.toml +++ b/util/journaldb/Cargo.toml @@ -12,7 +12,7 @@ ethereum-types = "0.8.0" hash-db = "0.15.0" malloc_size_of = { version = "0.2", package = "parity-util-mem" } keccak-hasher = { path = "../keccak-hasher" } -kvdb = "0.1.1" +kvdb = "0.1" log = "0.4" memory-db = "0.15.0" parking_lot = "0.9" diff --git a/util/migration-rocksdb/Cargo.toml b/util/migration-rocksdb/Cargo.toml index f2567ef53b7..b88f6c137de 100644 --- a/util/migration-rocksdb/Cargo.toml +++ b/util/migration-rocksdb/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Parity Technologies "] [dependencies] log = "0.4" macros = { path = "../macros" } -kvdb = "0.1.1" -kvdb-rocksdb = "0.1.6" +kvdb = "0.1" +kvdb-rocksdb = "0.2.0" [dev-dependencies] tempdir = "0.3" From 29515846cbcf1d840f5dd58550fdcf8ab9080ade Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 3 Dec 2019 15:33:08 +0100 Subject: [PATCH 13/14] Update parity/db/rocksdb/helpers.rs --- parity/db/rocksdb/helpers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parity/db/rocksdb/helpers.rs b/parity/db/rocksdb/helpers.rs index 3d7da968d16..b53c1f8717a 100644 --- a/parity/db/rocksdb/helpers.rs +++ b/parity/db/rocksdb/helpers.rs @@ -47,7 +47,7 @@ pub fn memory_per_column_light(total: usize) -> HashMap, usize> { let mut memory_per_column = HashMap::new(); let num_columns = ethcore_db::NUM_COLUMNS.expect("NUM_COLUMNS is Some; qed"); // spread the memory budget evenly across columns - let per_column = total / (num_columns as usize); + let per_column = total / (num_columns as usize - 1); for i in 1..num_columns { // but at least 4 MiB for each column memory_per_column.insert(Some(i), std::cmp::max(per_column, 4)); From 10028796d209aa3ee5f33286514f144d83f1ddee Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 3 Dec 2019 15:42:42 +0100 Subject: [PATCH 14/14] add docs to memory_budget division --- parity/db/rocksdb/helpers.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/parity/db/rocksdb/helpers.rs b/parity/db/rocksdb/helpers.rs index b53c1f8717a..2291cc2f9ac 100644 --- a/parity/db/rocksdb/helpers.rs +++ b/parity/db/rocksdb/helpers.rs @@ -27,6 +27,8 @@ pub fn compaction_profile(profile: &DatabaseCompactionProfile, db_path: &Path) - } } +/// Spreads the `total` (in MiB) memory budget across the db columns. +/// If it's `None`, the default memory budget will be used for each column. pub fn memory_per_column(total: Option) -> HashMap, usize> { let mut memory_per_column = HashMap::new(); if let Some(budget) = total { @@ -43,10 +45,12 @@ pub fn memory_per_column(total: Option) -> HashMap, usize> { memory_per_column } +/// Spreads the `total` (in MiB) memory budget across the light db columns. pub fn memory_per_column_light(total: usize) -> HashMap, usize> { let mut memory_per_column = HashMap::new(); let num_columns = ethcore_db::NUM_COLUMNS.expect("NUM_COLUMNS is Some; qed"); // spread the memory budget evenly across columns + // light client doesn't use the state column let per_column = total / (num_columns as usize - 1); for i in 1..num_columns { // but at least 4 MiB for each column