Skip to content

Commit

Permalink
This is an automated cherry-pick of tikv#17942
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
LykxSassinator authored and ti-chi-bot committed Dec 11, 2024
1 parent 7b96ecf commit 2a3910f
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 15 deletions.
48 changes: 34 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ paste = "1.0"
pd_client = { workspace = true }
pin-project = "1.0"
pnet_datalink = "0.23"
pprof = { version = "0.13", default-features = false, features = [
pprof = { version = "0.14", default-features = false, features = [
"flamegraph",
"protobuf-codec",
] }
Expand Down Expand Up @@ -266,6 +266,10 @@ members = [
"components/cloud/gcp",
"components/codec",
"components/collections",
<<<<<<< HEAD
=======
"components/compact-log-backup",
>>>>>>> 004490cba3 (*: upgrade pprof to 0.14 to fix https://github.com/rusticata/pcap-parser/issues/46 (#17942))
"components/concurrency_manager",
"components/coprocessor_plugin_api",
"components/crypto",
Expand Down
69 changes: 69 additions & 0 deletions components/compact-log-backup/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
[package]
name = "compact-log-backup"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[features]
failpoints = ["fail/failpoints"]

[dependencies]
async-compression = { version = "0.4.12", features = [
"tokio",
"futures-io",
"zstd",
] }
bytes = "1"
chrono = { workspace = true }
codec = { workspace = true }
crc64fast = "0.1"
dashmap = "5"
derive_more = "0.99.3"
encryption = { workspace = true }
engine_rocks = { workspace = true }
engine_traits = { workspace = true }
external_storage = { workspace = true }
fail = "0.5"
file_system = { workspace = true }
futures = "0.3"
futures-io = "0.3"
hex = "0.4"
keys = { workspace = true }
kvproto = { workspace = true }
lazy_static = "1.4"
pin-project = "1.0"
prometheus = { version = "0.13", default-features = false, features = [
"nightly",
] }
protobuf = { version = "2.8", features = ["bytes"] }
serde = "1.0"
serde_json = "1.0"
slog = { workspace = true }
slog-global = { workspace = true }
thiserror = "1"
tidb_query_datatype = { workspace = true }
tikv_alloc = { workspace = true }
tikv_util = { workspace = true }
tokio = { version = "1.5", features = [
"rt-multi-thread",
"macros",
"time",
"sync",
"signal",
] }
tokio-stream = "0.1"
tokio-util = { version = "0.7", features = ["compat"] }
tracing = { workspace = true }
tracing-active-tree = { workspace = true }
txn_types = { workspace = true }

# Below are used by `test_utils` only.
zstd = "0.11"

[dev-dependencies]
pprof = { version = "0.14", default-features = false, features = [
"flamegraph",
"protobuf-codec",
] }
tempdir = "0.3"
test_util = { workspace = true }

0 comments on commit 2a3910f

Please sign in to comment.