From ba5f561e96f499f9f4499fbdb98048ad92eb68be Mon Sep 17 00:00:00 2001 From: Qinfan Wu Date: Tue, 21 Apr 2020 07:38:51 -0700 Subject: [PATCH] [Storage] Use rust-rocksdb Closes: #3524 Approved by: msmouse --- Cargo.lock | 12 ++++++------ storage/schemadb/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d513efcb01d..593e548afa0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2782,7 +2782,7 @@ dependencies = [ [[package]] name = "librocksdb-sys" version = "6.7.3" -source = "git+https://github.com/wqfish/rust-rocksdb.git?branch=ro#984306b677428131209e16a9e9660d9413b7072b" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=4ee65f451be26702df266ee8035240efc50fd902#4ee65f451be26702df266ee8035240efc50fd902" dependencies = [ "bindgen 0.53.2 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4195,10 +4195,10 @@ dependencies = [ [[package]] name = "rocksdb" version = "0.13.0" -source = "git+https://github.com/wqfish/rust-rocksdb.git?branch=ro#984306b677428131209e16a9e9660d9413b7072b" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=4ee65f451be26702df266ee8035240efc50fd902#4ee65f451be26702df266ee8035240efc50fd902" dependencies = [ "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", - "librocksdb-sys 6.7.3 (git+https://github.com/wqfish/rust-rocksdb.git?branch=ro)", + "librocksdb-sys 6.7.3 (git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=4ee65f451be26702df266ee8035240efc50fd902)", ] [[package]] @@ -4365,7 +4365,7 @@ dependencies = [ "libra-workspace-hack 0.1.0", "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proptest 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rocksdb 0.13.0 (git+https://github.com/wqfish/rust-rocksdb.git?branch=ro)", + "rocksdb 0.13.0 (git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=4ee65f451be26702df266ee8035240efc50fd902)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6341,7 +6341,7 @@ dependencies = [ "checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" "checksum libfuzzer-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d718794b8e23533b9069bd2c4597d69e41cc7ab1c02700a502971aca0cdcf24" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -"checksum librocksdb-sys 6.7.3 (git+https://github.com/wqfish/rust-rocksdb.git?branch=ro)" = "" +"checksum librocksdb-sys 6.7.3 (git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=4ee65f451be26702df266ee8035240efc50fd902)" = "" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" @@ -6465,7 +6465,7 @@ dependencies = [ "checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2" "checksum ring 0.16.11 (registry+https://github.com/rust-lang/crates.io-index)" = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862" "checksum ripemd160 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" -"checksum rocksdb 0.13.0 (git+https://github.com/wqfish/rust-rocksdb.git?branch=ro)" = "" +"checksum rocksdb 0.13.0 (git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=4ee65f451be26702df266ee8035240efc50fd902)" = "" "checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" "checksum rust_decimal 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1989cf75ea3463a3584ad69f92642e8046083482f519017aa2258333e5dc61cd" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" diff --git a/storage/schemadb/Cargo.toml b/storage/schemadb/Cargo.toml index fa0c090aab24..b650fb8b5f9a 100644 --- a/storage/schemadb/Cargo.toml +++ b/storage/schemadb/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0" once_cell = "1.3.1" libra-metrics = { path = "../../common/metrics", version = "0.1.0" } libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" } -rocksdb = { git = "https://github.com/wqfish/rust-rocksdb.git", branch = "ro" } +rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb.git", rev = "4ee65f451be26702df266ee8035240efc50fd902" } [dev-dependencies] byteorder = "1.3.2"