Switch to new kvdb-rocksdb (#4186)

* Switch to new rocksdb with some hacks to resolve linking errors

Rocksdb and `wasmtime-environ` both link `zstd`. In the final link step,
this leads to linking errors because of duplicate symbols. The linked
Rocksdb fixes this by using `zstd-sys` as well. However, this currently
also requires modifications in `zstd-sys`. Someone will need to come up
with a better implementation.

* Switch to new version of kvdb-rocksdb

* Update client/db/src/utils.rs

Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
Bastian Köcher
2019-11-23 23:28:42 +01:00
committed by GitHub
parent 1c9316a6c1
commit f0fc2d89d2
8 changed files with 89 additions and 88 deletions
+2 -2
View File
@@ -18,7 +18,7 @@ header-metadata = { package = "substrate-header-metadata", path = "../header-met
hex-literal = { version = "0.2.1" }
inherents = { package = "substrate-inherents", path = "../../primitives/inherents", default-features = false }
keyring = { package = "substrate-keyring", path = "../../primitives/keyring" }
kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
kvdb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
log = { version = "0.4.8" }
parking_lot = { version = "0.9.0" }
primitives = { package = "substrate-primitives", path = "../../primitives/core", default-features = false }
@@ -36,6 +36,6 @@ tempfile = "3.1.0"
client-db = { package = "substrate-client-db", path = ".././db", features = ["kvdb-rocksdb"] }
test-primitives = { package = "substrate-test-primitives", path = "../../test/utils/primitives" }
test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
panic-handler = { package = "substrate-panic-handler", path = "../../primitives/panic-handler" }