From f0a9a15706b0cd1e6b177594cb1b2f433865cdfc Mon Sep 17 00:00:00 2001 From: kennytm Date: Fri, 23 Oct 2020 17:43:52 +0800 Subject: [PATCH] Cargo.toml: set version to 4.0.8 and update tikv deps Signed-off-by: kennytm --- Cargo.lock | 425 ++++++++++++++++++++++++------------------ Cargo.toml | 4 +- src/import/prepare.rs | 4 +- 3 files changed, 252 insertions(+), 181 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 46a2826..1fb3862 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -151,7 +151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2" dependencies = [ "backtrace-sys", - "cfg-if", + "cfg-if 0.1.10", "libc", "rustc-demangle", ] @@ -169,7 +169,7 @@ dependencies = [ [[package]] name = "backup" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "configuration", "crc64fast", @@ -232,9 +232,9 @@ checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" [[package]] name = "batch-system" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ - "crossbeam", + "crossbeam 0.8.0", "derive_more", "serde", "serde_derive", @@ -251,7 +251,7 @@ checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" dependencies = [ "bitflags", "cexpr", - "cfg-if", + "cfg-if 0.1.10", "clang-sys", "clap", "env_logger", @@ -291,25 +291,13 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "boolinator" version = "2.4.0" @@ -333,12 +321,6 @@ version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byteorder" version = "1.3.2" @@ -406,9 +388,9 @@ dependencies = [ [[package]] name = "cdc" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ - "crossbeam", + "crossbeam 0.8.0", "engine_rocks", "engine_traits", "fail", @@ -420,6 +402,8 @@ dependencies = [ "lazy_static", "pd_client", "prometheus", + "prost", + "protobuf", "raft", "raftstore", "resolved_ts", @@ -447,6 +431,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chrono" version = "0.4.11" @@ -516,7 +506,7 @@ dependencies = [ [[package]] name = "cmd" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "backup", "cdc", @@ -536,6 +526,7 @@ dependencies = [ "kvproto", "libc", "log", + "log_wrappers", "nix 0.11.1", "pd_client", "prometheus", @@ -570,7 +561,7 @@ dependencies = [ [[package]] name = "codec" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "byteorder", "error_code", @@ -583,7 +574,7 @@ dependencies = [ [[package]] name = "configuration" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "configuration_derive", "serde", @@ -592,7 +583,7 @@ dependencies = [ [[package]] name = "configuration_derive" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "proc-macro2 1.0.9", "quote 1.0.2", @@ -619,6 +610,12 @@ dependencies = [ "rand 0.7.3", ] +[[package]] +name = "const_fn" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2" + [[package]] name = "constant_time_eq" version = "0.1.4" @@ -641,13 +638,19 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" + [[package]] name = "crc32fast" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -662,12 +665,26 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c" dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "cfg-if 0.1.10", + "crossbeam-channel 0.3.9", + "crossbeam-deque 0.7.1", + "crossbeam-epoch 0.7.2", + "crossbeam-queue 0.1.2", + "crossbeam-utils 0.6.6", +] + +[[package]] +name = "crossbeam" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel 0.5.0", + "crossbeam-deque 0.8.0", + "crossbeam-epoch 0.9.0", + "crossbeam-queue 0.3.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -676,7 +693,17 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.6", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -685,8 +712,19 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.7.2", + "crossbeam-utils 0.6.6", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -696,11 +734,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" dependencies = [ "arrayvec 0.4.11", - "cfg-if", - "crossbeam-utils", + "cfg-if 0.1.10", + "crossbeam-utils 0.6.6", + "lazy_static", + "memoffset", + "scopeguard 1.1.0", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" +dependencies = [ + "cfg-if 1.0.0", + "const_fn", + "crossbeam-utils 0.8.0", "lazy_static", "memoffset", - "scopeguard 1.0.0", + "scopeguard 1.1.0", ] [[package]] @@ -709,7 +761,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.6", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2a58563f049aa3bae172bc4120f093b5901161c629f280a1f40ba55317d774" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -718,15 +780,27 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" +dependencies = [ + "autocfg 1.0.0", + "cfg-if 1.0.0", + "const_fn", "lazy_static", ] [[package]] name = "crypto-mac" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array", "subtle", @@ -774,7 +848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beb09e993960365a51676afc743a5c928806386358f36bcb34c5f301b03da348" dependencies = [ "ahash", - "cfg-if", + "cfg-if 0.1.10", "num_cpus", ] @@ -802,9 +876,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ "generic-array", ] @@ -815,7 +889,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs-sys", ] @@ -825,7 +899,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_users", "winapi 0.3.8", @@ -861,18 +935,19 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] name = "encryption" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "byteorder", "bytes 0.4.12", "configuration", "crc32fast", + "crossbeam 0.8.0", "engine_traits", "error_code", "failure", @@ -901,7 +976,7 @@ dependencies = [ [[package]] name = "engine" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "configuration", "encryption", @@ -928,7 +1003,7 @@ dependencies = [ [[package]] name = "engine_rocks" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "coarsetime", "configuration", @@ -936,6 +1011,7 @@ dependencies = [ "engine", "engine_traits", "lazy_static", + "log_wrappers", "prometheus", "rocksdb", "serde", @@ -950,10 +1026,10 @@ dependencies = [ [[package]] name = "engine_traits" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "error_code", - "hex 0.4.2", + "log_wrappers", "protobuf", "quick-error", "tikv_alloc", @@ -976,7 +1052,7 @@ dependencies = [ [[package]] name = "error_code" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "grpcio", "kvproto", @@ -990,7 +1066,7 @@ dependencies = [ [[package]] name = "external_storage" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "bytes 0.5.3", "futures 0.3.4", @@ -1005,7 +1081,6 @@ dependencies = [ "rusoto_core", "rusoto_s3", "rusoto_util", - "serde_json", "slog", "slog-global", "tame-gcs", @@ -1048,12 +1123,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "farmhash" version = "1.1.5" @@ -1263,11 +1332,12 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", + "version_check 0.9.2", ] [[package]] @@ -1276,7 +1346,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] @@ -1392,9 +1462,9 @@ checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" [[package]] name = "hmac" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ "crypto-mac", "digest", @@ -1537,7 +1607,7 @@ dependencies = [ [[package]] name = "into_other" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "engine_traits", "kvproto", @@ -1610,7 +1680,7 @@ dependencies = [ [[package]] name = "keys" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "byteorder", "derive_more", @@ -1623,7 +1693,7 @@ dependencies = [ [[package]] name = "kvproto" version = "0.0.2" -source = "git+https://github.com/pingcap/kvproto.git?branch=release-4.0#b900cea22c40cda74c82350dd33dc975c30469ee" +source = "git+https://github.com/pingcap/kvproto.git?branch=release-4.0#cc13a62c987038db6f38a0fc854c54c7fba6d2d3" dependencies = [ "futures 0.1.29", "grpcio", @@ -1752,7 +1822,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" dependencies = [ - "scopeguard 1.0.0", + "scopeguard 1.1.0", ] [[package]] @@ -1761,15 +1831,17 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] name = "log_wrappers" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "hex 0.4.2", + "kvproto", + "protobuf", "slog", "slog-term", "tikv_alloc", @@ -1787,7 +1859,7 @@ dependencies = [ [[package]] name = "match_template" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "proc-macro2 1.0.9", "quote 1.0.2", @@ -1814,11 +1886,11 @@ checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" [[package]] name = "memoffset" -version = "0.5.1" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "rustc_version", + "autocfg 1.0.0", ] [[package]] @@ -1852,7 +1924,7 @@ version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", @@ -1952,7 +2024,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "winapi 0.3.8", ] @@ -1965,7 +2037,7 @@ checksum = "becb657d662f1cd2ef38c7ad480ec6b8cf9e96b27adb543e594f9cf0f2e6065c" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -1978,7 +2050,7 @@ checksum = "dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -1991,7 +2063,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "void", ] @@ -2015,7 +2087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" dependencies = [ "memchr", - "version_check", + "version_check 0.1.5", ] [[package]] @@ -2025,7 +2097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c433f4d505fe6ce7ff78523d2fa13a0b9f2690e181fc26168bcbe5ccc5d14e07" dependencies = [ "memchr", - "version_check", + "version_check 0.1.5", ] [[package]] @@ -2131,9 +2203,9 @@ checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" [[package]] name = "opaque-debug" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" @@ -2142,7 +2214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 0.1.10", "foreign-types", "lazy_static", "libc", @@ -2235,7 +2307,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi", "libc", "redox_syscall", @@ -2274,7 +2346,7 @@ dependencies = [ [[package]] name = "pd_client" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "error_code", "fail", @@ -2482,7 +2554,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0575e258dab62268e7236d7307caa38848acbda7ec7ab87bd9093791e999d20" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "fnv", "lazy_static", "libc", @@ -2566,7 +2638,7 @@ dependencies = [ [[package]] name = "protobuf" version = "2.8.0" -source = "git+https://github.com/pingcap/rust-protobuf?rev=b67d432c1b74350b38a5d96ddf885ac6c3ff46f5#b67d432c1b74350b38a5d96ddf885ac6c3ff46f5" +source = "git+https://github.com/pingcap/rust-protobuf?rev=65e9df20fbcbcf2409d5ee86a2332ecd04c534f8#65e9df20fbcbcf2409d5ee86a2332ecd04c534f8" dependencies = [ "heck", "hex 0.3.2", @@ -2647,14 +2719,14 @@ dependencies = [ [[package]] name = "raftstore" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "batch-system", "bitflags", "byteorder", "configuration", "crc32fast", - "crossbeam", + "crossbeam 0.8.0", "encryption", "engine", "engine_rocks", @@ -2885,7 +2957,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.1", "either", "rayon-core", ] @@ -2896,9 +2968,9 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" dependencies = [ - "crossbeam-deque", - "crossbeam-queue", - "crossbeam-utils", + "crossbeam-deque 0.7.1", + "crossbeam-queue 0.1.2", + "crossbeam-utils 0.6.6", "lazy_static", "num_cpus", ] @@ -3004,7 +3076,7 @@ dependencies = [ [[package]] name = "resolved_ts" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "hex 0.4.2", "slog", @@ -3057,15 +3129,15 @@ dependencies = [ [[package]] name = "rusoto_core" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8d624cb48fcaca612329e4dd544380aa329ef338e83d3a90f5b7897e631971" +checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.0", "bytes 0.5.3", + "crc32fast", "futures 0.3.4", - "hmac", "http", "hyper", "hyper-tls", @@ -3079,16 +3151,15 @@ dependencies = [ "rustc_version", "serde", "serde_json", - "sha2", "tokio 0.2.14", "xml-rs", ] [[package]] name = "rusoto_credential" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3e7cdf483d7198d9bca7414746d3ba656239e89e467b715d0571912f0b492f" +checksum = "09ac05563f83489b19b4d413607a30821ab08bbd9007d14fa05618da3ef09d8b" dependencies = [ "async-trait", "chrono", @@ -3106,9 +3177,9 @@ dependencies = [ [[package]] name = "rusoto_kms" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167c735c81ca560f7cd9914f99eabada7b5b66b3b14d7e4401507c68ebca02bb" +checksum = "111b99b940b1b02f5a98a5fcc96467a24ab899c43c1caff60d4a863342798c6e" dependencies = [ "async-trait", "bytes 0.5.3", @@ -3120,9 +3191,9 @@ dependencies = [ [[package]] name = "rusoto_s3" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6bc3221ae5a2c036d5757eee68a2ffb6b7f87b8a83adbf4271c8133fdee01c" +checksum = "1146e37a7c1df56471ea67825fe09bbbd37984b5f6e201d8b2e0be4ee15643d8" dependencies = [ "async-trait", "bytes 0.5.3", @@ -3133,9 +3204,9 @@ dependencies = [ [[package]] name = "rusoto_signature" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62940a2bd479900a1bf8935b8f254d3e19368ac3ac4570eb4bd48eb46551a1b7" +checksum = "97a740a88dde8ded81b6f2cff9cd5e054a5a2e38a38397260f7acdd2c85d17dd" dependencies = [ "base64 0.12.0", "bytes 0.5.3", @@ -3152,15 +3223,15 @@ dependencies = [ "rustc_version", "serde", "sha2", - "time 0.2.9", + "time 0.2.22", "tokio 0.2.14", ] [[package]] name = "rusoto_sts" -version = "0.43.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83d166cfb294672db98a60159c4a81a8169c6c91054a275cb812158c73815e5" +checksum = "3815b8c0fc1c50caf9e87603f23daadfedb18d854de287b361c69f68dc9d49e0" dependencies = [ "async-trait", "bytes 0.5.3", @@ -3175,7 +3246,7 @@ dependencies = [ [[package]] name = "rusoto_util" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "async-trait", "rusoto_core", @@ -3191,7 +3262,7 @@ checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" dependencies = [ "base64 0.10.1", "blake2b_simd", - "crossbeam-utils", + "crossbeam-utils 0.6.6", ] [[package]] @@ -3218,24 +3289,13 @@ dependencies = [ "semver", ] -[[package]] -name = "rustversion" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bba175698996010c4f6dce5e7f173b6eb781fce25d2cfc45e27091ce0b79f6" -dependencies = [ - "proc-macro2 1.0.9", - "quote 1.0.2", - "syn 1.0.5", -] - [[package]] name = "rustyline" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61a7384a84da856bd163ef2c22982c816b0bcedaf17978ec13d8e0e277ddc332" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs", "libc", "log", @@ -3292,14 +3352,14 @@ checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" [[package]] name = "scopeguard" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "encryption", "grpcio", @@ -3417,13 +3477,14 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" +checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" dependencies = [ "block-buffer", + "cfg-if 0.1.10", + "cpuid-bool", "digest", - "fake-simd", "opaque-debug", ] @@ -3551,7 +3612,7 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi 0.3.8", @@ -3566,7 +3627,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "sst_importer" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "crc32fast", "encryption", @@ -3582,6 +3643,7 @@ dependencies = [ "keys", "kvproto", "lazy_static", + "log_wrappers", "prometheus", "quick-error", "serde", @@ -3604,9 +3666,12 @@ checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" [[package]] name = "standback" -version = "0.2.1" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edf667ea8f60afc06d6aeec079d20d5800351109addec1faea678a8663da4e1" +checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" +dependencies = [ + "version_check 0.9.2", +] [[package]] name = "static_assertions" @@ -3683,9 +3748,9 @@ checksum = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" [[package]] name = "subtle" -version = "1.0.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" +checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" [[package]] name = "syn" @@ -3727,7 +3792,7 @@ version = "0.9.6" source = "git+https://github.com/tikv/sysinfo.git?branch=tikv#762badf918f1e0b36fce032f9f81274d79fdff7d" dependencies = [ "cache-size", - "cfg-if", + "cfg-if 0.1.10", "doc-comment", "libc", "num_cpus", @@ -3812,7 +3877,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand 0.7.3", "redox_syscall", @@ -3842,7 +3907,7 @@ dependencies = [ [[package]] name = "test_util" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "encryption", "fail", @@ -3899,7 +3964,7 @@ dependencies = [ [[package]] name = "tidb_query" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "base64 0.12.0", "bitfield", @@ -3951,7 +4016,7 @@ dependencies = [ [[package]] name = "tidb_query_codegen" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "darling", "heck", @@ -3963,7 +4028,7 @@ dependencies = [ [[package]] name = "tidb_query_datatype" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "bitflags", "error_code", @@ -3974,8 +4039,8 @@ dependencies = [ [[package]] name = "tikv" -version = "4.0.6" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +version = "4.0.7" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "async-stream", "async-trait", @@ -3988,7 +4053,7 @@ dependencies = [ "configuration", "crc32fast", "crc64fast", - "crossbeam", + "crossbeam 0.8.0", "derive_more", "encryption", "engine", @@ -4074,12 +4139,12 @@ dependencies = [ [[package]] name = "tikv-importer" -version = "4.0.7" +version = "4.0.8" dependencies = [ "clap", "cmd", "crc32fast", - "crossbeam", + "crossbeam 0.7.2", "engine", "engine_rocks", "engine_traits", @@ -4147,7 +4212,7 @@ dependencies = [ [[package]] name = "tikv_alloc" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "libc", "log", @@ -4160,7 +4225,7 @@ dependencies = [ [[package]] name = "tikv_util" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "async-speed-limit", "backtrace", @@ -4170,7 +4235,7 @@ dependencies = [ "codec", "configuration", "crc32fast", - "crossbeam", + "crossbeam 0.8.0", "derive_more", "error_code", "fail", @@ -4222,16 +4287,16 @@ dependencies = [ [[package]] name = "time" -version = "0.2.9" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6329a7835505d46f5f3a9a2c237f8d6bf5ca6f0015decb3698ba57fcdbb609ba" +checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" dependencies = [ - "cfg-if", + "const_fn", "libc", - "rustversion", "standback", "stdweb", "time-macros", + "version_check 0.9.2", "winapi 0.3.8", ] @@ -4363,7 +4428,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.6", "futures 0.1.29", ] @@ -4416,7 +4481,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.6", "futures 0.1.29", "lazy_static", "log", @@ -4459,9 +4524,9 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" dependencies = [ - "crossbeam-deque", - "crossbeam-queue", - "crossbeam-utils", + "crossbeam-deque 0.7.1", + "crossbeam-queue 0.1.2", + "crossbeam-utils 0.6.6", "futures 0.1.29", "log", "num_cpus", @@ -4476,7 +4541,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.6", "futures 0.1.29", "slab", "tokio-executor", @@ -4579,7 +4644,7 @@ checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" [[package]] name = "txn_types" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#8f0aca5b19a690d8668bcbf1b5cadfb0a2343997" dependencies = [ "byteorder", "codec", @@ -4596,9 +4661,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.11.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" +checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" [[package]] name = "unchecked-index" @@ -4612,7 +4677,7 @@ version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" dependencies = [ - "version_check", + "version_check 0.1.5", ] [[package]] @@ -4718,6 +4783,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + [[package]] name = "vlog" version = "0.1.4" @@ -4763,7 +4834,7 @@ version = "0.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "serde", "serde_json", "wasm-bindgen-macro", @@ -4790,7 +4861,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7add542ea1ac7fdaa9dc25e031a6af33b7d63376292bd24140c637d00d1c312a" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "js-sys", "wasm-bindgen", "web-sys", @@ -4925,9 +4996,9 @@ checksum = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" [[package]] name = "yatp" version = "0.0.1" -source = "git+https://github.com/tikv/yatp.git#d23564ca477156a9963080a3d98ee841f62095fc" +source = "git+https://github.com/tikv/yatp.git#3894a861643b6ba384aaad352bbaed9717f66838" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.1", "dashmap", "fail", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 56aced5..2d47797 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tikv-importer" -version = "4.0.7" +version = "4.0.8" authors = ["The TiKV Authors"] description = "Tool to help ingesting large number of KV pairs into TiKV cluster" license = "Apache-2.0" @@ -73,7 +73,7 @@ mem-profiling = ['tikv/mem-profiling'] # TODO: remove this when new raft-rs is published. raft = { git = "https://github.com/pingcap/raft-rs", branch = "0.6.x", default-features = false } raft-proto = { git = "https://github.com/pingcap/raft-rs", branch = "0.6.x", default-features = false } -protobuf = { git = "https://github.com/pingcap/rust-protobuf", rev = "b67d432c1b74350b38a5d96ddf885ac6c3ff46f5" } +protobuf = { git = "https://github.com/pingcap/rust-protobuf", rev = "65e9df20fbcbcf2409d5ee86a2332ecd04c534f8" } [profile.dev] panic = "abort" diff --git a/src/import/prepare.rs b/src/import/prepare.rs index f9184e3..ebf6d33 100644 --- a/src/import/prepare.rs +++ b/src/import/prepare.rs @@ -283,7 +283,7 @@ impl PrepareRangeJob { match res { Ok(mut resp) => { - info!("split completed"; "tag" => %self.tag, "region" => ?ReadableDebug(region), "at" => ::log_wrappers::Key(split_key)); + info!("split completed"; "tag" => %self.tag, "region" => ?ReadableDebug(region), "at" => ::log_wrappers::Value::key(split_key)); // Just assume that the leader will be at the same store. let left = resp.take_left(); let leader = match region.leader { @@ -294,7 +294,7 @@ impl PrepareRangeJob { } Err(e) => { warn!( - "split failed"; "tag" => %self.tag, "region" => ?ReadableDebug(region), "at" => ::log_wrappers::Key(split_key), "err" => %e + "split failed"; "tag" => %self.tag, "region" => ?ReadableDebug(region), "at" => ::log_wrappers::Value::key(split_key), "err" => %e ); Err(e) }