From 06ac90aa705c56e17267c6179974d56c1a3835fc Mon Sep 17 00:00:00 2001 From: Dominik Werder Date: Thu, 4 Jul 2024 10:23:01 +0200 Subject: [PATCH] Update deps --- .cargo/cargo-lock | 921 ++++--------------- Cargo.toml | 2 +- crates/daqbuffer/Cargo.toml | 2 +- crates/daqbuffer/src/fetch.rs | 2 +- crates/dbconn/src/channelinfo.rs | 1 + crates/dbconn/src/dbconn.rs | 1 + crates/dbconn/src/search.rs | 29 +- crates/dbconn/src/worker.rs | 28 + crates/disk/src/channelconfig.rs | 1 + crates/disk/src/eventchunker.rs | 1 + crates/err/Cargo.toml | 3 +- crates/err/src/lib.rs | 20 +- crates/httpret/src/api4/databuffer_tools.rs | 1 + crates/httpret/src/api4/eventdata.rs | 2 +- crates/httpret/src/api4/search.rs | 21 +- crates/httpret/src/httpret.rs | 3 +- crates/items_0/src/scalar_ops.rs | 2 +- crates/items_2/src/channelevents.rs | 6 + crates/items_2/src/eventfull.rs | 1 + crates/netpod/src/netpod.rs | 12 +- crates/netpod/src/ttl.rs | 3 + crates/parse/src/channelconfig.rs | 2 +- crates/scyllaconn/src/accounting/toplist.rs | 1 + crates/scyllaconn/src/events.rs | 45 +- crates/scyllaconn/src/events2/events.rs | 22 +- crates/scyllaconn/src/events2/firstbefore.rs | 1 + crates/scyllaconn/src/events2/mergert.rs | 1 + crates/scyllaconn/src/events2/msp.rs | 2 +- crates/scyllaconn/src/events2/prepare.rs | 1 + crates/scyllaconn/src/worker.rs | 2 +- crates/streams/src/framed_bytes.rs | 1 + 31 files changed, 362 insertions(+), 778 deletions(-) diff --git a/.cargo/cargo-lock b/.cargo/cargo-lock index 5b3d431..d40d2c8 100644 --- a/.cargo/cargo-lock +++ b/.cargo/cargo-lock @@ -200,7 +200,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -211,7 +211,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -235,51 +235,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "backtrace" version = "0.3.73" @@ -318,9 +273,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitshuffle" @@ -426,9 +381,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] name = "cfg-if" @@ -448,7 +403,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -480,9 +435,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -490,9 +445,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -502,14 +457,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -559,43 +514,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "console-api" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" -dependencies = [ - "futures-core", - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -648,7 +566,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli 0.26.2", - "log", + "log 0.4.22", "regalloc2", "smallvec", "target-lexicon", @@ -679,7 +597,7 @@ dependencies = [ "fxhash", "hashbrown 0.12.3", "indexmap 1.9.3", - "log", + "log 0.4.22", "smallvec", ] @@ -696,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" dependencies = [ "cranelift-codegen", - "log", + "log 0.4.22", "smallvec", "target-lexicon", ] @@ -796,7 +714,7 @@ dependencies = [ [[package]] name = "daqbuffer" -version = "0.5.1-aa.0" +version = "0.5.1-aa.3" dependencies = [ "bytes", "chrono", @@ -825,10 +743,10 @@ dependencies = [ "disk", "err", "futures-util", - "http 1.1.0", + "http", "httpclient", "httpret", - "hyper 1.3.1", + "hyper", "items_0", "items_2", "lazy_static", @@ -891,7 +809,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -913,7 +831,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1051,17 +969,6 @@ dependencies = [ "url", ] -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "document-features" version = "0.2.8" @@ -1096,9 +1003,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -1144,7 +1051,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1172,8 +1079,8 @@ dependencies = [ "async-channel 2.3.1", "backtrace", "chrono", - "http 1.1.0", - "hyper 1.3.1", + "http", + "hyper", "regex", "rmp-serde", "serde", @@ -1342,7 +1249,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1424,25 +1331,6 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.5" @@ -1454,7 +1342,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http", "indexmap 2.2.6", "slab", "tokio", @@ -1510,19 +1398,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64", - "byteorder", - "flate2", - "nom", - "num-traits", -] - [[package]] name = "heapless" version = "0.7.17" @@ -1570,17 +1445,6 @@ dependencies = [ "digest", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -1592,17 +1456,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.0" @@ -1610,7 +1463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -1621,16 +1474,16 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.0", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpclient" @@ -1640,10 +1493,10 @@ dependencies = [ "bytes", "err", "futures-util", - "http 1.1.0", - "http-body 1.0.0", + "http", + "http-body", "http-body-util", - "hyper 1.3.1", + "hyper", "hyper-util", "netpod", "parse", @@ -1675,14 +1528,14 @@ dependencies = [ "err", "flate2", "futures-util", - "http 1.1.0", + "http", "http-body-util", "httpclient", - "hyper 1.3.1", + "hyper", "hyper-util", "items_0", "items_2", - "itertools 0.11.0", + "itertools", "md-5", "netpod", "nodenet", @@ -1718,40 +1571,16 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.29" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.0", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -1761,30 +1590,18 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.29", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -1816,124 +1633,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1942,14 +1641,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -2034,7 +1731,7 @@ dependencies = [ name = "items_proc" version = "0.0.2" dependencies = [ - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2046,15 +1743,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -2072,9 +1760,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leb128" @@ -2094,12 +1782,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "litrs" version = "0.4.1" @@ -2118,9 +1800,16 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.0.1" +dependencies = [ + "tracing", +] + +[[package]] +name = "log" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lz4_flex" @@ -2131,15 +1820,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "mach2" version = "0.4.2" @@ -2149,21 +1829,6 @@ dependencies = [ "libc", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "md-5" version = "0.10.6" @@ -2176,9 +1841,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2207,12 +1872,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2221,9 +1880,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -2255,7 +1914,8 @@ dependencies = [ "err", "futures-util", "hex", - "http 1.1.0", + "http", + "humantime", "humantime-serde", "num-traits", "rand", @@ -2328,7 +1988,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2352,9 +2012,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -2395,9 +2055,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2464,7 +2124,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2561,45 +2221,13 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost", -] - [[package]] name = "ptr_meta" version = "0.1.4" @@ -2626,6 +2254,7 @@ version = "0.0.1" dependencies = [ "chrono", "err", + "humantime", "humantime-serde", "items_0", "items_2", @@ -2721,11 +2350,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2735,7 +2364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" dependencies = [ "fxhash", - "log", + "log 0.4.22", "slice-group-by", "smallvec", ] @@ -2748,17 +2377,8 @@ checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2769,15 +2389,9 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.4" @@ -2878,19 +2492,13 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - [[package]] name = "ryu" version = "1.0.18" @@ -2919,7 +2527,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2943,7 +2551,7 @@ dependencies = [ "futures", "hashbrown 0.14.5", "histogram", - "itertools 0.11.0", + "itertools", "lazy_static", "lz4_flex", "rand", @@ -2985,7 +2593,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2998,8 +2606,10 @@ dependencies = [ "items_0", "items_2", "netpod", + "pin-project", "query", "scylla", + "series", ] [[package]] @@ -3061,7 +2671,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3072,14 +2682,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3108,6 +2718,15 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "series" +version = "0.0.2" +dependencies = [ + "err", + "log 0.0.1", + "serde", +] + [[package]] name = "sha2" version = "0.10.8" @@ -3272,9 +2891,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3289,32 +2908,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "tap" version = "1.0.1" @@ -3344,7 +2946,6 @@ version = "0.0.4" dependencies = [ "backtrace", "chrono", - "console-subscriber", "err", "futures-util", "time", @@ -3369,9 +2970,9 @@ dependencies = [ [[package]] name = "thiserror" version = "0.0.1" -source = "git+https://github.com/dominikwerder/thiserror.git#052df05c18b5f26b462b0b8a148ac0c8cb170f1a" +source = "git+https://github.com/dominikwerder/thiserror.git?branch=cstm#ddbee753d83a11d7c716fbb6d7fe6678968eb0a9" dependencies = [ - "thiserror-impl 1.0.41", + "thiserror-impl 1.0.61 (git+https://github.com/dominikwerder/thiserror.git?branch=cstm)", ] [[package]] @@ -3380,17 +2981,7 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "thiserror-impl 1.0.61", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.41" -source = "git+https://github.com/dominikwerder/thiserror.git#052df05c18b5f26b462b0b8a148ac0c8cb170f1a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "thiserror-impl 1.0.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3401,7 +2992,17 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "git+https://github.com/dominikwerder/thiserror.git?branch=cstm#ddbee753d83a11d7c716fbb6d7fe6678968eb0a9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] @@ -3454,21 +3055,11 @@ dependencies = [ "crunchy", ] -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -3499,16 +3090,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.3.0" @@ -3517,7 +3098,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3532,7 +3113,7 @@ dependencies = [ "fallible-iterator", "futures-channel", "futures-util", - "log", + "log 0.4.22", "parking_lot", "percent-encoding", "phf", @@ -3629,33 +3210,6 @@ dependencies = [ "winnow 0.6.13", ] -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64", - "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.4.13" @@ -3664,16 +3218,11 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", - "slab", "tokio", - "tokio-util", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -3707,7 +3256,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3738,7 +3287,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "log", + "log 0.4.22", "once_cell", "tracing-core", ] @@ -3749,15 +3298,11 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex", "sharded-slab", "smallvec", "thread_local", "time", - "tracing", "tracing-core", "tracing-log", ] @@ -3811,7 +3356,7 @@ checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3849,9 +3394,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3859,18 +3404,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "utf8parse" version = "0.2.2" @@ -3879,9 +3412,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", ] @@ -3936,11 +3469,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", - "log", + "log 0.4.22", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -3962,7 +3495,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3975,9 +3508,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasmer" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1852ee143a2d8143265bfee017c43bf690702d6c2b45a763a2f13e669f5b7ec" +checksum = "3de82c1520fb75ade394d6c89cac2b05d1b7b4205a45099efcd078b0bc828375" dependencies = [ "bytes", "cfg-if", @@ -4003,9 +3536,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4f157d715f3bb60c2c9d7b9e48299a30e9209f87f4484f79f9cd586b40b6ee" +checksum = "d6c18588e4b92adb2ea88a2897c93615538c7e40cfec8dc6efc3fcee63299a81" dependencies = [ "backtrace", "bytes", @@ -4014,6 +3547,7 @@ dependencies = [ "enumset", "lazy_static", "leb128", + "libc", "memmap2 0.5.10", "more-asserts", "region", @@ -4031,9 +3565,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb457e66b77ca2188fbbd6c2056ec6e8ccb4bddee73e60ba9d39733d7b2e8068" +checksum = "cf497986b83f1ae8589a22f046b803d6d1d77bbeda93e75baa89ab6501838f7c" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -4072,9 +3606,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cd5732ff64370e98986f9753cce13b91cc9d3c4b649e31b0d08d5db69164ea" +checksum = "45ab99baa393da623dbca6390c17bd9cd7666e8c48f6b42b4f8c635106a09ca8" dependencies = [ "proc-macro-error", "proc-macro2", @@ -4084,9 +3618,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c890fd0dbda40df03977b899d1ad7113deba3c225f2cc7b88deb7633044d3e07" +checksum = "0aebf59870ee6e2ef0264d87e6a83f767f5cfe83e21470c0cc32e06231335e23" dependencies = [ "bytecheck", "enum-iterator", @@ -4105,9 +3639,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0dc60ab800cf0bd44e2d35d88422d256d2470b00c72778f91bfb826c42dbd0" +checksum = "0df3b84ac2c450ad04931b558392cadd03d606d94ab15496e13ce56ee8320634" dependencies = [ "backtrace", "cc", @@ -4121,7 +3655,7 @@ dependencies = [ "indexmap 1.9.3", "lazy_static", "libc", - "mach", + "mach2", "memoffset", "more-asserts", "region", @@ -4137,7 +3671,7 @@ version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "indexmap 2.2.6", "semver", ] @@ -4220,7 +3754,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4251,7 +3785,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4271,18 +3805,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4293,9 +3827,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4311,9 +3845,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4329,15 +3863,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4353,9 +3887,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4371,9 +3905,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4383,9 +3917,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4401,9 +3935,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -4423,18 +3957,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "wyz" version = "0.5.1" @@ -4457,93 +3979,26 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "syn 2.0.68", ] diff --git a/Cargo.toml b/Cargo.toml index 8b97223..0f2e750 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,4 +23,4 @@ incremental = true [patch.crates-io] #tokio = { git = "https://github.com/dominikwerder/tokio", rev = "995221d8" } -thiserror = { git = "https://github.com/dominikwerder/thiserror.git" } +thiserror = { git = "https://github.com/dominikwerder/thiserror.git", branch = "cstm" } diff --git a/crates/daqbuffer/Cargo.toml b/crates/daqbuffer/Cargo.toml index f347371..3a26216 100644 --- a/crates/daqbuffer/Cargo.toml +++ b/crates/daqbuffer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daqbuffer" -version = "0.5.1-aa.2" +version = "0.5.1-aa.3" authors = ["Dominik Werder "] edition = "2021" diff --git a/crates/daqbuffer/src/fetch.rs b/crates/daqbuffer/src/fetch.rs index b64eef4..8273748 100644 --- a/crates/daqbuffer/src/fetch.rs +++ b/crates/daqbuffer/src/fetch.rs @@ -18,13 +18,13 @@ use streams::cbor_stream::FramedBytesToSitemtyDynEventsStream; use url::Url; #[derive(Debug, ThisError)] +#[cstm(name = "DataFetch")] pub enum Error { Url(#[from] url::ParseError), NoHostname, HttpBody(#[from] http::Error), HttpClient(#[from] httpclient::Error), Hyper(#[from] httpclient::hyper::Error), - #[error("RequestFailed({0})")] RequestFailed(String), } diff --git a/crates/dbconn/src/channelinfo.rs b/crates/dbconn/src/channelinfo.rs index a33dacc..77959e9 100644 --- a/crates/dbconn/src/channelinfo.rs +++ b/crates/dbconn/src/channelinfo.rs @@ -5,6 +5,7 @@ use netpod::Shape; use tokio_postgres::Client; #[derive(Debug, ThisError)] +#[cstm(name = "ChannelInfo")] pub enum Error { Pg(#[from] crate::pg::Error), BadValue, diff --git a/crates/dbconn/src/dbconn.rs b/crates/dbconn/src/dbconn.rs index 90ac476..036737a 100644 --- a/crates/dbconn/src/dbconn.rs +++ b/crates/dbconn/src/dbconn.rs @@ -196,6 +196,7 @@ pub async fn find_series_sf_databuffer(channel: &SfDbChannel, pgclient: Arc Result { let empty = if !query.name_regex.is_empty() { false } else { true }; if empty { @@ -109,11 +110,10 @@ pub async fn search_channel_scylla( return Ok(ret); } let ch_kind: i16 = if query.channel_status { 1 } else { 2 }; - let tmp_backend = Some(backend.to_string()); - let (cb1, cb2) = if let Some(x) = &tmp_backend { + let (cb1, cb2) = if let Some(x) = query.backend.as_ref() { (false, x.as_str()) } else { - (true, "") + (false, "----------") }; let regop = if query.icase { "~*" } else { "~" }; let sql = &format!( @@ -128,8 +128,7 @@ pub async fn search_channel_scylla( ), regop ); - let (pgclient, _pgjh) = crate::create_connection(pgconf).await?; - let rows = pgclient + let rows = pgc .query(sql, &[&ch_kind, &query.name_regex, &cb1, &cb2]) .await .err_conv()?; @@ -279,11 +278,21 @@ async fn search_channel_archeng( Ok(ret) } -pub async fn search_channel(query: ChannelSearchQuery, ncc: &NodeConfigCached) -> Result { +pub async fn search_channel( + query: ChannelSearchQuery, + pgqueue: &PgQueue, + ncc: &NodeConfigCached, +) -> Result { let backend = &ncc.node_config.cluster.backend; let pgconf = &ncc.node_config.cluster.database; + let mut query = query; + query.backend = Some(backend.into()); if let Some(_scyconf) = ncc.node_config.cluster.scylla_st() { - search_channel_scylla(query, backend, pgconf).await + pgqueue + .search_channel_scylla(query) + .await + .map_err(|e| Error::with_msg_no_trace(format!("db worker error {e}")))? + // search_channel_scylla(query, backend, pgconf).await } else if let Some(conf) = ncc.node.channel_archiver.as_ref() { search_channel_archeng(query, backend.clone(), conf, pgconf).await } else if let Some(_conf) = ncc.node.archiver_appliance.as_ref() { diff --git a/crates/dbconn/src/worker.rs b/crates/dbconn/src/worker.rs index 331472a..ae4fa8e 100644 --- a/crates/dbconn/src/worker.rs +++ b/crates/dbconn/src/worker.rs @@ -1,17 +1,21 @@ use crate::create_connection; use async_channel::Receiver; +use async_channel::RecvError; use async_channel::Sender; use err::thiserror; use err::ThisError; use netpod::log::*; use netpod::range::evrange::NanoRange; use netpod::ChConf; +use netpod::ChannelSearchQuery; +use netpod::ChannelSearchResult; use netpod::Database; use taskrun::tokio; use tokio::task::JoinHandle; use tokio_postgres::Client; #[derive(Debug, ThisError)] +#[cstm(name = "PgWorker")] pub enum Error { Error(#[from] err::Error), ChannelSend, @@ -19,6 +23,12 @@ pub enum Error { Join, } +impl From for Error { + fn from(_value: RecvError) -> Self { + Self::ChannelRecv + } +} + impl err::ToErr for Error { fn to_err(self) -> err::Error { err::Error::from_string(self) @@ -33,6 +43,7 @@ enum Job { Vec, Sender>, crate::channelinfo::Error>>, ), + SearchChannel(ChannelSearchQuery, Sender>), } #[derive(Debug, Clone)] @@ -73,6 +84,17 @@ impl PgQueue { self.tx.send(job).await.map_err(|_| Error::ChannelSend)?; Ok(rx) } + + pub async fn search_channel_scylla( + &self, + query: ChannelSearchQuery, + ) -> Result, Error> { + let (tx, rx) = async_channel::bounded(1); + let job = Job::SearchChannel(query, tx); + self.tx.send(job).await.map_err(|_| Error::ChannelSend)?; + let ret = rx.recv().await?; + Ok(ret) + } } #[derive(Debug)] @@ -126,6 +148,12 @@ impl PgWorker { // TODO count for stats } } + Job::SearchChannel(query, tx) => { + let res = crate::search::search_channel_scylla(query, &self.pg).await; + if tx.send(res.map_err(Into::into)).await.is_err() { + // TODO count for stats + } + } } } } diff --git a/crates/disk/src/channelconfig.rs b/crates/disk/src/channelconfig.rs index f9c0346..f19ebc6 100644 --- a/crates/disk/src/channelconfig.rs +++ b/crates/disk/src/channelconfig.rs @@ -12,6 +12,7 @@ use parse::channelconfig::ConfigEntry; use parse::channelconfig::ConfigParseError; #[derive(Debug, ThisError)] +#[cstm(name = "ChannelConfig")] pub enum ConfigError { ParseError(ConfigParseError), NotFound, diff --git a/crates/disk/src/eventchunker.rs b/crates/disk/src/eventchunker.rs index 5c2ad4d..cf00616 100644 --- a/crates/disk/src/eventchunker.rs +++ b/crates/disk/src/eventchunker.rs @@ -35,6 +35,7 @@ use streams::filechunkread::FileChunkRead; use streams::needminbuffer::NeedMinBuffer; #[derive(Debug, ThisError, Serialize, Deserialize)] +#[cstm(name = "DatabufferDataParse")] pub enum DataParseError { DataFrameLengthMismatch, FileHeaderTooShort, diff --git a/crates/err/Cargo.toml b/crates/err/Cargo.toml index 60c2485..73eeeba 100644 --- a/crates/err/Cargo.toml +++ b/crates/err/Cargo.toml @@ -21,8 +21,9 @@ regex = "1.9.1" http = "1.0.0" hyper = "1.0.1" thiserror = "=0.0.1" +#thiserror = "1" anyhow = "1.0" tokio = "1" [patch.crates-io] -thiserror = { git = "https://github.com/dominikwerder/thiserror.git" } +thiserror = { git = "https://github.com/dominikwerder/thiserror.git", branch = "cstm" } diff --git a/crates/err/src/lib.rs b/crates/err/src/lib.rs index 5e401be..c140e57 100644 --- a/crates/err/src/lib.rs +++ b/crates/err/src/lib.rs @@ -1,10 +1,21 @@ //! Error handling and reporting. +#[macro_export] +macro_rules! err_dbg_dis { + ($tt:ty, $nn:expr) => { + impl ::core::fmt::Display for $tt { + fn fmt(&self, fmt: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { + write!(fmt, "{}::{:?}", $nn, self) + } + } + }; +} + pub use anyhow; pub use thiserror; pub use thiserror::Error as ThisError; -pub use thiserror::UserErrorClass; -pub use thiserror::UserErrorContent; +// pub use thiserror::UserErrorClass; +// pub use thiserror::UserErrorContent; pub mod bt { pub use backtrace::Backtrace; @@ -525,19 +536,22 @@ mod test { use super::*; #[derive(Debug, ThisError, Serialize, Deserialize)] + #[cstm(name = "SomeErrorEnumA")] enum SomeErrorEnumA { BadCase, WithStringContent(String), - #[error("bad: {0}")] + // #[error("bad: {0}")] WithStringContentFmt(String), } #[derive(Debug, ThisError, Serialize, Deserialize)] + #[cstm(name = "SomeErrorEnumB0")] enum SomeErrorEnumB0 { FromA(#[from] SomeErrorEnumA), } #[derive(Debug, ThisError, Serialize, Deserialize)] + #[cstm(name = "SomeErrorEnumB1")] enum SomeErrorEnumB1 { FromA(#[from] SomeErrorEnumA), #[error("caffe")] diff --git a/crates/httpret/src/api4/databuffer_tools.rs b/crates/httpret/src/api4/databuffer_tools.rs index f1a83d9..72d3a97 100644 --- a/crates/httpret/src/api4/databuffer_tools.rs +++ b/crates/httpret/src/api4/databuffer_tools.rs @@ -30,6 +30,7 @@ use std::task::Poll; use taskrun::tokio; #[derive(Debug, ThisError)] +#[cstm(name = "ChannelFindActive")] pub enum FindActiveError { HttpBadAccept, HttpBadUrl, diff --git a/crates/httpret/src/api4/eventdata.rs b/crates/httpret/src/api4/eventdata.rs index 8f6c35c..7911b6b 100644 --- a/crates/httpret/src/api4/eventdata.rs +++ b/crates/httpret/src/api4/eventdata.rs @@ -20,9 +20,9 @@ use std::sync::Arc; use streams::instrument::InstrumentStream; #[derive(Debug, ThisError)] +#[cstm(name = "EventData")] pub enum EventDataError { QueryParse, - #[error("Error({0})")] Error(Box), InternalError, } diff --git a/crates/httpret/src/api4/search.rs b/crates/httpret/src/api4/search.rs index 3a9ab82..0ec5404 100644 --- a/crates/httpret/src/api4/search.rs +++ b/crates/httpret/src/api4/search.rs @@ -1,6 +1,7 @@ use crate::bodystream::response; use crate::bodystream::ToPublicResponse; use crate::err::Error; +use dbconn::worker::PgQueue; use http::Method; use http::StatusCode; use httpclient::body_empty; @@ -16,14 +17,6 @@ use netpod::NodeConfigCached; use netpod::ACCEPT_ALL; use netpod::APP_JSON; -pub async fn channel_search(req: Requ, node_config: &NodeConfigCached) -> Result { - let url = req_uri_to_url(req.uri())?; - let query = ChannelSearchQuery::from_url(&url)?; - info!("search query: {:?}", query); - let res = dbconn::search::search_channel(query, node_config).await?; - Ok(res) -} - pub struct ChannelSearchHandler {} impl ChannelSearchHandler { @@ -35,7 +28,7 @@ impl ChannelSearchHandler { } } - pub async fn handle(&self, req: Requ, node_config: &NodeConfigCached) -> Result { + pub async fn handle(&self, req: Requ, pgqueue: &PgQueue, ncc: &NodeConfigCached) -> Result { if req.method() == Method::GET { let accept_def = APP_JSON; let accept = req @@ -43,7 +36,7 @@ impl ChannelSearchHandler { .get(http::header::ACCEPT) .map_or(accept_def, |k| k.to_str().unwrap_or(accept_def)); if accept.contains(APP_JSON) || accept.contains(ACCEPT_ALL) { - match channel_search(req, node_config).await { + match channel_search(req, pgqueue, ncc).await { Ok(item) => Ok(response(StatusCode::OK).body(ToJsonBody::from(&item).into_body())?), Err(e) => { warn!("handle: got error from channel_search: {e:?}"); @@ -58,3 +51,11 @@ impl ChannelSearchHandler { } } } + +async fn channel_search(req: Requ, pgqueue: &PgQueue, ncc: &NodeConfigCached) -> Result { + let url = req_uri_to_url(req.uri())?; + let query = ChannelSearchQuery::from_url(&url)?; + info!("search query: {:?}", query); + let res = dbconn::search::search_channel(query, pgqueue, ncc).await?; + Ok(res) +} diff --git a/crates/httpret/src/httpret.rs b/crates/httpret/src/httpret.rs index a672ddf..f870694 100644 --- a/crates/httpret/src/httpret.rs +++ b/crates/httpret/src/httpret.rs @@ -63,6 +63,7 @@ use taskrun::tokio::net::TcpListener; use tracing::Instrument; #[derive(Debug, ThisError, Serialize, Deserialize)] +#[cstm(name = "Retrieval")] pub enum RetrievalError { Error(#[from] ::err::Error), Error2(#[from] crate::err::Error), @@ -353,7 +354,7 @@ async fn http_service_inner( } else if let Some(h) = api4::databuffer_tools::FindActiveHandler::handler(&req) { Ok(h.handle(req, &node_config).await?) } else if let Some(h) = api4::search::ChannelSearchHandler::handler(&req) { - Ok(h.handle(req, &node_config).await?) + Ok(h.handle(req, &shared_res.pgqueue, &node_config).await?) } else if let Some(h) = channel_status::ConnectionStatusEvents::handler(&req) { Ok(h.handle(req, ctx, &shared_res, &node_config).await?) } else if let Some(h) = channel_status::ChannelStatusEventsHandler::handler(&req) { diff --git a/crates/items_0/src/scalar_ops.rs b/crates/items_0/src/scalar_ops.rs index 3cc4a04..ac7bbef 100644 --- a/crates/items_0/src/scalar_ops.rs +++ b/crates/items_0/src/scalar_ops.rs @@ -268,7 +268,7 @@ impl ScalarOps for EnumVariant { } fn zero_b() -> Self { - EnumVariant::empty() + EnumVariant::default() } fn equal_slack(&self, rhs: &Self) -> bool { diff --git a/crates/items_2/src/channelevents.rs b/crates/items_2/src/channelevents.rs index 3870e8c..df8e74d 100644 --- a/crates/items_2/src/channelevents.rs +++ b/crates/items_2/src/channelevents.rs @@ -210,6 +210,7 @@ mod serde_channel_events { use crate::eventsxbindim0::EventsXbinDim0; use items_0::subfr::SubFrId; use netpod::log::*; + use netpod::EnumVariant; use serde::de; use serde::de::EnumAccess; use serde::de::VariantAccess; @@ -321,6 +322,11 @@ mod serde_channel_events { seq.next_element()?.ok_or_else(|| de::Error::missing_field("[2] obj"))?; Ok(EvBox(Box::new(obj))) } + EnumVariant::SUB => { + let obj: EventsDim0 = + seq.next_element()?.ok_or_else(|| de::Error::missing_field("[2] obj"))?; + Ok(EvBox(Box::new(obj))) + } _ => { error!("TODO serde cty {cty} nty {nty}"); Err(de::Error::custom(&format!("unknown nty {nty}"))) diff --git a/crates/items_2/src/eventfull.rs b/crates/items_2/src/eventfull.rs index fbcb173..c285313 100644 --- a/crates/items_2/src/eventfull.rs +++ b/crates/items_2/src/eventfull.rs @@ -259,6 +259,7 @@ impl Mergeable for EventFull { } #[derive(Debug, ThisError, Serialize, Deserialize)] +#[cstm(name = "Decompress")] pub enum DecompError { TooLittleInput, BadCompresionBlockSize, diff --git a/crates/netpod/src/netpod.rs b/crates/netpod/src/netpod.rs index 26dddb1..4c05a8a 100644 --- a/crates/netpod/src/netpod.rs +++ b/crates/netpod/src/netpod.rs @@ -244,7 +244,7 @@ impl Serialize for ScalarType { BOOL => ser.serialize_str("bool"), STRING => ser.serialize_str("string"), Enum => ser.serialize_str("enum"), - ChannelStatus => ser.serialize_str("ChannelStatus"), + ChannelStatus => ser.serialize_str("channelstatus"), } } } @@ -274,7 +274,7 @@ impl<'de> serde::de::Visitor<'de> for ScalarTypeVis { "bool" => ScalarType::BOOL, "string" => ScalarType::STRING, "enum" => ScalarType::Enum, - "ChannelStatus" => ScalarType::ChannelStatus, + "channelstatus" => ScalarType::ChannelStatus, k => return Err(E::custom(format!("can not understand variant {k:?}"))), }; Ok(ret) @@ -382,7 +382,7 @@ impl ScalarType { BOOL => "bool", STRING => "string", Enum => "enum", - ChannelStatus => "ChannelStatus", + ChannelStatus => "channelstatus", } } @@ -404,7 +404,7 @@ impl ScalarType { "bool" => BOOL, "string" => STRING, "enum" => Enum, - "ChannelStatus" => ChannelStatus, + "channelstatus" => ChannelStatus, _ => { return Err(Error::with_msg_no_trace(format!( "from_bsread_str can not understand bsread {:?}", @@ -593,8 +593,8 @@ pub struct EnumVariant { name: StringFix<26>, } -impl EnumVariant { - pub fn empty() -> Self { +impl Default for EnumVariant { + fn default() -> Self { Self { ix: u16::MAX, name: StringFix::new(), diff --git a/crates/netpod/src/ttl.rs b/crates/netpod/src/ttl.rs index f715f72..1e961b1 100644 --- a/crates/netpod/src/ttl.rs +++ b/crates/netpod/src/ttl.rs @@ -78,10 +78,13 @@ impl fmt::Display for RetentionTime { } #[derive(Debug, ThisError)] +#[cstm(name = "TTL")] pub enum Error { Parse, } +// err::err_dbg_dis!(Error, "ttl::Error::"); + impl FromStr for RetentionTime { type Err = Error; diff --git a/crates/parse/src/channelconfig.rs b/crates/parse/src/channelconfig.rs index e9122b6..a5a0d1e 100644 --- a/crates/parse/src/channelconfig.rs +++ b/crates/parse/src/channelconfig.rs @@ -27,7 +27,7 @@ use tokio::io::ErrorKind; const TEST_BACKEND: &str = "testbackend-00"; #[derive(Debug, ThisError)] -// #[error("ConfigParseError")] +#[cstm(name = "ConfigParse")] pub enum ConfigParseError { NotSupportedOnNode, FileNotFound, diff --git a/crates/scyllaconn/src/accounting/toplist.rs b/crates/scyllaconn/src/accounting/toplist.rs index f7e9669..f8b952e 100644 --- a/crates/scyllaconn/src/accounting/toplist.rs +++ b/crates/scyllaconn/src/accounting/toplist.rs @@ -9,6 +9,7 @@ use scylla::prepared_statement::PreparedStatement; use scylla::Session as ScySession; #[derive(Debug, ThisError)] +#[cstm(name = "AccountingToplist")] pub enum Error { ScyllaQuery(#[from] scylla::transport::errors::QueryError), ScyllaNextRow(#[from] scylla::transport::iterator::NextRowError), diff --git a/crates/scyllaconn/src/events.rs b/crates/scyllaconn/src/events.rs index b6bb760..d7e7968 100644 --- a/crates/scyllaconn/src/events.rs +++ b/crates/scyllaconn/src/events.rs @@ -18,6 +18,7 @@ use items_2::eventsdim1::EventsDim1; use netpod::log::*; use netpod::ttl::RetentionTime; use netpod::DtNano; +use netpod::EnumVariant; use netpod::ScalarType; use netpod::Shape; use netpod::TsMs; @@ -33,6 +34,7 @@ use std::task::Context; use std::task::Poll; #[derive(Debug, ThisError)] +#[cstm(name = "ScyllaReadEvents")] pub enum Error { Prepare(#[from] crate::events2::prepare::Error), ScyllaQuery(#[from] scylla::transport::errors::QueryError), @@ -132,6 +134,38 @@ macro_rules! impl_scaty_array { }; } +impl ValTy for EnumVariant { + type ScaTy = EnumVariant; + type ScyTy = i16; + type Container = EventsDim0; + + fn from_scyty(inp: Self::ScyTy) -> Self { + let _ = inp; + panic!("uses more specialized impl") + } + + fn from_valueblob(inp: Vec) -> Self { + let _ = inp; + panic!("uses more specialized impl") + } + + fn table_name() -> &'static str { + "array_string" + } + + fn default() -> Self { + ::default() + } + + fn is_valueblob() -> bool { + false + } + + fn st_name() -> &'static str { + "enum" + } +} + impl ValTy for Vec { type ScaTy = String; type ScyTy = Vec; @@ -142,6 +176,7 @@ impl ValTy for Vec { } fn from_valueblob(inp: Vec) -> Self { + let _ = inp; warn!("ValTy::from_valueblob for Vec"); Vec::new() } @@ -188,6 +223,7 @@ impl_scaty_array!(Vec, f32, Vec, "f32", "f32"); impl_scaty_array!(Vec, f64, Vec, "f64", "f64"); impl_scaty_array!(Vec, bool, Vec, "bool", "bool"); +#[derive(Debug)] pub(super) struct ReadNextValuesOpts { rt: RetentionTime, series: u64, @@ -226,6 +262,7 @@ where { // TODO could take scyqeue out of opts struct. let scyqueue = opts.scyqueue.clone(); + debug!("bbbbbbbbbbbbbbbbbbbbbbbbbbbb"); let futgen = Box::new(|scy: Arc, stmts: Arc| { let fut = async { read_next_values_2::(opts, scy, stmts) @@ -246,7 +283,13 @@ async fn read_next_values_2( where ST: ValTy, { - trace!("read_next_values_2 {} {}", opts.series, opts.ts_msp); + debug!("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa {opts:?}"); + trace!( + "read_next_values_2 {} {} st_name {}", + opts.series, + opts.ts_msp, + ST::st_name() + ); let series = opts.series; let ts_msp = opts.ts_msp; let range = opts.range; diff --git a/crates/scyllaconn/src/events2/events.rs b/crates/scyllaconn/src/events2/events.rs index ca1c697..d976077 100644 --- a/crates/scyllaconn/src/events2/events.rs +++ b/crates/scyllaconn/src/events2/events.rs @@ -13,6 +13,7 @@ use items_0::Events; use items_2::channelevents::ChannelEvents; use netpod::log::*; use netpod::ttl::RetentionTime; +use netpod::EnumVariant; use netpod::ScalarType; use netpod::Shape; use netpod::TsMs; @@ -41,6 +42,7 @@ macro_rules! warn_item { } #[derive(Debug, ThisError)] +#[cstm(name = "ScyllaEvents")] pub enum Error { Worker(#[from] crate::worker::Error), Events(#[from] crate::events::Error), @@ -143,6 +145,7 @@ impl EventsStreamRt { ); let scalar_type = self.scalar_type.clone(); let shape = self.shape.clone(); + debug!("make_read_events_fut {:?} {:?}", shape, scalar_type); let fut = async move { let ret = match &shape { Shape::Scalar => match &scalar_type { @@ -158,9 +161,15 @@ impl EventsStreamRt { ScalarType::F64 => read_next_values::(opts).await, ScalarType::BOOL => read_next_values::(opts).await, ScalarType::STRING => read_next_values::(opts).await, - ScalarType::Enum => read_next_values::(opts).await, + ScalarType::Enum => { + debug!( + "make_read_events_fut {:?} {:?} ------------- good", + shape, scalar_type + ); + read_next_values::(opts).await + } ScalarType::ChannelStatus => { - warn!("read scalar channel status not yet supported"); + warn!("read not yet supported {:?} {:?}", shape, scalar_type); err::todoval() } }, @@ -177,12 +186,15 @@ impl EventsStreamRt { ScalarType::F64 => read_next_values::>(opts).await, ScalarType::BOOL => read_next_values::>(opts).await, ScalarType::STRING => { - warn!("read array string not yet supported"); + warn!("read not yet supported {:?} {:?}", shape, scalar_type); + err::todoval() + } + ScalarType::Enum => { + warn!("read not yet supported {:?} {:?}", shape, scalar_type); err::todoval() } - ScalarType::Enum => read_next_values::>(opts).await, ScalarType::ChannelStatus => { - warn!("read array channel status not yet supported"); + warn!("read not yet supported {:?} {:?}", shape, scalar_type); err::todoval() } }, diff --git a/crates/scyllaconn/src/events2/firstbefore.rs b/crates/scyllaconn/src/events2/firstbefore.rs index da102eb..da2d9bf 100644 --- a/crates/scyllaconn/src/events2/firstbefore.rs +++ b/crates/scyllaconn/src/events2/firstbefore.rs @@ -11,6 +11,7 @@ use std::task::Context; use std::task::Poll; #[derive(Debug, ThisError)] +#[cstm(name = "EventsFirstBefore")] pub enum Error { Unordered, Logic, diff --git a/crates/scyllaconn/src/events2/mergert.rs b/crates/scyllaconn/src/events2/mergert.rs index 158415a..a54465c 100644 --- a/crates/scyllaconn/src/events2/mergert.rs +++ b/crates/scyllaconn/src/events2/mergert.rs @@ -25,6 +25,7 @@ use std::task::Context; use std::task::Poll; #[derive(Debug, ThisError)] +#[cstm(name = "EventsMergeRt")] pub enum Error { Input(#[from] crate::events2::firstbefore::Error), Events(#[from] crate::events2::events::Error), diff --git a/crates/scyllaconn/src/events2/msp.rs b/crates/scyllaconn/src/events2/msp.rs index 89b02e2..8a4aa8a 100644 --- a/crates/scyllaconn/src/events2/msp.rs +++ b/crates/scyllaconn/src/events2/msp.rs @@ -18,9 +18,9 @@ use std::task::Context; use std::task::Poll; #[derive(Debug, ThisError)] +#[cstm(name = "EventsMsp")] pub enum Error { Logic, - #[error("Worker({0})")] Worker(Box), ScyllaQuery(#[from] scylla::transport::errors::QueryError), ScyllaRow(#[from] scylla::transport::iterator::NextRowError), diff --git a/crates/scyllaconn/src/events2/prepare.rs b/crates/scyllaconn/src/events2/prepare.rs index a631885..4319a14 100644 --- a/crates/scyllaconn/src/events2/prepare.rs +++ b/crates/scyllaconn/src/events2/prepare.rs @@ -5,6 +5,7 @@ use scylla::prepared_statement::PreparedStatement; use scylla::Session; #[derive(Debug, ThisError)] +#[cstm(name = "ScyllaPrepare")] pub enum Error { ScyllaQuery(#[from] scylla::transport::errors::QueryError), ScyllaNextRow(#[from] scylla::transport::iterator::NextRowError), diff --git a/crates/scyllaconn/src/worker.rs b/crates/scyllaconn/src/worker.rs index 75d5452..631bb38 100644 --- a/crates/scyllaconn/src/worker.rs +++ b/crates/scyllaconn/src/worker.rs @@ -18,8 +18,8 @@ use std::pin::Pin; use std::sync::Arc; #[derive(Debug, ThisError)] +#[cstm(name = "ScyllaWorker")] pub enum Error { - #[error("ScyllaConnection({0})")] ScyllaConnection(err::Error), Prepare(#[from] crate::events2::prepare::Error), EventsQuery(#[from] crate::events::Error), diff --git a/crates/streams/src/framed_bytes.rs b/crates/streams/src/framed_bytes.rs index dbe43d5..708f958 100644 --- a/crates/streams/src/framed_bytes.rs +++ b/crates/streams/src/framed_bytes.rs @@ -25,6 +25,7 @@ macro_rules! trace_parse { } #[derive(Debug, ThisError)] +#[cstm(name = "StreamFramedBytes")] pub enum Error { FrameTooLarge, Logic,