Skip to content

Commit 397e397

Browse files
LykxSassinatorti-chi-bot
authored andcommitted
This is an automated cherry-pick of tikv#17942
fix rusticata/pcap-parser#46, close rusticata/pcap-parser#46, ref tikv#15990 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent 99279b8 commit 397e397

File tree

3 files changed

+115
-3
lines changed

3 files changed

+115
-3
lines changed

Cargo.lock

Lines changed: 41 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ paste = "1.0"
131131
pd_client = { workspace = true }
132132
pin-project = "1.0"
133133
pnet_datalink = "0.23"
134-
pprof = { version = "0.13", default-features = false, features = [
134+
pprof = { version = "0.14", default-features = false, features = [
135135
"flamegraph",
136136
"protobuf-codec",
137137
] }
@@ -245,6 +245,10 @@ members = [
245245
"components/cloud/gcp",
246246
"components/codec",
247247
"components/collections",
248+
<<<<<<< HEAD
249+
=======
250+
"components/compact-log-backup",
251+
>>>>>>> 004490cba3 (*: upgrade pprof to 0.14 to fix https://github.com/rusticata/pcap-parser/issues/46 (#17942))
248252
"components/concurrency_manager",
249253
"components/coprocessor_plugin_api",
250254
"components/crossbeam-skiplist",
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
[package]
2+
name = "compact-log-backup"
3+
version = "0.1.0"
4+
edition = "2021"
5+
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
6+
7+
[features]
8+
failpoints = ["fail/failpoints"]
9+
10+
[dependencies]
11+
async-compression = { version = "0.4.12", features = [
12+
"tokio",
13+
"futures-io",
14+
"zstd",
15+
] }
16+
bytes = "1"
17+
chrono = { workspace = true }
18+
codec = { workspace = true }
19+
crc64fast = "0.1"
20+
dashmap = "5"
21+
derive_more = "0.99.3"
22+
encryption = { workspace = true }
23+
engine_rocks = { workspace = true }
24+
engine_traits = { workspace = true }
25+
external_storage = { workspace = true }
26+
fail = "0.5"
27+
file_system = { workspace = true }
28+
futures = "0.3"
29+
futures-io = "0.3"
30+
hex = "0.4"
31+
keys = { workspace = true }
32+
kvproto = { workspace = true }
33+
lazy_static = "1.4"
34+
pin-project = "1.0"
35+
prometheus = { version = "0.13", default-features = false, features = [
36+
"nightly",
37+
] }
38+
protobuf = { version = "2.8", features = ["bytes"] }
39+
serde = "1.0"
40+
serde_json = "1.0"
41+
slog = { workspace = true }
42+
slog-global = { workspace = true }
43+
thiserror = "1"
44+
tidb_query_datatype = { workspace = true }
45+
tikv_alloc = { workspace = true }
46+
tikv_util = { workspace = true }
47+
tokio = { version = "1.5", features = [
48+
"rt-multi-thread",
49+
"macros",
50+
"time",
51+
"sync",
52+
"signal",
53+
] }
54+
tokio-stream = "0.1"
55+
tokio-util = { version = "0.7", features = ["compat"] }
56+
tracing = { workspace = true }
57+
tracing-active-tree = { workspace = true }
58+
txn_types = { workspace = true }
59+
60+
# Below are used by `test_utils` only.
61+
zstd = "0.11"
62+
63+
[dev-dependencies]
64+
pprof = { version = "0.14", default-features = false, features = [
65+
"flamegraph",
66+
"protobuf-codec",
67+
] }
68+
tempdir = "0.3"
69+
test_util = { workspace = true }

0 commit comments

Comments
 (0)