Skip to content

Commit

Permalink
pick tikv#11458
Browse files Browse the repository at this point in the history 
Signed-off-by: linning <linningde25@gmail.com>
  • Loading branch information
@tabokie @NingLin-P
tabokie authored and NingLin-P committed Dec 22, 2021
1 parent fdb701e commit 32f73b8
Show file tree
Hide file tree
Showing 26 changed files with 296 additions and 141 deletions.
367 changes: 261 additions & 106 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ engine_test = { path = "components/engine_test", default-features = false }
engine_traits = { path = "components/engine_traits", default-features = false }
engine_traits_tests = { path = "components/engine_traits_tests", default-features = false }
error_code = { path = "components/error_code", default-features = false }
fail = "0.4"
fail = "0.5"
file_system = { path = "components/file_system", default-features = false }
fs2 = "0.4"
futures = { version = "0.3", features = ["thread-pool", "compat"] }
Expand Down Expand Up @@ -194,7 +194,7 @@ slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debu
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
strum = { version = "0.20", features = ["derive"] }
parking_lot = "0.11"
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
sst_importer = { path = "components/sst_importer", default-features = false }
sysinfo = "0.16"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tikv-ctl/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
log_wrappers = { path = "../../components/log_wrappers" }
nix = "0.19"
pd_client = { path = "../../components/pd_client", default-features = false }
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
promptly = "0.3.0"
protobuf = "2.8"
raft = { version = "0.6.0-alpha", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion components/backup/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
pd_client = { path = "../pd_client", default-features = false }
prometheus = { version = "0.10", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
raft = { version = "0.6.0-alpha", default-features = false }
raftstore = { path = "../raftstore", default-features = false }
security = { path = "../security", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions components/cdc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ collections = { path = "../collections" }
tokio = { version = "0.2", features = ["rt-threaded"]}
txn_types = { path = "../txn_types", default-features = false }
concurrency_manager = { path = "../concurrency_manager", default-features = false }
fail = "0.4"
fail = "0.5"
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.10", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
protobuf = "2.8"
prost = "0.7"
futures-timer = "3.0"
Expand Down
2 changes: 1 addition & 1 deletion components/cloud/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ tikv_util = { path = "../tikv_util", default-features = false }
url = "2.0"

[dev-dependencies]
fail = "0.4"
fail = "0.5"
2 changes: 1 addition & 1 deletion components/cloud/aws/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ failpoints = ["fail/failpoints"]
async-trait = "0.1"
bytes = "0.5"
cloud = { path = "../", default-features = false }
fail = "0.4"
fail = "0.5"
futures = "0.3"
futures-util = { version = "0.3", default-features = false, features = ["io"] }
# This is only a dependency to vendor openssl for rusoto. It's not clear exactly
Expand Down
2 changes: 1 addition & 1 deletion components/concurrency_manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ prost-codec = [
parking_lot = "0.11"
tokio = { version = "0.2", features = ["macros", "sync", "time"] }
txn_types = { path = "../txn_types", default-features = false }
fail = "0.4"
fail = "0.5"

# FIXME: switch to the crates.io version after crossbeam-skiplist is released
[dependencies.crossbeam-skiplist]
Expand Down
4 changes: 2 additions & 2 deletions components/encryption/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ crc32fast = "1.2"
derive_more = "0.99.3"
engine_traits = { path = "../engine_traits", default-features = false }
error_code = { path = "../error_code", default-features = false }
fail = "0.4"
fail = "0.5"
file_system = { path = "../file_system", default-features = false }
futures = "0.3"
lazy_static = "1.3"
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
futures-util = { version = "0.3", default-features = false, features = ["std", "io"] }
hex = "0.4.2"
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions components/engine_rocks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ engine_traits = { path = "../engine_traits", default-features = false }
file_system = { path = "../file_system", default-features = false }
keys = { path = "../keys", default-features = false }
num_cpus = "1"
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
Expand All @@ -67,7 +67,7 @@ serde_derive = "1.0"
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
raft = { version = "0.6.0-alpha", default-features = false }
protobuf = "2"
fail = "0.4"
fail = "0.5"

[dependencies.rocksdb]
git = "https://github.com/tikv/rust-rocksdb.git"
Expand Down
4 changes: 2 additions & 2 deletions components/external_storage/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ failpoints = ["fail/failpoints"]
[dependencies]
anyhow = "1.0"
bytes = "0.5.3"
fail = "0.4"
fail = "0.5"
ffi-support = { optional = true, version = "0.4.2" }
file_system = { path = "../file_system" }
futures = "0.3"
Expand All @@ -40,7 +40,7 @@ grpcio = { optional = true, version = "0.9", default-features = false, features
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
lazy_static = "1.3"
libloading = { optional = true, version = "0.7.0" }
prometheus = { version = "0.10", default-features = false, features = ["nightly", "push"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly", "push"] }
protobuf = { optional = true, version = "2" }
rand = "0.7"
rusoto_core = "0.45.0"
Expand Down
2 changes: 1 addition & 1 deletion components/file_system/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ libc = "0.2"
nix = "0.19"
openssl = "0.10"
parking_lot = "0.11"
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
rand = "0.7.3"
serde = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions components/pd_client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.
lazy_static = "1.3"
log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
security = { path = "../security", default-features = false }
serde = "1.0"
serde_derive = "1.0"
Expand All @@ -46,5 +46,5 @@ tokio = { version = "1", features = ["sync"] }
tokio-timer = "0.2"
txn_types = { path = "../txn_types", default-features = false }
semver = "0.10"
fail = "0.4"
fail = "0.5"
yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }
4 changes: 2 additions & 2 deletions components/raftstore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ derivative = "2"
encryption = { path = "../encryption", default-features = false }
engine_traits = { path = "../engine_traits", default-features = false }
error_code = { path = "../error_code", default-features = false }
fail = "0.4"
fail = "0.5"
openssl = "0.10"
file_system = { path = "../file_system", default-features = false }
fs2 = "0.4"
Expand All @@ -82,7 +82,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
log_wrappers = { path = "../log_wrappers" }
memory_trace_macros = { path = "../memory_trace_macros" }
pd_client = { path = "../pd_client", default-features = false }
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
prost = { version = "0.7", optional = true }
protobuf = "2.8"
Expand Down
4 changes: 2 additions & 2 deletions components/resolved_ts/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ crossbeam = "0.8"
concurrency_manager = { path = "../concurrency_manager", default-features = false }
configuration = { path = "../configuration" }
engine_traits = { path = "../engine_traits", default-features = false }
fail = "0.4"
fail = "0.5"
futures = "0.3"
grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored"] }
hex = "0.4"
Expand All @@ -53,7 +53,7 @@ lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
pd_client = { path = "../pd_client", default-features = false }
prost = "0.7"
prometheus = { version = "0.10", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
protobuf = "2.8"
raft = { version = "0.6.0-alpha", default-features = false }
raftstore = { path = "../raftstore", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion components/resource_metering/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ collections = { path = "../collections" }
libc = "0.2"
crossbeam = "0.8"
pin-project = "1.0"
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
tikv_util = { path = "../tikv_util" }
Expand Down
2 changes: 1 addition & 1 deletion components/server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
log_wrappers = { path = "../log_wrappers" }
nix = "0.11"
pd_client = { path = "../pd_client", default-features = false }
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
promptly = "0.3.0"
protobuf = "2.8"
raft = { version = "0.6.0-alpha", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion components/sst_importer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ keys = { path = "../keys", default-features = false }
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.10", default-features = false }
prometheus = { version = "0.13", default-features = false }
serde = "1.0"
serde_derive = "1.0"
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
Expand Down
2 changes: 1 addition & 1 deletion components/test_pd/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ prost-codec = [
]

[dependencies]
fail = "0.4"
fail = "0.5"
futures = "0.3"
grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored"] }
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion components/test_raftstore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ txn_types = { path = "../txn_types", default-features = false }
encryption_export = { path = "../encryption/export", default-features = false }
tokio = { version = "0.2", features = ["rt-threaded"]}
concurrency_manager = { path = "../concurrency_manager", default-features = false }
fail = "0.4"
fail = "0.5"
2 changes: 1 addition & 1 deletion components/test_util/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cloud-gcp = [ "encryption_export/cloud-gcp" ]

[dependencies]
encryption_export = { path = "../encryption/export", default-features = false }
fail = "0.4"
fail = "0.5"
grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored"] }
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
rand = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion components/tidb_query_common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ derive_more = "0.99.3"
error_code = { path = "../error_code", default-features = false }
tikv_util = { path = "../tikv_util", default-features = false }
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
Expand Down
2 changes: 1 addition & 1 deletion components/tidb_query_executors/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ prost-codec = [
[dependencies]
protobuf = "2.8"
codec = { path = "../codec", default-features = false }
fail = "0.4"
fail = "0.5"
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
match_template = { path = "../match_template" }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
Expand Down
4 changes: 2 additions & 2 deletions components/tikv_kv/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ engine_panic = { path = "../engine_panic", default-features = false }
engine_rocks = { path = "../engine_rocks", default-features = false }
engine_traits = { path = "../engine_traits", default-features = false }
error_code = { path = "../error_code", default-features = false }
fail = "0.4"
fail = "0.5"
file_system = { path = "../file_system" }
futures = { version = "0.3", features = ["thread-pool", "compat"] }
into_other = { path = "../into_other", default-features = false }
kvproto = { git = "https://github.com/pingcap/kvproto.git", branch = "release-5.1", default-features = false }
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.4"
raftstore = { path = "../raftstore", default-features = false }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
Expand Down
4 changes: 2 additions & 2 deletions components/tikv_util/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ crc32fast = "1.2"
crossbeam = "0.8"
error_code = { path = "../error_code", default-features = false }
derive_more = "0.99.3"
fail = "0.4"
fail = "0.5"
fs2 = "0.4"
futures = { version = "0.3", features = ["compat"] }
futures-util = { version = "0.3", default-features = false, features = ["io"] }
Expand All @@ -42,7 +42,7 @@ log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug
log_wrappers = { path = "../log_wrappers" }
num_cpus = "1"
openssl = "0.10"
prometheus = { version = "0.10", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
rand = "0.7"
rusoto_core = "0.45.0"
serde = { version = "1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ sse = ["tikv/sse"]
portable = ["tikv/portable"]

[dependencies]
fail = "0.4"
fail = "0.5"
batch-system = { path = "../components/batch-system", default-features = false }
crc64fast = "0.1"
crossbeam = "0.8"
Expand Down

0 comments on commit 32f73b8

Please sign in to comment.