From be5bdd2df42bac6b3e0b5fa33a6db8416970da0f Mon Sep 17 00:00:00 2001 From: kennytm Date: Tue, 22 Sep 2020 22:00:06 +0800 Subject: [PATCH] Cargo.toml: set version to 4.0.7 (#82) Signed-off-by: kennytm --- Cargo.lock | 198 ++++++++++++++++++++++++++++++----------------------- Cargo.toml | 2 +- 2 files changed, 115 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 388ab7f..46a2826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -169,13 +169,14 @@ dependencies = [ [[package]] name = "backup" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "configuration", "crc64fast", "engine", "engine_rocks", "engine_traits", + "error_code", "external_storage", "failure", "futures 0.1.29", @@ -231,7 +232,7 @@ checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" [[package]] name = "batch-system" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "crossbeam", "derive_more", @@ -405,7 +406,7 @@ dependencies = [ [[package]] name = "cdc" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "crossbeam", "engine_rocks", @@ -515,7 +516,7 @@ dependencies = [ [[package]] name = "cmd" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "backup", "cdc", @@ -525,6 +526,7 @@ dependencies = [ "engine", "engine_rocks", "engine_traits", + "error_code", "fs2", "futures 0.1.29", "futures-cpupool", @@ -568,7 +570,7 @@ dependencies = [ [[package]] name = "codec" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "byteorder", "error_code", @@ -581,7 +583,7 @@ dependencies = [ [[package]] name = "configuration" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "configuration_derive", "serde", @@ -590,7 +592,7 @@ dependencies = [ [[package]] name = "configuration_derive" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "proc-macro2 1.0.9", "quote 1.0.2", @@ -865,7 +867,7 @@ dependencies = [ [[package]] name = "encryption" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "byteorder", "bytes 0.4.12", @@ -899,7 +901,7 @@ dependencies = [ [[package]] name = "engine" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "configuration", "encryption", @@ -926,7 +928,7 @@ dependencies = [ [[package]] name = "engine_rocks" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "coarsetime", "configuration", @@ -948,7 +950,7 @@ dependencies = [ [[package]] name = "engine_traits" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "error_code", "hex 0.4.2", @@ -974,17 +976,21 @@ dependencies = [ [[package]] name = "error_code" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ + "grpcio", "kvproto", + "lazy_static", "raft", + "serde", "tikv_alloc", + "toml", ] [[package]] name = "external_storage" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "bytes 0.5.3", "futures 0.3.4", @@ -1531,7 +1537,7 @@ dependencies = [ [[package]] name = "into_other" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "engine_traits", "kvproto", @@ -1571,37 +1577,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -[[package]] -name = "jemalloc-ctl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e93b0f37e7d735c6b610176d5b1bde8e1621ff3f6f7ac23cdfa4e7f7d0111b5" -dependencies = [ - "jemalloc-sys", - "libc", -] - -[[package]] -name = "jemalloc-sys" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc62c8e50e381768ce8ee0428ee53741929f7ebd73e4d83f669bcf7693e00ae" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "jemallocator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0cd42ac65f758063fea55126b0148b1ce0a6354ff78e07a4d6806bc65c4ab3" -dependencies = [ - "jemalloc-sys", - "libc", -] - [[package]] name = "jobserver" version = "0.1.17" @@ -1635,7 +1610,7 @@ dependencies = [ [[package]] name = "keys" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "byteorder", "derive_more", @@ -1648,7 +1623,7 @@ dependencies = [ [[package]] name = "kvproto" version = "0.0.2" -source = "git+https://github.com/pingcap/kvproto.git?branch=release-4.0#b37d46ebd056e97a8ff7cb9aac1fd5cd2921cd6b" +source = "git+https://github.com/pingcap/kvproto.git?branch=release-4.0#b900cea22c40cda74c82350dd33dc975c30469ee" dependencies = [ "futures 0.1.29", "grpcio", @@ -1703,26 +1678,26 @@ dependencies = [ [[package]] name = "librocksdb_sys" version = "0.1.0" -source = "git+https://github.com/tikv/rust-rocksdb?branch=tikv-4.x#d472363caaed9e611dc9db70e61441e4bb8860f8" +source = "git+https://github.com/tikv/rust-rocksdb.git?branch=tikv-4.x#cf9871d8cd9eb29cd27cc614ede34f0e28f78916" dependencies = [ "bindgen", "bzip2-sys", "cc", "cmake", - "jemalloc-sys", "libc", "libtitan_sys", "libz-sys", "lz4-sys", "openssl-sys", "snappy-sys", + "tikv-jemalloc-sys", "zstd-sys", ] [[package]] name = "libtitan_sys" version = "0.0.1" -source = "git+https://github.com/tikv/rust-rocksdb?branch=tikv-4.x#d472363caaed9e611dc9db70e61441e4bb8860f8" +source = "git+https://github.com/tikv/rust-rocksdb.git?branch=tikv-4.x#cf9871d8cd9eb29cd27cc614ede34f0e28f78916" dependencies = [ "bzip2-sys", "cc", @@ -1792,7 +1767,7 @@ dependencies = [ [[package]] name = "log_wrappers" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "hex 0.4.2", "slog", @@ -1812,7 +1787,7 @@ dependencies = [ [[package]] name = "match_template" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "proc-macro2 1.0.9", "quote 1.0.2", @@ -2277,12 +2252,32 @@ dependencies = [ "regex", ] +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + [[package]] name = "pd_client" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "error_code", + "fail", "futures 0.1.29", "futures 0.3.4", "grpcio", @@ -2652,7 +2647,7 @@ dependencies = [ [[package]] name = "raftstore" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "batch-system", "bitflags", @@ -3009,7 +3004,7 @@ dependencies = [ [[package]] name = "resolved_ts" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "hex 0.4.2", "slog", @@ -3054,7 +3049,7 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" [[package]] name = "rocksdb" version = "0.3.0" -source = "git+https://github.com/tikv/rust-rocksdb?branch=tikv-4.x#d472363caaed9e611dc9db70e61441e4bb8860f8" +source = "git+https://github.com/tikv/rust-rocksdb.git?branch=tikv-4.x#cf9871d8cd9eb29cd27cc614ede34f0e28f78916" dependencies = [ "libc", "librocksdb_sys", @@ -3180,7 +3175,7 @@ dependencies = [ [[package]] name = "rusoto_util" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "async-trait", "rusoto_core", @@ -3304,7 +3299,7 @@ checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" [[package]] name = "security" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "encryption", "grpcio", @@ -3414,16 +3409,6 @@ dependencies = [ "syn 1.0.5", ] -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - [[package]] name = "sha1" version = "0.6.0" @@ -3502,6 +3487,18 @@ dependencies = [ "slog", ] +[[package]] +name = "slog-json" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a" +dependencies = [ + "chrono", + "serde", + "serde_json", + "slog", +] + [[package]] name = "slog-term" version = "2.4.1" @@ -3569,7 +3566,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "sst_importer" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "crc32fast", "encryption", @@ -3845,7 +3842,7 @@ dependencies = [ [[package]] name = "test_util" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "encryption", "fail", @@ -3902,7 +3899,7 @@ dependencies = [ [[package]] name = "tidb_query" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "base64 0.12.0", "bitfield", @@ -3937,7 +3934,6 @@ dependencies = [ "safemem", "serde", "serde_json", - "servo_arc", "slog", "slog-global", "smallvec 1.1.0", @@ -3955,7 +3951,7 @@ dependencies = [ [[package]] name = "tidb_query_codegen" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "darling", "heck", @@ -3967,7 +3963,7 @@ dependencies = [ [[package]] name = "tidb_query_datatype" version = "0.0.1" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "bitflags", "error_code", @@ -3978,8 +3974,8 @@ dependencies = [ [[package]] name = "tikv" -version = "4.0.5" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +version = "4.0.6" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "async-stream", "async-trait", @@ -4021,6 +4017,7 @@ dependencies = [ "libc", "log", "log_wrappers", + "match_template", "mime", "more-asserts", "murmur3", @@ -4053,6 +4050,7 @@ dependencies = [ "sysinfo", "tempfile", "tidb_query", + "tidb_query_datatype", "tikv_alloc", "tikv_util", "time 0.1.42", @@ -4076,7 +4074,7 @@ dependencies = [ [[package]] name = "tikv-importer" -version = "4.0.6" +version = "4.0.7" dependencies = [ "clap", "cmd", @@ -4114,23 +4112,55 @@ dependencies = [ "uuid 0.7.4", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b441ce9e5ab1d28f7643e62f0fa445086d8c84075150be840adae054cc05bd9c" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.0+5.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5230e450d11f3a5ba46e94073e6d4d2afcc26ecd47b80533420eed648b3084" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90c7c5e31d05b8a79b7d4dd50d0ea4a57db4ed2bf694c66763d79cdb84045cc" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + [[package]] name = "tikv_alloc" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ - "jemalloc-ctl", - "jemalloc-sys", - "jemallocator", "libc", "log", "tcmalloc", + "tikv-jemalloc-ctl", + "tikv-jemalloc-sys", + "tikv-jemallocator", ] [[package]] name = "tikv_util" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "async-speed-limit", "backtrace", @@ -4160,11 +4190,11 @@ dependencies = [ "quick-error", "rand 0.7.3", "serde", - "serde_derive", "serde_json", "slog", "slog-async", "slog-global", + "slog-json", "slog-term", "sysinfo", "tempfile", @@ -4549,7 +4579,7 @@ checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" [[package]] name = "txn_types" version = "0.1.0" -source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#fc3bc567cdbd10f1dd5047c865d9ec5995dc5de8" +source = "git+https://github.com/tikv/tikv.git?branch=release-4.0#9560eedcabe6e66608b30c5cb6ebfd434bb83fb0" dependencies = [ "byteorder", "codec", diff --git a/Cargo.toml b/Cargo.toml index 2efd001..56aced5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tikv-importer" -version = "4.0.6" +version = "4.0.7" authors = ["The TiKV Authors"] description = "Tool to help ingesting large number of KV pairs into TiKV cluster" license = "Apache-2.0"