This is an automated email from the ASF dual-hosted git repository.
xikai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-horaedb.git
The following commit(s) were added to refs/heads/main by this push:
new 4b8e23eb feat: update pgwire to 0.19 (#1436)
4b8e23eb is described below
commit 4b8e23eb1c1373cb9079b6342f08cfaba5ebe828
Author: Ning Sun <[email protected]>
AuthorDate: Mon Jan 15 10:28:42 2024 +0800
feat: update pgwire to 0.19 (#1436)
## Rationale
`pgwire` author here. This patch updates `pgwire` to `0.19.1` which contains
compatibility fixes and API improvements.
## Detailed Changes
Upgrade `pawire` and its dependencies.
## Test Plan
Pass CI
---------
Co-authored-by: xikai.wxk <[email protected]>
---
Cargo.lock | 253 +++++++++++++--------
.../src/logical_optimizer/type_conversion.rs | 13 +-
server/Cargo.toml | 2 +-
server/src/postgresql/handler.rs | 10 +-
4 files changed, 176 insertions(+), 102 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 40c74b63..7118256d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,7 +32,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"once_cell",
"version_check",
]
@@ -45,7 +45,7 @@ checksum =
"2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [
"cfg-if 1.0.0",
"const-random",
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"once_cell",
"version_check",
]
@@ -203,6 +203,12 @@ checksum =
"bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
name = "arena"
version = "1.2.6-alpha"
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
[[package]]
name = "arrayref"
version = "0.3.7"
@@ -717,7 +723,7 @@ checksum =
"0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -750,7 +756,7 @@ checksum =
"cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -962,7 +968,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -1151,9 +1157,9 @@ checksum =
"14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
[[package]]
name = "bytes_ext"
@@ -1256,11 +1262,12 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
dependencies = [
"jobserver",
+ "libc",
]
[[package]]
@@ -1286,18 +1293,17 @@ checksum =
"baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.26"
+version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
"serde",
- "time 0.1.43",
"wasm-bindgen",
- "winapi",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -1610,7 +1616,7 @@ version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"once_cell",
"proc-macro-hack",
"tiny-keccak",
@@ -1880,7 +1886,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -1897,7 +1903,7 @@ checksum =
"2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -1945,7 +1951,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -1967,7 +1973,7 @@ checksum =
"836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core 0.20.3",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -2202,9 +2208,9 @@ dependencies = [
[[package]]
name = "der"
-version = "0.7.7"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
dependencies = [
"const-oid",
"zeroize",
@@ -2212,13 +2218,13 @@ dependencies = [
[[package]]
name = "derive-new"
-version = "0.5.9"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
+checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
@@ -2260,7 +2266,7 @@ checksum =
"9abcad25e9720609ccb3dcdb795d845e37d8ce34183330a9f48b03a1a71c8e21"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -2307,9 +2313,9 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
@@ -2718,7 +2724,7 @@ checksum =
"89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -2808,27 +2814,15 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
dependencies = [
"cfg-if 1.0.0",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "gimli"
version = "0.27.2"
@@ -3375,7 +3369,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "5305557fa27b460072ae15ce07617e999f5879f14d376c8449f0bfb9f9d8e91e"
dependencies = [
"derive_utils",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -3620,9 +3614,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.147"
+version = "0.2.152"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
[[package]]
name = "libloading"
@@ -4073,7 +4067,7 @@ dependencies = [
"mysql_common 0.30.6",
"named_pipe",
"once_cell",
- "pem",
+ "pem 2.0.1",
"percent-encoding",
"rustls 0.21.6",
"rustls-pemfile 1.0.2",
@@ -4099,7 +4093,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
"termcolor",
"thiserror",
]
@@ -4409,7 +4403,7 @@ dependencies = [
"quick-xml 0.28.2",
"rand 0.8.5",
"reqwest",
- "ring",
+ "ring 0.16.20",
"serde",
"serde_json",
"snafu 0.7.4",
@@ -4805,6 +4799,16 @@ dependencies = [
"serde",
]
+[[package]]
+name = "pem"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
+dependencies = [
+ "base64 0.21.0",
+ "serde",
+]
+
[[package]]
name = "percent-encoding"
version = "2.2.0"
@@ -4823,9 +4827,9 @@ dependencies = [
[[package]]
name = "pgwire"
-version = "0.15.0"
+version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e2de42ee35f9694def25c37c15f564555411d9904b48e33680618ee7359080dc"
+checksum = "17780c93587822c191c3f4d43fa5f6bc6df1e51b9f58a0be0cd1b7fd6e80d9e6"
dependencies = [
"async-trait",
"base64 0.21.0",
@@ -4833,18 +4837,17 @@ dependencies = [
"chrono",
"derive-new",
"futures 0.3.28",
- "getset",
"hex",
"log",
"md5",
"postgres-types",
"rand 0.8.5",
- "ring",
+ "ring 0.17.7",
"stringprep",
"thiserror",
"time 0.3.20",
"tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls 0.25.0",
"tokio-util",
"x509-certificate",
]
@@ -4993,6 +4996,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "f028f05971fe20f512bcc679e2c10227e57809a3af86a7606304435bc8896cd6"
dependencies = [
+ "array-init",
"bytes",
"chrono",
"fallible-iterator",
@@ -5053,7 +5057,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
dependencies = [
"proc-macro2",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -5107,9 +5111,9 @@ checksum =
"dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
dependencies = [
"unicode-ident",
]
@@ -5525,9 +5529,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.32"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [
"proc-macro2",
]
@@ -5646,7 +5650,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
]
[[package]]
@@ -5722,7 +5726,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"redox_syscall 0.2.16",
"thiserror",
]
@@ -5850,11 +5854,25 @@ dependencies = [
"libc",
"once_cell",
"spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
"web-sys",
"winapi",
]
+[[package]]
+name = "ring"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+dependencies = [
+ "cc",
+ "getrandom 0.2.12",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "rkyv"
version = "0.7.41"
@@ -6032,7 +6050,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
dependencies = [
"log",
- "ring",
+ "ring 0.16.20",
"sct",
"webpki",
]
@@ -6044,11 +6062,25 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
dependencies = [
"log",
- "ring",
+ "ring 0.16.20",
"rustls-webpki 0.101.2",
"sct",
]
+[[package]]
+name = "rustls"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
+dependencies = [
+ "log",
+ "ring 0.17.7",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.1",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "rustls-pemfile"
version = "0.2.1"
@@ -6067,14 +6099,20 @@ dependencies = [
"base64 0.21.0",
]
+[[package]]
+name = "rustls-pki-types"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a"
+
[[package]]
name = "rustls-webpki"
version = "0.100.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -6083,8 +6121,19 @@ version = "0.101.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b"
+dependencies = [
+ "ring 0.17.7",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
]
[[package]]
@@ -6173,8 +6222,8 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -6224,7 +6273,7 @@ checksum =
"4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -6717,7 +6766,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -6732,9 +6781,9 @@ dependencies = [
[[package]]
name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]]
name = "symbolic-common"
@@ -6772,9 +6821,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.28"
+version = "2.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
dependencies = [
"proc-macro2",
"quote",
@@ -6938,22 +6987,22 @@ checksum =
"222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -7112,7 +7161,7 @@ checksum =
"630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -7128,11 +7177,12 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.24.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [
- "rustls 0.21.6",
+ "rustls 0.22.2",
+ "rustls-pki-types",
"tokio",
]
@@ -7591,6 +7641,12 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
[[package]]
name = "url"
version = "2.3.1"
@@ -7614,7 +7670,7 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"rand 0.8.5",
"uuid-macro-internal",
]
@@ -7627,7 +7683,7 @@ checksum =
"f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.28",
+ "syn 2.0.48",
]
[[package]]
@@ -7864,8 +7920,8 @@ version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -8155,20 +8211,21 @@ dependencies = [
[[package]]
name = "x509-certificate"
-version = "0.20.0"
+version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2133ce6c08c050a5b368730a67c53a603ffd4a4a6c577c5218675a19f7782c05"
+checksum = "66534846dec7a11d7c50a74b7cdb208b9a581cad890b7866430d438455847c85"
dependencies = [
"bcder",
"bytes",
"chrono",
"der",
"hex",
- "pem",
- "ring",
+ "pem 3.0.3",
+ "ring 0.17.7",
"signature",
"spki",
"thiserror",
+ "zeroize",
]
[[package]]
@@ -8214,6 +8271,20 @@ name = "zeroize"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
[[package]]
name = "zstd"
diff --git a/query_frontend/src/logical_optimizer/type_conversion.rs
b/query_frontend/src/logical_optimizer/type_conversion.rs
index e20f749f..89f0a14e 100644
--- a/query_frontend/src/logical_optimizer/type_conversion.rs
+++ b/query_frontend/src/logical_optimizer/type_conversion.rs
@@ -334,12 +334,13 @@ fn naive_datetime_to_timestamp(s: &str, datetime:
NaiveDateTime) -> Result<i64,
LocalResult::None => Err(ArrowError::CastError(format!(
"Error parsing '{s}' as timestamp: local time representation is
invalid"
))),
- LocalResult::Single(local_datetime) => {
- Ok(local_datetime.with_timezone(&Utc).timestamp_nanos() /
1_000_000)
- }
-
- LocalResult::Ambiguous(local_datetime, _) => {
- Ok(local_datetime.with_timezone(&Utc).timestamp_nanos() /
1_000_000)
+ LocalResult::Single(local_datetime) |
LocalResult::Ambiguous(local_datetime, _) => {
+ match local_datetime.with_timezone(&Utc).timestamp_nanos_opt() {
+ Some(v) => Ok(v / 1_000_000),
+ None => Err(ArrowError::CastError(format!(
+ "Error parsing '{s}' as timestamp: failed to convert into
nanos"
+ ))),
+ }
}
}
}
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 465c07ce..7dd26bd1 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -58,7 +58,7 @@ notifier = { workspace = true }
opensrv-mysql = "0.1.0"
partition_table_engine = { workspace = true }
paste = { workspace = true }
-pgwire = "0.15.0"
+pgwire = "0.19.1"
profile = { workspace = true }
prom-remote-api = { workspace = true, features = ["warp"] }
prometheus = { workspace = true }
diff --git a/server/src/postgresql/handler.rs b/server/src/postgresql/handler.rs
index 2ba56166..feecbca8 100644
--- a/server/src/postgresql/handler.rs
+++ b/server/src/postgresql/handler.rs
@@ -42,7 +42,11 @@ pub struct PostgresqlHandler {
#[async_trait]
impl SimpleQueryHandler for PostgresqlHandler {
- async fn do_query<'a, C>(&self, _client: &C, sql: &'a str) ->
PgWireResult<Vec<Response<'a>>>
+ async fn do_query<'a, C>(
+ &self,
+ _client: &mut C,
+ sql: &'a str,
+ ) -> PgWireResult<Vec<Response<'a>>>
where
C: ClientInfo + Unpin + Send + Sync,
{
@@ -93,9 +97,7 @@ impl PostgresqlHandler {
fn into_pg_reponse<'a>(out: Output) -> PgWireResult<Response<'a>> {
match out {
Output::AffectedRows(0) => Ok(Response::EmptyQuery),
- Output::AffectedRows(count) => {
- Ok(Response::Execution(Tag::new_for_execution("", Some(count))))
- }
+ Output::AffectedRows(count) =>
Ok(Response::Execution(Tag::new("OK").with_rows(count))),
Output::Records(rows) => {
if rows.is_empty() {
return Ok(Response::EmptyQuery);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
