From 911506ee7dcba7bb39256cb915371ee98dc94720 Mon Sep 17 00:00:00 2001 From: Peter Hoffmann <954078+p-hoffmann@users.noreply.github.com> Date: Sun, 3 Aug 2025 19:04:07 +0800 Subject: [PATCH 1/2] upgrade pgwire --- Cargo.lock | 106 +++++++++++++++++++++++++++++++++----------- Cargo.toml | 2 +- Dockerfile.trex | 2 +- ext/trex/Cargo.toml | 1 + rust-toolchain.toml | 2 +- 5 files changed, 85 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b31b8bd9..b63702b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -356,6 +356,20 @@ dependencies = [ "arrow-select", ] +[[package]] +name = "arrow-pg" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3f3b620acb02f8eab26658a5fe845e720f49bd9382418dbfc108a891f0e9d2f" +dependencies = [ + "bytes", + "chrono", + "futures", + "pgwire 0.31.1", + "postgres-types 0.2.9", + "rust_decimal", +] + [[package]] name = "arrow-row" version = "54.2.1" @@ -1533,9 +1547,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "bytes-utils" @@ -1790,7 +1804,7 @@ dependencies = [ "glob", "log", "once_cell", - "rustls 0.23.20", + "rustls 0.23.23", "tokio", "tracing-subscriber", "trex_core", @@ -2572,7 +2586,7 @@ dependencies = [ "serde_json", "thiserror 2.0.8", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.2", "tokio-socks", "tokio-util", "tower", @@ -2939,7 +2953,7 @@ checksum = "c2948f68c634d354133a0dc4ce826129c5be354ae9f62b02c52f5f86766e807c" dependencies = [ "deno_core", "deno_native_certs", - "rustls 0.23.20", + "rustls 0.23.23", "rustls-pemfile 2.1.0", "rustls-tokio-stream", "rustls-webpki 0.102.8", @@ -3127,6 +3141,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "derive-new" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "derive_builder" version = "0.12.0" @@ -4867,10 +4892,10 @@ dependencies = [ "http 1.2.0", "hyper 1.5.2", "hyper-util", - "rustls 0.23.20", + "rustls 0.23.23", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.2", "tower-service", "webpki-roots", ] @@ -5391,13 +5416,14 @@ dependencies = [ [[package]] name = "lazy-regex" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" dependencies = [ "lazy-regex-proc_macros", "once_cell", "regex", + "regex-lite", ] [[package]] @@ -5687,6 +5713,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" +[[package]] +name = "md5" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" + [[package]] name = "memchr" version = "2.7.4" @@ -6571,15 +6603,37 @@ dependencies = [ "async-trait", "bytes", "chrono", - "derive-new", + "derive-new 0.6.0", "futures", "hex", - "md5", + "md5 0.7.0", "postgres-types 0.2.9", "rand 0.8.5", "thiserror 1.0.62", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.2", + "tokio-util", +] + +[[package]] +name = "pgwire" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3ddfc6d286c5026dfe54ca859452a29d86d2a94dd32acf34cce75d7a8db64f9" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "derive-new 0.7.0", + "futures", + "hex", + "lazy-regex", + "md5 0.8.0", + "postgres-types 0.2.9", + "rand 0.9.0", + "rust_decimal", + "thiserror 2.0.8", + "tokio", "tokio-util", ] @@ -7034,7 +7088,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.1.0", - "rustls 0.23.20", + "rustls 0.23.23", "socket2", "thiserror 2.0.8", "tokio", @@ -7052,7 +7106,7 @@ dependencies = [ "rand 0.8.5", "ring 0.17.14", "rustc-hash 2.1.0", - "rustls 0.23.20", + "rustls 0.23.23", "rustls-pki-types", "slab", "thiserror 2.0.8", @@ -7394,7 +7448,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.20", + "rustls 0.23.23", "rustls-pemfile 2.1.0", "rustls-pki-types", "serde", @@ -7402,7 +7456,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.2", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.2", "tokio-socks", "tokio-util", "tower-service", @@ -7578,6 +7632,7 @@ dependencies = [ "borsh", "bytes", "num-traits", + "postgres-types 0.2.9", "rand 0.8.5", "rkyv", "serde", @@ -7683,9 +7738,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "aws-lc-rs", "log", @@ -7769,7 +7824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22557157d7395bc30727745b365d923f1ecc230c4c80b176545f3f4f08c46e33" dependencies = [ "futures", - "rustls 0.23.20", + "rustls 0.23.23", "socket2", "tokio", ] @@ -9300,11 +9355,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.20", + "rustls 0.23.23", "tokio", ] @@ -9528,6 +9583,7 @@ dependencies = [ "anyhow", "arrow-array", "arrow-json", + "arrow-pg", "async-trait", "bigdecimal", "byteorder", @@ -9541,12 +9597,12 @@ dependencies = [ "futures", "hf-hub", "pg_escape", - "pgwire", + "pgwire 0.23.0", "pin-project-lite", "postgres-protocol 0.6.7", "postgres-replication", "prost", - "rustls 0.23.20", + "rustls 0.23.23", "serde", "serde_json", "thiserror 1.0.62", @@ -9773,7 +9829,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.20", + "rustls 0.23.23", "rustls-native-certs 0.7.1", "rustls-pki-types", "serde", diff --git a/Cargo.toml b/Cargo.toml index 291bc8f5..38cd3161 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,7 +138,7 @@ hyper = { version = "1.4.1", features = ["full"] } hyper-util = { version = "=0.1.7", features = ["tokio", "server", "server-auto"] } hyper_v014 = { package = "hyper", version = "0.14.26", features = ["runtime", "http1"] } indexmap = { version = "2", features = ["serde"] } -lazy-regex = "=3.1.0" +lazy-regex = "=3.3.0" libc = "0.2.126" libz-sys = { version = "1.1.20", default-features = false } log = "0.4.20" diff --git a/Dockerfile.trex b/Dockerfile.trex index c25522da..1a7fb7ee 100644 --- a/Dockerfile.trex +++ b/Dockerfile.trex @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -FROM rust:1.83.0-bookworm AS builder +FROM rust:1.85.0-bookworm AS builder ARG TARGETPLATFORM ARG ONNXRUNTIME_VERSION=1.17.0 diff --git a/ext/trex/Cargo.toml b/ext/trex/Cargo.toml index 09a7cde6..6bfddb6a 100644 --- a/ext/trex/Cargo.toml +++ b/ext/trex/Cargo.toml @@ -56,6 +56,7 @@ clap = { workspace = true, default-features = true, features = [ tracing-subscriber = { workspace = true, default-features = true, features = [ "env-filter", ] } +arrow-pg = { version = "0.*", default-features = false } [features] unknown_types_to_bytes = [] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3d572e0d..b475f2f9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.82.0" +channel = "1.85.0" components = ["rustfmt", "clippy"] From 0d27b78a6ba083ce3a10702887294d8c1d4f9c85 Mon Sep 17 00:00:00 2001 From: Peter Hoffmann <954078+p-hoffmann@users.noreply.github.com> Date: Sun, 3 Aug 2025 19:36:44 +0800 Subject: [PATCH 2/2] update rust --- Dockerfile.trex | 2 +- crates/pgt/Cargo.toml | 2 ++ rust-toolchain.toml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.trex b/Dockerfile.trex index 1a7fb7ee..841692c0 100644 --- a/Dockerfile.trex +++ b/Dockerfile.trex @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -FROM rust:1.85.0-bookworm AS builder +FROM rust:1.85.1-bookworm AS builder ARG TARGETPLATFORM ARG ONNXRUNTIME_VERSION=1.17.0 diff --git a/crates/pgt/Cargo.toml b/crates/pgt/Cargo.toml index a3fdb4a0..ab8f8d95 100644 --- a/crates/pgt/Cargo.toml +++ b/crates/pgt/Cargo.toml @@ -42,3 +42,5 @@ serde_json = "1.0" [features] default = [] json_output = ["serde_json"] + +[workspace] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b475f2f9..2a91a5a9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.85.0" +channel = "1.85.1" components = ["rustfmt", "clippy"]