Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: update some dependencies #11458

Merged
merged 2 commits into from
Nov 25, 2021
Merged

*: update some dependencies #11458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
834110c
update prometheus, fail, yatp
tabokie Nov 23, 2021
edb1594
Merge branch 'master' of https://github.com/tikv/tikv into post-raft-…
tabokie Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 70 additions & 43 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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 @@ -128,7 +128,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.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
promptly = "0.3.0"
protobuf = { version = "2.8", features = ["bytes"] }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
Expand Down
2 changes: 1 addition & 1 deletion components/backup/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git" }
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
pd_client = { path = "../pd_client", default-features = false }
prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
raftstore = { path = "../raftstore", default-features = false }
security = { path = "../security", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion components/batch-system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ serde_derive = "1.0"
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" }
derive_more = { version = "0.99", optional = true }
prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
lazy_static = "1.3"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions components/cdc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ collections = { path = "../collections" }
tokio = { version = "1.5", features = ["rt-multi-thread", "time"]}
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.12", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
prometheus-static-metric = "0.5"
protobuf = { version = "2.8", features = ["bytes"] }
futures-timer = "3.0"
Expand Down
2 changes: 1 addition & 1 deletion components/cloud/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ failpoints = ["fail/failpoints"]
async-trait = "0.1"
bytes = "1.0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "0.0.1"
parking_lot = "0.11"
tokio = { version = "1.5", 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,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.12", 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" }
Expand Down
4 changes: 2 additions & 2 deletions components/engine_rocks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
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 @@ -46,7 +46,7 @@ serde_derive = "1.0"
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
protobuf = "2"
fail = "0.4"
fail = "0.5"
case_macros = { path = "../case_macros" }

[dependencies.rocksdb]
Expand Down
2 changes: 1 addition & 1 deletion components/engine_traits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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" }
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
fail = "0.4"
fail = "0.5"
case_macros = { path = "../case_macros" }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions components/external_storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ failpoints = ["fail/failpoints"]
[dependencies]
anyhow = "1.0"
bytes = "1.0"
fail = "0.4"
fail = "0.5"
ffi-support = { optional = true, version = "0.4.2" }
file_system = { path = "../file_system" }
futures = "0.3"
Expand All @@ -29,7 +29,7 @@ grpcio = { optional = true, version = "0.9", default-features = false, features
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
lazy_static = "1.3"
libloading = { optional = true, version = "0.7.0" }
prometheus = { version = "0.12", default-features = false, features = ["nightly", "push"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly", "push"] }
protobuf = { optional = true, version = "2" }
rand = "0.8"
rusoto_core = "0.46.0"
Expand Down
2 changes: 1 addition & 1 deletion components/file_system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ nix = "0.19"
online_config = { path = "../online_config" }
openssl = "0.10"
parking_lot = "0.11"
prometheus = { version = "0.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
rand = "0.8"
serde = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions components/pd_client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git" }
lazy_static = "1.3"
log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
security = { path = "../security", default-features = false }
serde = "1.0"
serde_derive = "1.0"
Expand All @@ -29,5 +29,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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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 @@ -49,7 +49,7 @@ log_wrappers = { path = "../log_wrappers" }
memory_trace_macros = { path = "../memory_trace_macros" }
ordered-float = "2.6"
pd_client = { path = "../pd_client", default-features = false }
prometheus = { version = "0.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
protobuf = { version = "2.8", features = ["bytes"] }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
Expand Down
4 changes: 2 additions & 2 deletions components/resolved_ts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ crossbeam = "0.8"
concurrency_manager = { path = "../concurrency_manager", default-features = false }
online_config = { path = "../online_config" }
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"
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
pd_client = { path = "../pd_client", default-features = false }
prometheus = { version = "0.12", default-features = false, features = ["nightly"] }
prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
protobuf = { version = "2.8", features = ["bytes"] }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
raftstore = { path = "../raftstore", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions components/resource_metering/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ collections = { path = "../collections" }
libc = "0.2"
crossbeam = "0.8"
pin-project = "1.0"
prometheus = { version = "0.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
tikv_util = { path = "../tikv_util" }
Expand All @@ -25,7 +25,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" }
futures = "0.3"
pdqselect = "0.1"
fail = "0.4"
fail = "0.5"
thread-id = "4.0.0"

[target.'cfg(target_os = "linux")'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion components/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
promptly = "0.3.0"
protobuf = { version = "2.8", features = ["bytes"] }
raft = { version = "0.6.0-alpha", default-features = false, features = ["protobuf-codec"] }
Expand Down
2 changes: 1 addition & 1 deletion components/sst_importer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ keys = { path = "../keys", default-features = false }
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
lazy_static = "1.3"
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.12", 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
publish = false

[dependencies]
fail = "0.4"
fail = "0.5"
futures = "0.3"
grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored", "protobuf-codec"] }
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
Expand Down
2 changes: 1 addition & 1 deletion components/test_raftstore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ txn_types = { path = "../txn_types", default-features = false }
encryption_export = { path = "../encryption/export", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread"]}
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cloud-gcp = [ "encryption_export/cloud-gcp" ]
[dependencies]
backtrace = "0.3"
encryption_export = { path = "../encryption/export", default-features = false }
fail = "0.4"
fail = "0.5"
grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored", "protobuf-codec"] }
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion components/tidb_query_common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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" }
prometheus = { version = "0.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "A vector query engine to run TiDB pushed down executors"
[dependencies]
protobuf = { version = "2.8", features = ["bytes"] }
codec = { path = "../codec", default-features = false }
fail = "0.4"
fail = "0.5"
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,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" }
log_wrappers = { path = "../log_wrappers" }
prometheus = { version = "0.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
prometheus-static-metric = "0.5"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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 @@ -33,7 +33,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.12", features = ["nightly"] }
prometheus = { version = "0.13", features = ["nightly"] }
rand = "0.8"
rusoto_core = "0.46.0"
serde = { version = "1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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