From 46df0d79484dad0880866692988ecf3def8d2c38 Mon Sep 17 00:00:00 2001 From: vicanso Date: Sat, 19 Oct 2024 09:35:39 +0800 Subject: [PATCH] refactor: update pingora --- Cargo.lock | 37 ++++++++++++++++++++----------------- Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee98cbce..9b2e9121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1190,6 +1190,9 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] [[package]] name = "hashbrown" @@ -2540,7 +2543,7 @@ dependencies = [ [[package]] name = "pingora" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "pingora-cache", "pingora-core", @@ -2553,7 +2556,7 @@ dependencies = [ [[package]] name = "pingora-cache" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "ahash 0.8.11", "async-trait", @@ -2587,7 +2590,7 @@ dependencies = [ [[package]] name = "pingora-core" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "ahash 0.8.11", "async-trait", @@ -2614,7 +2617,7 @@ dependencies = [ "pingora-http", "pingora-openssl", "pingora-pool", - "pingora-runtime 0.3.0 (git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11)", + "pingora-runtime 0.3.0 (git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436)", "pingora-timeout", "prometheus", "rand", @@ -2637,12 +2640,12 @@ dependencies = [ [[package]] name = "pingora-error" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" [[package]] name = "pingora-header-serde" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "bytes", "http 1.1.0", @@ -2657,7 +2660,7 @@ dependencies = [ [[package]] name = "pingora-http" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "bytes", "http 1.1.0", @@ -2667,7 +2670,7 @@ dependencies = [ [[package]] name = "pingora-ketama" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "crc32fast", ] @@ -2684,7 +2687,7 @@ dependencies = [ [[package]] name = "pingora-load-balancing" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "arc-swap", "async-trait", @@ -2697,7 +2700,7 @@ dependencies = [ "pingora-error", "pingora-http", "pingora-ketama", - "pingora-runtime 0.3.0 (git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11)", + "pingora-runtime 0.3.0 (git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436)", "rand", "tokio", ] @@ -2705,10 +2708,10 @@ dependencies = [ [[package]] name = "pingora-lru" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "arrayvec", - "hashbrown 0.14.5", + "hashbrown 0.12.3", "parking_lot", "rand", ] @@ -2716,7 +2719,7 @@ dependencies = [ [[package]] name = "pingora-openssl" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "foreign-types", "libc", @@ -2729,7 +2732,7 @@ dependencies = [ [[package]] name = "pingora-pool" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "crossbeam-queue", "log", @@ -2743,7 +2746,7 @@ dependencies = [ [[package]] name = "pingora-proxy" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "async-trait", "bytes", @@ -2777,7 +2780,7 @@ dependencies = [ [[package]] name = "pingora-runtime" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "once_cell", "rand", @@ -2788,7 +2791,7 @@ dependencies = [ [[package]] name = "pingora-timeout" version = "0.3.0" -source = "git+https://github.com/cloudflare/pingora?rev=51516839f7155dd74d5cf93006ec1df9ea126b11#51516839f7155dd74d5cf93006ec1df9ea126b11" +source = "git+https://github.com/cloudflare/pingora?rev=3f60857993925c87aecfbaf0799358baabf7d436#3f60857993925c87aecfbaf0799358baabf7d436" dependencies = [ "once_cell", "parking_lot", diff --git a/Cargo.toml b/Cargo.toml index c6082703..2cc90b88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ opentelemetry_sdk = { version = "0.24.1", features = [ "rt-tokio", ], default-features = false } path-absolutize = "3.1.1" -pingora = { git = "https://github.com/cloudflare/pingora", rev = "51516839f7155dd74d5cf93006ec1df9ea126b11", default-features = false, features = [ +pingora = { git = "https://github.com/cloudflare/pingora", rev = "3f60857993925c87aecfbaf0799358baabf7d436", default-features = false, features = [ # pingora = { version = "0.3.0", default-features = false, features = [ "lb", "openssl",