From 55faef6858cfa44f89fa97e165105584e3e24d65 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Wed, 13 Nov 2024 13:25:19 +0100 Subject: [PATCH] wip: set wip tokio-postgres branch --- Cargo.lock | 100 +++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 10 +++--- 2 files changed, 82 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 578c006dd11c..f913c184b14d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1245,7 +1245,7 @@ dependencies = [ "tar", "thiserror", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-stream", "tokio-util", "tracing", @@ -1351,7 +1351,7 @@ dependencies = [ "storage_broker", "thiserror", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-util", "toml", "toml_edit", @@ -3620,8 +3620,8 @@ dependencies = [ "pageserver_compaction", "pin-project-lite", "postgres", - "postgres-protocol", - "postgres-types", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", + "postgres-types 0.2.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "postgres_backend", "postgres_connection", "postgres_ffi", @@ -3649,7 +3649,7 @@ dependencies = [ "tokio", "tokio-epoll-uring", "tokio-io-timeout", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-stream", "tokio-tar", "tokio-util", @@ -3707,7 +3707,7 @@ dependencies = [ "serde", "thiserror", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-stream", "tokio-util", "utils", @@ -4006,14 +4006,33 @@ dependencies = [ [[package]] name = "postgres" version = "0.19.4" -source = "git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1addeae6e0968e3899ae6bf01cee2#20031d7a9ee1addeae6e0968e3899ae6bf01cee2" +source = "git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support#9fe5b8c91559258455dc4b895eada139b70fcb2c" dependencies = [ "bytes", "fallible-iterator", "futures-util", "log", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.4" +source = "git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support#9fe5b8c91559258455dc4b895eada139b70fcb2c" +dependencies = [ + "base64 0.20.0", + "byteorder", + "bytes", + "fallible-iterator", + "hmac", + "lazy_static", + "md-5", + "memchr", + "rand 0.8.5", + "sha2", + "stringprep", + "tokio", ] [[package]] @@ -4035,6 +4054,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "postgres-types" +version = "0.2.4" +source = "git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support#9fe5b8c91559258455dc4b895eada139b70fcb2c" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", + "serde", + "serde_json", +] + [[package]] name = "postgres-types" version = "0.2.4" @@ -4042,7 +4073,7 @@ source = "git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1 dependencies = [ "bytes", "fallible-iterator", - "postgres-protocol", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1addeae6e0968e3899ae6bf01cee2)", "serde", "serde_json", ] @@ -4060,7 +4091,7 @@ dependencies = [ "serde", "thiserror", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-postgres-rustls", "tokio-rustls 0.26.0", "tokio-util", @@ -4075,7 +4106,7 @@ dependencies = [ "itertools 0.10.5", "once_cell", "postgres", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "url", ] @@ -4127,7 +4158,7 @@ dependencies = [ "byteorder", "bytes", "itertools 0.10.5", - "postgres-protocol", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "rand 0.8.5", "serde", "thiserror", @@ -4313,7 +4344,7 @@ dependencies = [ "parquet_derive", "pbkdf2", "pin-project-lite", - "postgres-protocol", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "postgres_backend", "pq_proto", "prometheus", @@ -4348,7 +4379,7 @@ dependencies = [ "tikv-jemalloc-ctl", "tikv-jemallocator", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-postgres-rustls", "tokio-rustls 0.26.0", "tokio-tungstenite", @@ -5161,7 +5192,7 @@ dependencies = [ "pageserver_api", "parking_lot 0.12.1", "postgres", - "postgres-protocol", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "postgres_backend", "postgres_ffi", "pq_proto", @@ -5181,7 +5212,7 @@ dependencies = [ "thiserror", "tokio", "tokio-io-timeout", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-stream", "tokio-tar", "tokio-util", @@ -5826,7 +5857,7 @@ dependencies = [ "serde_json", "storage_controller_client", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-postgres-rustls", "tokio-stream", "tokio-util", @@ -6223,6 +6254,29 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "tokio-postgres" +version = "0.7.7" +source = "git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support#9fe5b8c91559258455dc4b895eada139b70fcb2c" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot 0.12.1", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", + "postgres-types 0.2.4 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", + "socket2", + "tokio", + "tokio-util", +] + [[package]] name = "tokio-postgres" version = "0.7.7" @@ -6239,8 +6293,8 @@ dependencies = [ "percent-encoding", "phf", "pin-project-lite", - "postgres-protocol", - "postgres-types", + "postgres-protocol 0.6.4 (git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1addeae6e0968e3899ae6bf01cee2)", + "postgres-types 0.2.4 (git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1addeae6e0968e3899ae6bf01cee2)", "socket2", "tokio", "tokio-util", @@ -6255,7 +6309,7 @@ dependencies = [ "ring", "rustls 0.23.16", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-rustls 0.26.0", "x509-certificate", ] @@ -6839,7 +6893,7 @@ dependencies = [ "serde_json", "sysinfo", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?branch=vlad/interpreted-wal-record-replication-support)", "tokio-util", "tracing", "tracing-subscriber", @@ -7346,7 +7400,7 @@ dependencies = [ "num-traits", "once_cell", "parquet", - "postgres-types", + "postgres-types 0.2.4 (git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1addeae6e0968e3899ae6bf01cee2)", "prettyplease", "proc-macro2", "prost", @@ -7371,7 +7425,7 @@ dependencies = [ "time", "time-macros", "tokio", - "tokio-postgres", + "tokio-postgres 0.7.7 (git+https://github.com/neondatabase/rust-postgres.git?rev=20031d7a9ee1addeae6e0968e3899ae6bf01cee2)", "tokio-rustls 0.26.0", "tokio-stream", "tokio-util", diff --git a/Cargo.toml b/Cargo.toml index 8207726caaf2..6f061aceb9b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -214,10 +214,10 @@ log = "0.4" # # When those proxy changes are re-applied (see PR #8747), we can switch using # the tip of the 'neon' branch again. -postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" } -postgres-protocol = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" } -postgres-types = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" } -tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" } +postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "vlad/interpreted-wal-record-replication-support" } +postgres-protocol = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "vlad/interpreted-wal-record-replication-support" } +postgres-types = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "vlad/interpreted-wal-record-replication-support" } +tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "vlad/interpreted-wal-record-replication-support" } ## Local libraries compute_api = { version = "0.1", path = "./libs/compute_api/" } @@ -255,7 +255,7 @@ tonic-build = "0.12" [patch.crates-io] # Needed to get `tokio-postgres-rustls` to depend on our fork. -tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", rev = "20031d7a9ee1addeae6e0968e3899ae6bf01cee2" } +tokio-postgres = { git = "https://github.com/neondatabase/rust-postgres.git", branch = "vlad/interpreted-wal-record-replication-support" } ################# Binary contents sections