From 397e3971a7d72a2baca93896d616fec9c5ac9f97 Mon Sep 17 00:00:00 2001
From: lucasliang <nkcs_lykx@hotmail.com>
Date: Thu, 5 Dec 2024 18:21:29 +0800
Subject: [PATCH] This is an automated cherry-pick of #17942

fix rusticata/pcap-parser#46, close rusticata/pcap-parser#46, ref tikv/tikv#15990

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
---
 Cargo.lock                               | 43 ++++++++++++++-
 Cargo.toml                               |  6 ++-
 components/compact-log-backup/Cargo.toml | 69 ++++++++++++++++++++++++
 3 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 components/compact-log-backup/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index b9747b3ddf2..9289c32a5b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,6 +73,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e0966165eaf052580bd70eb1b32cb3d6245774c0104d1b2793e9650bf83b52a"
+dependencies = [
+ "equator",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.14"
@@ -2142,6 +2151,26 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "equator"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35da53b5a021d2484a7cc49b2ac7f2d840f8236a286f84202369bd338d761ea"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -4557,10 +4586,11 @@ dependencies = [
 
 [[package]]
 name = "pprof"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb"
+checksum = "ebbe2f8898beba44815fdc9e5a4ae9c929e21c5dc29b0c774a15555f7f58d6d0"
 dependencies = [
+ "aligned-vec",
  "backtrace",
  "cfg-if 1.0.0",
  "findshlibs",
@@ -6073,12 +6103,21 @@ dependencies = [
 
 [[package]]
 name = "socket2"
+<<<<<<< HEAD
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
  "libc 0.2.151",
  "winapi 0.3.9",
+=======
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc 0.2.151",
+ "windows-sys 0.52.0",
+>>>>>>> 004490cba3 (*: upgrade pprof to 0.14 to fix https://github.com/rusticata/pcap-parser/issues/46 (#17942))
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index fe1350100d1..e395fc9d19f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,7 +131,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",
 ] }
@@ -245,6 +245,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/crossbeam-skiplist",
diff --git a/components/compact-log-backup/Cargo.toml b/components/compact-log-backup/Cargo.toml
new file mode 100644
index 00000000000..65de6a80fff
--- /dev/null
+++ b/components/compact-log-backup/Cargo.toml
@@ -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 }