From 2d52df53b0e57618b96c56fe68cb86901037d213 Mon Sep 17 00:00:00 2001 From: serprex <159546+serprex@users.noreply.github.com> Date: Wed, 18 Nov 2026 03:53:58 +0000 Subject: [PATCH] update dependencies prometheus_client now handles escaping lables --- Cargo.lock | 276 +++++++++++++++++----------------- Cargo.toml | 4 +- pgext/pg-clickhouse-c | 2 +- src/catalog/type_bridge.rs | 5 +- src/ch.rs | 13 +- src/emit/ch_emitter.rs | 27 ++-- src/emit/pipeline/inserter.rs | 6 +- src/ops/metrics.rs | 82 +++------- src/toast/resolver.rs | 8 +- 9 files changed, 201 insertions(+), 222 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48776829..afb789fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.51" +version = "0.4.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5755640120b24961f8231e05892e4a4f7e0d04e8aeca161508c9c397946970" +checksum = "6ad47a740fb906fffdd891e8b6d5fde2511600f7bfaebd68939fa08a14999459" dependencies = [ "compression-codecs", "compression-core", @@ -148,7 +148,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -221,9 +221,9 @@ dependencies = [ [[package]] name = "brotli" -version = "9.1.1" +version = "9.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "627b7cfb0578f0eafce087a90fcd40add1231900b69e4d4de2d456260a4f5d81" +checksum = "9071f285ed78f04f37d675abaaef5de7689e2f30a216c8dc6795465d81910a13" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "6.3.1" +version = "6.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c74c9c51b9140663e196b5fb88bc94c334d7a497c8311cb759d8557874747f" +checksum = "cc031cd87c6529082b0b65c604e86af0ed7744841b17ccfe60b1e31fa606179e" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.20.3" +version = "3.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +checksum = "87a0cf66fd1eb2fb7b822cb78370d82303750809bc6ba855f3f58e517d3238db" [[package]] name = "bytemuck" @@ -270,15 +270,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.12.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" +checksum = "776dfebd015e2d8732c684a2c71003674ccb49457b539b9e82151ba38e96dd7c" [[package]] name = "cc" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0" +checksum = "33ef9e3e8154a45c7a95cff4c1299702106ad94062d7bb85fdc5d3a5afd91d45" dependencies = [ "find-msvc-tools", "jobserver", @@ -311,9 +311,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.7" +version = "4.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" +checksum = "ac230478587d0269d8d6998b82ae69ea51509d55df66d9e92edd1f986904cd4a" dependencies = [ "clap_builder", "clap_derive", @@ -333,27 +333,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.7" +version = "4.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" +checksum = "895c9d8d2ac2dd8b8a29f3724a14e72aaaa6debcf8c38c82f97305c6a172767a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] name = "clap_lex" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" +checksum = "e0921b3876b3a1df8a1c9f912e7f94342458022c2e84288015893d83c4d62a79" [[package]] name = "clickhouse-c-rs" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a6e8431f37cec43b8e04539c042335b7132b92995a7bf4fc52a5ed53431bcf" +checksum = "0247bada721dd4fc0da96670735ec3ac620e817c16d204d9aab180b10f01b262" dependencies = [ "cc", "pkg-config", @@ -397,9 +397,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.46" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae36683101b2899f48bd31f8db9839437356188e3b1ff23096e73dab09ba8fe" +checksum = "84f840cff84d10085260e460023934d0af699e71212b09b2a41452e8bd9cda43" dependencies = [ "brotli", "compression-core", @@ -428,9 +428,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +checksum = "be95d4a884358a21a199689323c29e9256b4a1b315e22f183d155422041d3a9a" [[package]] name = "core-foundation" @@ -459,18 +459,18 @@ dependencies = [ [[package]] name = "crc32c" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" +checksum = "7f132a176423ee852e8f0a35d43088d1850966b50745be818a88b76f64b1c6cb" dependencies = [ "rustc_version", ] [[package]] name = "crc32fast" -version = "1.5.3" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055" +checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64" dependencies = [ "cfg-if", ] @@ -513,9 +513,9 @@ dependencies = [ [[package]] name = "ctor" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d" +checksum = "ea691ed9f36489d087419b8b2ba3ef27d89621380b4178c73e2445a379e4e0f4" dependencies = [ "link-section", "linktime-proc-macro", @@ -523,9 +523,9 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2376ffd6f96d8a9db59875b4b6b0237d6900b5baf64279714e05493ce64828a" +checksum = "261af4dc7a06ea8a527a8717d8cbba3417530d6ea14e1edb3de6b67806be474f" dependencies = [ "cmov", ] @@ -556,7 +556,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -585,9 +585,9 @@ checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "errno" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "e35d6e78f4cebb90e51d543db8fe41528851d6deeef6ef21ebd4bfdc1e784776" dependencies = [ "libc", "windows-sys 0.61.2", @@ -651,7 +651,7 @@ checksum = "3e91d94c6885390b81782d7ee60fd6583b33907333a8b340de25ccf468353315" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -662,9 +662,9 @@ checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4" dependencies = [ "crc32fast", "miniz_oxide 0.9.1", @@ -754,7 +754,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1151,18 +1151,18 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "jni" @@ -1225,9 +1225,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" dependencies = [ "cfg-if", "futures-util", @@ -1292,9 +1292,9 @@ dependencies = [ [[package]] name = "link-section" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c29a617ce3df32c08497bdc1ab6e2376e0b17948ac166a2fbe5977c5954cd9" +checksum = "4d9aae57673c1a235149777a74d152f3210ebd3e3b13346d2cdb6809e566bd3c" [[package]] name = "linktime-proc-macro" @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" +checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "lru-slab" @@ -1410,9 +1410,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" +checksum = "20521a903f02b0a573cd6840e9d0a5a0cc043d361fe924092cd70f8556cc9c4a" dependencies = [ "libc", "wasi 0.11.1+wasi-snapshot-preview1", @@ -1581,9 +1581,9 @@ dependencies = [ [[package]] name = "pglz" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cbae2e9ce0605b5de065e53f781f82a1b3677ec1c8bbd12a6c3ccfeeeb5d70" +checksum = "a4c5465ae63794e91815a68f0aef10f223e6dd2528ab4726a1c45130702ff02e" [[package]] name = "phf" @@ -1668,7 +1668,7 @@ dependencies = [ "hmac", "md-5", "memchr", - "rand 0.10.3", + "rand 0.10.4", "sha2", "stringprep", ] @@ -1713,9 +1713,9 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1784dc11a05f5a8f57c4a62915686be140f24f70301290b997e317241fa9ffc2" +checksum = "f021d42d29841d029b61b45a25a7ef94feaf1d744913e59665103333a56045b8" dependencies = [ "dtoa", "itoa", @@ -1731,14 +1731,14 @@ checksum = "01e34894696ff94f64a20c2c373a6440903e9c2789a303d68ec6e6f953f890e4" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] name = "prost" -version = "0.14.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" +checksum = "3ef0b569d1d907ab3a28596aee62cf1f61dacb0529a4bedcd8e7460e2d5228b4" dependencies = [ "bytes", "prost-derive", @@ -1746,9 +1746,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.14.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" +checksum = "1ad9c5423459fa2f729b8d9235fab810aa29628b171467744fc86d21460ad70d" dependencies = [ "anyhow", "itertools", @@ -1759,9 +1759,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.14.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a" +checksum = "f29a7c4c7a84cef41a53d338a2d10d4f1b043ea5c3dde26db22ee2c9c1b1c75b" dependencies = [ "prost", ] @@ -1805,7 +1805,7 @@ dependencies = [ "bytes", "getrandom 0.4.3", "lru-slab", - "rand 0.10.3", + "rand 0.10.4", "rand_pcg", "ring", "rustc-hash", @@ -1865,9 +1865,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" +checksum = "8f6fa277c67e6ea590466f04c3fe82cb509f0864fe470643e5570de9514a9b11" dependencies = [ "chacha20", "getrandom 0.4.3", @@ -1919,9 +1919,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" +checksum = "41d60ef07df457506a0a1a2073112eb4aae5733dbd2813c3da77d1b0fd441158" dependencies = [ "aho-corasick", "memchr", @@ -1930,9 +1930,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" +checksum = "d902046e6a28a1e4c3cab97258a0ce11e994903f01c2d97a9447a0b3df85f4f6" [[package]] name = "reqwest" @@ -2059,9 +2059,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.15.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" +checksum = "102f35f7de7b06d8c61f1cff6592f5253e0dea431c74867aad5dfd70f44663fb" dependencies = [ "web-time", "zeroize", @@ -2096,9 +2096,9 @@ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" [[package]] name = "rustls-webpki" -version = "0.103.16" +version = "0.103.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" +checksum = "e3a0760a887c14823fca5a1c970b01d47c328c696c0c64829d1df50e8f853fd5" dependencies = [ "aws-lc-rs", "ring", @@ -2198,7 +2198,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2216,9 +2216,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" +checksum = "9c187e0a369471c550af028cba56d4f4fa2a489ad28151ae95a4d340a2a8b782" dependencies = [ "serde_core", ] @@ -2307,9 +2307,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.4" +version = "1.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" +checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46" [[package]] name = "socket2" @@ -2369,9 +2369,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.9" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -2395,7 +2395,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2438,7 +2438,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2516,7 +2516,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2538,7 +2538,7 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "rand 0.10.3", + "rand 0.10.4", "socket2", "tokio", "tokio-util", @@ -2583,9 +2583,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.8+spec-1.1.0" +version = "1.2.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" +checksum = "d5755c51863cdac711f1956baf8eb9588e060755f7d3c4c979e70ea1e1f32cd7" dependencies = [ "serde_core", "serde_spanned", @@ -2597,9 +2597,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49" dependencies = [ "serde_core", ] @@ -2615,15 +2615,15 @@ dependencies = [ [[package]] name = "toml_writer" -version = "1.1.3+spec-1.1.0" +version = "1.2.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" +checksum = "009dbb7700f11c55ef83aebbe4c0e9cf1f1ac0844bd8d6f00dc38f302026e13a" [[package]] name = "tonic" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1fa9b1a51188f3266a823208078315811269d06d272c3a61be0b9a194194ff" +checksum = "e2cdfc673aabd30fe8fee92e65837b644c37c5d47f0f97ae6d5e0f1237d15e1b" dependencies = [ "async-trait", "base64 0.22.1", @@ -2649,9 +2649,9 @@ dependencies = [ [[package]] name = "tonic-prost" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63c616ffaa648f7c5dd5657e97d9a285fcb44ff3b70da761d436f5a13ff7be6" +checksum = "eba464054e2226f182a34489b8b079bf4c6e3e7ab5fd7fc30e024f24aa92a484" dependencies = [ "bytes", "prost", @@ -2660,9 +2660,9 @@ dependencies = [ [[package]] name = "tonic-types" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7673cdf53817d382bad8ecb56507b4595a2adb07ef16bf0dd965ef48c1fced" +checksum = "ccbb6c31deb8e99dcdf87df19c5289b7838a600da74a8224baa671e52fe7c5ad" dependencies = [ "prost", "prost-types", @@ -2821,9 +2821,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" +checksum = "993ad287eb20e8ba755312801cfe1413e0f25d604075863acaddca10b04c1833" [[package]] name = "untrusted" @@ -2851,9 +2851,12 @@ dependencies = [ [[package]] name = "utf8_iter" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +checksum = "af3bd9d3e571c26fcce9d033b87ea5ab061b8d2ffe9b7a5675d810d68f03edf0" +dependencies = [ + "utf_types", +] [[package]] name = "utf8parse" @@ -2861,6 +2864,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "utf_types" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" + [[package]] name = "valuable" version = "0.1.1" @@ -3026,12 +3035,11 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" dependencies = [ "cfg-if", - "once_cell", "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", @@ -3039,9 +3047,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.79" +version = "0.4.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" +checksum = "5e14e0327cb5368ad60ccb22d04a9827a693c95a926d8d125e9fa39e0baec501" dependencies = [ "js-sys", "tokio", @@ -3050,9 +3058,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3060,22 +3068,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" dependencies = [ "unicode-ident", ] @@ -3095,9 +3103,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" +checksum = "d7d179596ff5ec0f6de4db64d54011bde6289cc49603d3a6e4ce3f329207ab88" dependencies = [ "js-sys", "wasm-bindgen", @@ -3115,18 +3123,18 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" +checksum = "293198dcebfb821155b5092ab94b5a82ff180eddd7241df3bd6e66a4ffd1a585" dependencies = [ "rustls-pki-types", ] [[package]] name = "webpki-roots" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" +checksum = "7265c9301c16a8711c992c2d8da90ee77ef54b1ed51482d6dfeb00dc756b1297" dependencies = [ "rustls-pki-types", ] @@ -3243,9 +3251,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +checksum = "8c3b93199df0ab874cdf0c6a94f0a0dc3423fe41f1cafb62b8bd7b1deb277aef" [[package]] name = "wit-bindgen" @@ -3278,7 +3286,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] @@ -3319,15 +3327,15 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] [[package]] name = "zeroize" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +checksum = "85ccff8a4805aba1eaa4cd4afcd49f7557dd2cf5fd79ffc37f8959466effc5aa" [[package]] name = "zerotrie" @@ -3359,7 +3367,7 @@ checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3376,27 +3384,27 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zstd" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3ae9bf90af6e40197bef767eeefc46ad6397420fe873830bd85e5fbbfb3c70" +checksum = "ad5020ab8f27bfc0024ad0a07aed6bf022a16208f479686fbed4fdd0c85eb0b3" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded520f16b29e1a9b771c722221b2b0a0398c2316d9bb3c42b458a5414d7434b" +checksum = "5a9ea9cc2576c2fcc104e9cec04f46e3ede564f4fbc206831e4ef7e859a4140d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.1.2+zstd.1.5.7" +version = "2.1.3+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "481ada9c543b2323cbb7bbdbb5249177fbf0188ed959ed2c15e4b22421c84ed3" +checksum = "f729a06d0257428fd9d997ac8db7e1407bd0262ab016b085b36bc52957c0052d" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 86eafa95..ce280a4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ unused_async = "warn" [dependencies] wal-rus = { version = "0.4.2", default-features = false, features = ["s3", "gcs", "backup"] } -clickhouse-c-rs = { version = "0.2.2", default-features = false, features = ["tokio", "tls"] } +clickhouse-c-rs = { version = "0.3.0", default-features = false, features = ["tokio", "tls"] } # hash keys are internal (relfilenodes, oids, xids, names), never network # input, so SipHash's HashDoS margin buys nothing at 2-4x per probe foldhash = "0.2" @@ -93,7 +93,7 @@ opentelemetry_sdk = { version = "0.33", features = ["rt-tokio"] } opentelemetry-otlp = { version = "0.33", default-features = false, features = ["grpc-tonic", "trace"] } tracing-opentelemetry = { version = "0.34", default-features = false } mimalloc = "0.1.52" -prometheus-client = "0.25.1" +prometheus-client = "0.26" # `harness = false` throughout: these take shape flags rather than libtest # filters. Bootstrap pump + drain needs no PG and no CH; oracle batch needs diff --git a/pgext/pg-clickhouse-c b/pgext/pg-clickhouse-c index 4fe6b70d..153d3e6a 160000 --- a/pgext/pg-clickhouse-c +++ b/pgext/pg-clickhouse-c @@ -1 +1 @@ -Subproject commit 4fe6b70dbe66f1cce02a42e8f6ee1479cae62456 +Subproject commit 153d3e6abf483816f1d8ecd2dabff265aed37a2e diff --git a/src/catalog/type_bridge.rs b/src/catalog/type_bridge.rs index cd721b9f..3da91b4e 100644 --- a/src/catalog/type_bridge.rs +++ b/src/catalog/type_bridge.rs @@ -322,10 +322,9 @@ fn render_pg_timestamp(pg_micros: i64) -> AsciiBuf<32> { out } -fn datetime64_scale(ch_inner: &str) -> Option { +fn datetime64_scale(ch_inner: &str) -> Option { let ast = TypeAst::parse(ch_inner, Allocator::global(&mimalloc::MiMalloc)).ok()?; - let view = ast.view(); - (view.kind() == Some(Kind::DateTime64)).then(|| view.datetime64_scale()) + ast.view().datetime64_scale() } fn format_uuid(b: &[u8; 16]) -> AsciiArray<36> { diff --git a/src/ch.rs b/src/ch.rs index cfee26e9..e6fbd3da 100644 --- a/src/ch.rs +++ b/src/ch.rs @@ -8,8 +8,8 @@ use std::time::{Duration, Instant}; use backon::BackoffBuilder; use clickhouse_c::tls::rustls::pki_types::ServerName; use clickhouse_c::{ - AsyncClient, Block, BoxedAsyncClient, ClientOpts, Codec, Compression, ErrorKind, Event, - Exception, + Allocator, AsyncClient, Block, BoxedAsyncClient, ClientOpts, Codec, Compression, ErrorKind, + Event, Exception, QueryOpts, }; use thiserror::Error; use tokio::net::TcpStream; @@ -145,6 +145,7 @@ pub async fn connect_client( .user(config.user()) .password(config.password()); opts.compression = compression.to_wire(); + let alloc = Allocator::global(&mimalloc::MiMalloc); let sock = TcpStream::connect((config.host(), config.port())).await?; sock.set_nodelay(true)?; let client = if config.secure() { @@ -156,11 +157,11 @@ pub async fn connect_client( .connect(server_name, sock) .await .map_err(|e| std::io::Error::new(e.kind(), format!("TLS handshake: {e}")))?; - AsyncClient::handshake_on(stream, opts, codec) + AsyncClient::handshake_on(stream, &opts, alloc, codec) .await .map(AsyncClient::boxed) } else { - AsyncClient::handshake_on(sock, opts, codec) + AsyncClient::handshake_on(sock, &opts, alloc, codec) .await .map(AsyncClient::boxed) }; @@ -225,7 +226,7 @@ pub async fn exec_drain( timeout: Duration, ) -> Result<(), EmitterError> { with_timeout(timeout, async { - client.send_query(sql, None).await?; + client.send_query(sql, &QueryOpts::new()).await?; drain_to_end_of_stream(client).await?; Ok(()) }) @@ -239,7 +240,7 @@ pub async fn query_strings( timeout: Duration, ) -> Result, EmitterError> { with_timeout(timeout, async { - client.send_query(sql, None).await?; + client.send_query(sql, &QueryOpts::new()).await?; let mut out = Vec::new(); loop { match client.recv_event().await? { diff --git a/src/emit/ch_emitter.rs b/src/emit/ch_emitter.rs index 72b7181f..0fec3f0b 100644 --- a/src/emit/ch_emitter.rs +++ b/src/emit/ch_emitter.rs @@ -1426,7 +1426,7 @@ pub(crate) struct ColumnPlan { pub(crate) type_repr: String, pub(crate) ast: TypeAst, pub(crate) decimal: Option, - pub(crate) datetime64_scale: i32, + pub(crate) datetime64_scale: u32, pub(crate) non_finite: NonFinite, pub(crate) encoding: ColumnEncoding, } @@ -1449,8 +1449,8 @@ impl NonFinite { if decimal.is_none() && !matches!(inner.kind(), Some(Kind::Date32 | Kind::DateTime64)) { return Ok(Self::default()); } - let precision = - usize::try_from(inner.decimal_precision()).map_err(|_| "bad Decimal precision")?; + let precision = usize::try_from(inner.decimal_precision().unwrap_or(0)) + .map_err(|_| "bad Decimal precision")?; let scale = usize::from(decimal.map_or(0, |w| w.scale)); let bound = format!("{}.{}", "9".repeat(precision - scale), "9".repeat(scale)); let cell = |key: &str, sub: &Option| { @@ -1662,7 +1662,9 @@ impl TablePlan { name: c.target_name.clone(), type_repr: canonical_type(&ast, &c.target_type), encoding: ColumnEncoding::choose(att, &ast), - datetime64_scale: types::strip_nullable(ast.view()).datetime64_scale(), + datetime64_scale: types::strip_nullable(ast.view()) + .datetime64_scale() + .unwrap_or(0), ast, decimal, non_finite: NonFinite::default(), @@ -1679,7 +1681,8 @@ impl TablePlan { type_repr: canonical_type(&oast, ty), encoding: ColumnEncoding::choose(att, &oast), datetime64_scale: types::strip_nullable(oast.view()) - .datetime64_scale(), + .datetime64_scale() + .unwrap_or(0), ast: oast, decimal, non_finite: NonFinite::default(), @@ -2257,7 +2260,7 @@ fn decimal_wire_of(ast: &TypeAst) -> Option { _ => return None, }; Some(DecimalWire { - scale: u8::try_from(inner.decimal_scale()).ok()?, + scale: u8::try_from(inner.decimal_scale()?).ok()?, width, }) } @@ -2488,7 +2491,7 @@ fn unsupported(kind: &'static str) -> EmitterError { } } -fn timestamp_ticks(pg_us: i64, scale: i32) -> Result { +fn timestamp_ticks(pg_us: i64, scale: u32) -> Result { micros_to_ticks( i128::from(pg_us) + i128::from(DATETIME64_PG_EPOCH_US), scale, @@ -2496,15 +2499,15 @@ fn timestamp_ticks(pg_us: i64, scale: i32) -> Result { } /// Convert microseconds to `DateTime64(scale)` or `Time64(scale)` ticks -fn micros_to_ticks(us: i128, scale: i32) -> Result { - if !(0..=9).contains(&scale) { +fn micros_to_ticks(us: i128, scale: u32) -> Result { + if scale > 9 { return Err(EmitterError::Type("invalid temporal precision".into())); } let ticks = if scale < 6 { - let divisor = 10i128.pow((6 - scale) as u32); + let divisor = 10i128.pow(6 - scale); us / divisor } else { - us * 10i128.pow((scale - 6) as u32) + us * 10i128.pow(scale - 6) }; i64::try_from(ticks).map_err(|_| unsupported("finite temporal value overflows storage")) } @@ -2513,7 +2516,7 @@ fn encode_value( buf: &mut ColumnBuf, v: &ColumnValue, decimal: Option, - timestamp_scale: i32, + timestamp_scale: u32, ) -> Result<(), EmitterError> { match v { // Non-Nullable target takes type default diff --git a/src/emit/pipeline/inserter.rs b/src/emit/pipeline/inserter.rs index 0993f4aa..4fd7b10a 100644 --- a/src/emit/pipeline/inserter.rs +++ b/src/emit/pipeline/inserter.rs @@ -12,7 +12,7 @@ //! dedups by `_lsn`). Retry-exhaustion is fatal: the watermark can't advance //! without this batch. -use clickhouse_c::{Allocator, BlockBuilder, ColumnBuilder, TypeAst}; +use clickhouse_c::{Allocator, BlockBuilder, ColumnBuilder, QueryOpts, TypeAst}; use tokio::task::JoinHandle; use crate::ch::{ChConn, EmitterError, EndOfStream, drain_to_end_of_stream, with_timeout}; @@ -70,8 +70,8 @@ impl Inserter { .retry( |mut client| async move { let result = with_timeout(insert_timeout, async { - client.send_query(sql, None).await?; - client.send_data(Some(bb)).await?; + client.send_query(sql, &QueryOpts::new()).await?; + client.send_data(bb).await?; client.send_data_end().await?; drain_to_end_of_stream(&mut client).await }) diff --git a/src/ops/metrics.rs b/src/ops/metrics.rs index cf722468..b4de878b 100644 --- a/src/ops/metrics.rs +++ b/src/ops/metrics.rs @@ -12,7 +12,6 @@ //! cadence, HTTP server reads a snapshot per request. Endpoint is read-only by //! design (no `/quit`, no admin verbs); operator actions stay on the CLI. -use std::borrow::Cow; use std::collections::{BTreeMap, VecDeque}; use std::fmt; use std::io; @@ -74,32 +73,26 @@ macro_rules! encode_metric { /// [`encode_metric`] for a family every database carries: the `database=` /// label comes first, a declared label array second macro_rules! encode_db_metric { - ($enc:expr, $dbs:expr, $names:expr, counter, $name:expr, $help:expr, $field:ident) => { + ($enc:expr, $dbs:expr, counter, $name:expr, $help:expr, $field:ident) => { counter_series( $enc, $name, $help, "database", - $names - .iter() - .zip($dbs) - .map(|(db, s)| (db.as_ref(), s.$field)), + $dbs.iter().map(|db| (db.database.as_str(), db.$field)), )? }; - ($enc:expr, $dbs:expr, $names:expr, gauge, $name:expr, $help:expr, $field:ident) => { + ($enc:expr, $dbs:expr, gauge, $name:expr, $help:expr, $field:ident) => { gauge_series( $enc, $name, $help, "database", - $names - .iter() - .zip($dbs) - .map(|(db, s)| (db.as_ref(), s.$field)), + $dbs.iter().map(|db| (db.database.as_str(), db.$field)), )? }; ( - $enc:expr, $dbs:expr, $names:expr, counter, $name:expr, $help:expr, $field:ident, + $enc:expr, $dbs:expr, counter, $name:expr, $help:expr, $field:ident, $key:literal, $labels:expr ) => { counter_grid( @@ -107,14 +100,12 @@ macro_rules! encode_db_metric { $name, $help, $key, - $names - .iter() - .zip($dbs) - .map(|(db, s)| (db.as_ref(), $labels.into_iter().zip(s.$field))), + $dbs.iter() + .map(|db| (db.database.as_str(), $labels.into_iter().zip(db.$field))), )? }; ( - $enc:expr, $dbs:expr, $names:expr, gauge, $name:expr, $help:expr, $field:ident, + $enc:expr, $dbs:expr, gauge, $name:expr, $help:expr, $field:ident, $key:literal, $labels:expr ) => { gauge_grid( @@ -122,10 +113,8 @@ macro_rules! encode_db_metric { $name, $help, $key, - $names - .iter() - .zip($dbs) - .map(|(db, s)| (db.as_ref(), $labels.into_iter().zip(s.$field))), + $dbs.iter() + .map(|db| (db.database.as_str(), $labels.into_iter().zip(db.$field))), )? }; } @@ -555,12 +544,9 @@ macro_rules! db_snapshot { } fn encode_db_fields(dbs: &[DbSeries], enc: &mut DescriptorEncoder<'_>) -> fmt::Result { - let names: Vec> = - dbs.iter().map(|db| escape_label(&db.database)).collect(); $(encode_db_metric!( enc, dbs, - names, $kind, concat!("walshadow_", stringify!($field)), $help, @@ -921,24 +907,6 @@ where Ok(()) } -/// The encoder writes label values through, and a database name is whatever -/// `CREATE DATABASE` took, so escape what OpenMetrics reserves inside quotes -fn escape_label(value: &str) -> Cow<'_, str> { - if !value.contains(['\\', '"', '\n']) { - return Cow::Borrowed(value); - } - let mut out = String::with_capacity(value.len() + 8); - for c in value.chars() { - match c { - '\\' => out.push_str("\\\\"), - '"' => out.push_str("\\\""), - '\n' => out.push_str("\\n"), - _ => out.push(c), - } - } - Cow::Owned(out) -} - /// LSN gauges carry their raw `u64` impl EncodeGaugeValue for Pos { fn encode(&self, encoder: &mut GaugeValueEncoder) -> fmt::Result { @@ -1001,8 +969,6 @@ fn encode_snapshot(snap: &MetricsSnapshot, enc: &mut DescriptorEncoder<'_>) -> f u64::from(!snap.crossing_blocked_on.is_empty()), )?; - // rmgr names come out of the fixed resource-manager table, so label values - // need no escaping the encoder does not do let mut records = declare( enc, "walshadow_filter_records_total", @@ -1450,22 +1416,30 @@ mod tests { assert!(body.contains("walshadow_pump_queue_depth 0"), "{body}"); } - /// A database name is a PG identifier, so a quote in it must not end the - /// label and truncate the scrape #[test] fn render_escapes_a_database_label() { let body = render(MetricsSnapshot { by_database: vec![DbSeries { - database: "we\"ird\\name".into(), + database: "we\"ird\\name\n".into(), + bridge_up: 1, + bridge_requests_by_op: [3, 0, 0, 0, 0], desc_log_entries: 4, + config_backfills_pending_by_mode: [2, 0, 0], ..DbSeries::default() }], ..MetricsSnapshot::default() }); - assert!( - body.contains(r#"walshadow_desc_log_entries{database="we\"ird\\name"} 4"#), - "{body}" - ); + for want in [ + r#"walshadow_bridge_up{database="we\"ird\\name\n"} 1"#, + r#"walshadow_desc_log_entries{database="we\"ird\\name\n"} 4"#, + &format!( + r#"walshadow_bridge_requests_total{{database="we\"ird\\name\n",op="{}"}} 3"#, + OP_LABELS[0] + ), + r#"walshadow_config_backfills_pending{database="we\"ird\\name\n",mode="copy"} 2"#, + ] { + assert!(body.contains(want), "missing {want}\n{body}"); + } } #[tokio::test(flavor = "current_thread")] @@ -1658,10 +1632,4 @@ mod tests { let taken = serve(addr, MetricsRegistry::new()).await.unwrap_err(); assert!(matches!(taken, MetricsError::Bind { .. }), "{taken}"); } - - #[test] - fn escape_label_quotes_openmetrics_reserved_chars() { - assert!(matches!(escape_label("plain"), Cow::Borrowed("plain"))); - assert_eq!(escape_label("a\\b\"c\nd"), r#"a\\b\"c\nd"#); - } } diff --git a/src/toast/resolver.rs b/src/toast/resolver.rs index 4e84e63f..ec600003 100644 --- a/src/toast/resolver.rs +++ b/src/toast/resolver.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; use async_trait::async_trait; -use clickhouse_c::{Allocator, Block, BlockBuilder, ColumnBuilder, Event, TypeAst}; +use clickhouse_c::{Allocator, Block, BlockBuilder, ColumnBuilder, Event, QueryOpts, TypeAst}; use futures::stream::StreamExt; use thiserror::Error; use tokio::sync::Mutex; @@ -841,9 +841,9 @@ impl ClickHouseChunkStore { |e| is_retryable(e) && !is_missing_mirror(e), |mut client| async move { let result = with_timeout(insert_timeout, async { - client.send_query(sql, None).await?; + client.send_query(sql, &QueryOpts::new()).await?; if let Some(bb) = bb { - client.send_data(Some(bb)).await?; + client.send_data(bb).await?; client.send_data_end().await?; } drain_to_end_of_stream(&mut client).await?; @@ -934,7 +934,7 @@ impl ClickHouseChunkStore { |e| is_retryable(e) && !is_missing_mirror(e), |mut client| async { let result = with_timeout(insert_timeout, async { - client.send_query(sql, None).await?; + client.send_query(sql, &QueryOpts::new()).await?; let mut out = A::default(); loop { match client.recv_event().await? {