diff --git a/Cargo.lock b/Cargo.lock index 4992112..9a153e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -189,34 +189,19 @@ version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c91839b07e474b3995035fd8ac33ee54f9c9ccbbb1ea33d9909c71bffdf1259d" dependencies = [ - "arrow-arith 53.3.0", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", "arrow-csv", - "arrow-data 53.3.0", - "arrow-ipc 53.3.0", + "arrow-data", + "arrow-ipc", "arrow-json", - "arrow-ord 53.3.0", - "arrow-row 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", - "arrow-string 53.3.0", -] - -[[package]] -name = "arrow-arith" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" -dependencies = [ - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "chrono", - "half", - "num", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", ] [[package]] @@ -225,31 +210,15 @@ version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "855c57c4efd26722b044dcd3e348252560e3e0333087fb9f6479dc0bf744054f" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "chrono", "half", "num", ] -[[package]] -name = "arrow-array" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" -dependencies = [ - "ahash", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "chrono", - "half", - "hashbrown 0.14.5", - "num", -] - [[package]] name = "arrow-array" version = "53.3.0" @@ -257,9 +226,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd03279cea46569acf9295f6224fbc370c5df184b4d2ecfe97ccb131d5615a7f" dependencies = [ "ahash", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", + "arrow-buffer", + "arrow-data", + "arrow-schema", "chrono", "chrono-tz", "half", @@ -267,17 +236,6 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-buffer" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" -dependencies = [ - "bytes", - "half", - "num", -] - [[package]] name = "arrow-buffer" version = "53.3.0" @@ -289,43 +247,23 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-cast" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" -dependencies = [ - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "arrow-select 52.2.0", - "atoi", - "base64 0.22.1", - "chrono", - "half", - "lexical-core 0.8.5", - "num", - "ryu", -] - [[package]] name = "arrow-cast" version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc70e39916e60c5b7af7a8e2719e3ae589326039e1e863675a008bee5ffe90fd" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "atoi", - "base64 0.22.1", + "base64", "chrono", "comfy-table", "half", - "lexical-core 1.0.2", + "lexical-core", "num", "ryu", ] @@ -336,96 +274,70 @@ version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "789b2af43c1049b03a8d088ff6b2257cdcea1756cd76b174b1f2600356771b97" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "chrono", "csv", "csv-core", "lazy_static", - "lexical-core 1.0.2", + "lexical-core", "regex", ] -[[package]] -name = "arrow-data" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" -dependencies = [ - "arrow-buffer 52.2.0", - "arrow-schema 52.2.0", - "half", - "num", -] - [[package]] name = "arrow-data" version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e75edf21ffd53744a9b8e3ed11101f610e7ceb1a29860432824f1834a1f623" dependencies = [ - "arrow-buffer 53.3.0", - "arrow-schema 53.3.0", + "arrow-buffer", + "arrow-schema", "half", "num", ] [[package]] name = "arrow-flight" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7ffbc96072e466ae5188974725bb46757587eafe427f77a25b828c375ae882" -dependencies = [ - "arrow-arith 52.2.0", - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-cast 52.2.0", - "arrow-data 52.2.0", - "arrow-ipc 52.2.0", - "arrow-ord 52.2.0", - "arrow-row 52.2.0", - "arrow-schema 52.2.0", - "arrow-select 52.2.0", - "arrow-string 52.2.0", - "base64 0.22.1", +version = "53.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c09b331887a526f203f2123444792aee924632bd08b9940435070901075832e" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", + "base64", "bytes", "futures", "once_cell", "paste", - "prost 0.12.6", + "prost", "prost-types", "tokio", "tonic", ] -[[package]] -name = "arrow-ipc" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" -dependencies = [ - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-cast 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "flatbuffers", -] - [[package]] name = "arrow-ipc" version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d186a909dece9160bf8312f5124d797884f608ef5435a36d9d608e0b2a9bcbf8" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "flatbuffers", "lz4_flex", ] @@ -436,64 +348,35 @@ version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66ff2fedc1222942d0bd2fd391cb14a85baa3857be95c9373179bd616753b85" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", "chrono", "half", "indexmap 2.6.0", - "lexical-core 1.0.2", + "lexical-core", "num", "serde", "serde_json", ] -[[package]] -name = "arrow-ord" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" -dependencies = [ - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "arrow-select 52.2.0", - "half", - "num", -] - [[package]] name = "arrow-ord" version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ece7b5bc1180e6d82d1a60e1688c199829e8842e38497563c3ab6ea813e527fd" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "half", "num", ] -[[package]] -name = "arrow-row" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" -dependencies = [ - "ahash", - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "half", -] - [[package]] name = "arrow-row" version = "53.3.0" @@ -501,19 +384,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "745c114c8f0e8ce211c83389270de6fbe96a9088a7b32c2a041258a443fe83ff" dependencies = [ "ahash", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "half", ] -[[package]] -name = "arrow-schema" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" - [[package]] name = "arrow-schema" version = "53.3.0" @@ -523,20 +400,6 @@ dependencies = [ "serde", ] -[[package]] -name = "arrow-select" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" -dependencies = [ - "ahash", - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "num", -] - [[package]] name = "arrow-select" version = "53.3.0" @@ -544,28 +407,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e415279094ea70323c032c6e739c48ad8d80e78a09bef7117b8718ad5bf3722" dependencies = [ "ahash", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", - "num", -] - -[[package]] -name = "arrow-string" -version = "52.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" -dependencies = [ - "arrow-array 52.2.0", - "arrow-buffer 52.2.0", - "arrow-data 52.2.0", - "arrow-schema 52.2.0", - "arrow-select 52.2.0", - "memchr", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", "num", - "regex", - "regex-syntax", ] [[package]] @@ -574,11 +420,11 @@ version = "53.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d956cae7002eb8d83a27dbd34daaea1cf5b75852f0b84deb4d93a276e92bbf" dependencies = [ - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-data 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", "memchr", "num", "regex", @@ -702,18 +548,17 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.20" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "http", + "http-body", + "http-body-util", "itoa", "matchit", "memchr", @@ -722,25 +567,28 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 0.1.2", - "tower", + "sync_wrapper 1.0.1", + "tower 0.5.1", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", ] @@ -760,12 +608,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -1310,9 +1152,9 @@ dependencies = [ "ahash", "apache-avro", "arrow", - "arrow-array 53.3.0", - "arrow-ipc 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-ipc", + "arrow-schema", "async-compression", "async-trait", "bytes", @@ -1344,7 +1186,7 @@ dependencies = [ "log", "num-traits", "num_cpus", - "object_store 0.11.1", + "object_store", "parking_lot", "parquet", "paste", @@ -1366,7 +1208,7 @@ version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7493c5c2d40eec435b13d92e5703554f4efc7059451fcb8d3a79580ff0e45560" dependencies = [ - "arrow-schema 53.3.0", + "arrow-schema", "async-trait", "datafusion-common", "datafusion-execution", @@ -1384,9 +1226,9 @@ dependencies = [ "ahash", "apache-avro", "arrow", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-schema", "chrono", "half", "hashbrown 0.14.5", @@ -1394,7 +1236,7 @@ dependencies = [ "instant", "libc", "num_cpus", - "object_store 0.11.1", + "object_store", "parquet", "paste", "sqlparser", @@ -1425,7 +1267,7 @@ dependencies = [ "futures", "hashbrown 0.14.5", "log", - "object_store 0.11.1", + "object_store", "parking_lot", "rand", "tempfile", @@ -1440,8 +1282,8 @@ checksum = "8036495980e3131f706b7d33ab00b4492d73dc714e3cb74d11b50f9602a73246" dependencies = [ "ahash", "arrow", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", + "arrow-array", + "arrow-buffer", "chrono", "datafusion-common", "datafusion-expr-common", @@ -1475,8 +1317,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52c4012648b34853e40a2c6bcaa8772f837831019b68aca384fb38436dba162" dependencies = [ "arrow", - "arrow-buffer 53.3.0", - "base64 0.22.1", + "arrow-buffer", + "base64", "blake2", "blake3", "chrono", @@ -1503,7 +1345,7 @@ checksum = "e5b8bb624597ba28ed7446df4a9bd7c7a7bde7c578b6b527da3f47371d5f6741" dependencies = [ "ahash", "arrow", - "arrow-schema 53.3.0", + "arrow-schema", "datafusion-common", "datafusion-execution", "datafusion-expr", @@ -1549,10 +1391,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca25bbb87323716d05e54114666e942172ccca23c5a507e9c7851db6e965317" dependencies = [ "arrow", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-ord 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", "datafusion-common", "datafusion-execution", "datafusion-expr", @@ -1628,11 +1470,11 @@ checksum = "3370357b8fc75ec38577700644e5d1b0bc78f38babab99c0b8bd26bafb3e4335" dependencies = [ "ahash", "arrow", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-ord 53.3.0", - "arrow-schema 53.3.0", - "arrow-string 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "arrow-string", "chrono", "datafusion-common", "datafusion-expr", @@ -1669,7 +1511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eee8c479522df21d7b395640dff88c5ed05361852dce6544d7c98e9dbcebffe" dependencies = [ "arrow", - "arrow-schema 53.3.0", + "arrow-schema", "datafusion-common", "datafusion-execution", "datafusion-expr-common", @@ -1686,10 +1528,10 @@ checksum = "17e1fc2e2c239d14e8556f2622b19a726bf6bc6962cc00c71fc52626274bee24" dependencies = [ "ahash", "arrow", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-ord 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", "async-trait", "chrono", "datafusion-common", @@ -1725,8 +1567,8 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-proto-common", - "object_store 0.11.1", - "prost 0.13.3", + "object_store", + "prost", ] [[package]] @@ -1738,8 +1580,8 @@ dependencies = [ "arrow", "chrono", "datafusion-common", - "object_store 0.11.1", - "prost 0.13.3", + "object_store", + "prost", ] [[package]] @@ -1749,8 +1591,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e3a4ed41dbee20a5d947a59ca035c225d67dc9cbe869c10f66dcdf25e7ce51" dependencies = [ "arrow", - "arrow-array 53.3.0", - "arrow-schema 53.3.0", + "arrow-array", + "arrow-schema", "datafusion-common", "datafusion-expr", "indexmap 2.6.0", @@ -1766,14 +1608,14 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2efadff110c892910f5b1b09a764845dd136f5dabdd802e64f2968586fbe19e6" dependencies = [ - "arrow-arith 53.3.0", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", "arrow-json", - "arrow-ord 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", + "arrow-ord", + "arrow-schema", + "arrow-select", "bytes", "chrono", "delta_kernel_derive", @@ -1821,16 +1663,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de7ce23266a316295cf5343d641ab15e3e681b41758f2fede2a116d8596fb6d" dependencies = [ "arrow", - "arrow-arith 53.3.0", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", - "arrow-ipc 53.3.0", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-ipc", "arrow-json", - "arrow-ord 53.3.0", - "arrow-row 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", "async-trait", "bytes", "cfg-if", @@ -1859,7 +1701,7 @@ dependencies = [ "num-bigint", "num-traits", "num_cpus", - "object_store 0.11.1", + "object_store", "once_cell", "parking_lot", "parquet", @@ -1898,8 +1740,8 @@ dependencies = [ "directories", "env_logger", "futures", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "insta", "itertools 0.13.0", "lazy_static", @@ -1907,11 +1749,11 @@ dependencies = [ "metrics", "metrics-exporter-prometheus", "num_cpus", - "object_store 0.10.2", + "object_store", "parking_lot", "pin-project-lite", "predicates", - "prost 0.12.6", + "prost", "ratatui", "serde", "strum 0.26.3", @@ -1921,7 +1763,7 @@ dependencies = [ "tokio-util", "toml", "tonic", - "tower", + "tower 0.5.1", "tui-logger", "tui-textarea", "url", @@ -2264,25 +2106,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[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.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -2294,7 +2117,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http", "indexmap 2.6.0", "slab", "tokio", @@ -2371,17 +2194,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[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" @@ -2393,17 +2205,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.1" @@ -2411,7 +2212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -2422,8 +2223,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -2445,30 +2246,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -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.4.1" @@ -2478,9 +2255,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -2497,8 +2274,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.4.1", + "http", + "hyper", "hyper-util", "rustls", "rustls-native-certs 0.8.0", @@ -2510,32 +2287,32 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 0.14.30", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -2720,19 +2497,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float 0.8.5", - "lexical-parse-integer 0.8.6", - "lexical-util 0.8.5", - "lexical-write-float 0.8.5", - "lexical-write-integer 0.8.5", -] - [[package]] name = "lexical-core" version = "1.0.2" @@ -2742,8 +2506,8 @@ dependencies = [ "lexical-parse-float 1.0.2", "lexical-parse-integer 1.0.2", "lexical-util 1.0.3", - "lexical-write-float 1.0.2", - "lexical-write-integer 1.0.2", + "lexical-write-float", + "lexical-write-integer", ] [[package]] @@ -2806,17 +2570,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util 0.8.5", - "lexical-write-integer 0.8.5", - "static_assertions", -] - [[package]] name = "lexical-write-float" version = "1.0.2" @@ -2824,17 +2577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e7c3ad4e37db81c1cbe7cf34610340adc09c322871972f74877a712abc6c809" dependencies = [ "lexical-util 1.0.3", - "lexical-write-integer 1.0.2", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util 0.8.5", + "lexical-write-integer", "static_assertions", ] @@ -3005,9 +2748,9 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b" dependencies = [ - "base64 0.22.1", + "base64", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-rustls", "hyper-util", "indexmap 2.6.0", @@ -3204,17 +2947,17 @@ dependencies = [ [[package]] name = "object_store" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" +checksum = "6eb4c22c6154a1e759d7099f9ffad7cc5ef8245f9efbab4a41b92623079c82f3" dependencies = [ "async-trait", - "base64 0.22.1", + "base64", "bytes", "chrono", "futures", "humantime", - "hyper 1.4.1", + "hyper", "itertools 0.13.0", "md-5", "parking_lot", @@ -3225,28 +2968,7 @@ dependencies = [ "ring", "serde", "serde_json", - "snafu 0.7.5", - "tokio", - "tracing", - "url", - "walkdir", -] - -[[package]] -name = "object_store" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb4c22c6154a1e759d7099f9ffad7cc5ef8245f9efbab4a41b92623079c82f3" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "humantime", - "itertools 0.13.0", - "parking_lot", - "percent-encoding", - "snafu 0.8.5", + "snafu", "tokio", "tracing", "url", @@ -3322,14 +3044,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b449890367085eb65d7d3321540abc3d7babbd179ce31df0016e90719114191" dependencies = [ "ahash", - "arrow-array 53.3.0", - "arrow-buffer 53.3.0", - "arrow-cast 53.3.0", - "arrow-data 53.3.0", - "arrow-ipc 53.3.0", - "arrow-schema 53.3.0", - "arrow-select 53.3.0", - "base64 0.22.1", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", + "base64", "brotli", "bytes", "chrono", @@ -3340,7 +3062,7 @@ dependencies = [ "lz4_flex", "num", "num-bigint", - "object_store 0.11.1", + "object_store", "paste", "seq-macro", "snap", @@ -3522,16 +3244,6 @@ 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 0.12.6", -] - [[package]] name = "prost" version = "0.13.3" @@ -3539,20 +3251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", - "prost-derive 0.13.3", -] - -[[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.87", + "prost-derive", ] [[package]] @@ -3570,11 +3269,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] @@ -3792,15 +3491,15 @@ version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-rustls", "hyper-util", "ipnet", @@ -3949,7 +3648,7 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.1", + "base64", "rustls-pki-types", ] @@ -4184,35 +3883,13 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "doc-comment", - "snafu-derive 0.7.5", -] - [[package]] name = "snafu" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "223891c85e2a29c3fe8fb900c1fae5e69c2e42415e3177752e8718475efa5019" dependencies = [ - "snafu-derive 0.8.5", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "snafu-derive", ] [[package]] @@ -4494,16 +4171,6 @@ dependencies = [ "windows-sys 0.52.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.4.0" @@ -4586,26 +4253,29 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64", "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost 0.12.6", + "prost", + "socket2", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -4631,6 +4301,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/Cargo.toml b/Cargo.toml index 2baada0..d6b396b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ default-run = "dft" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arrow-flight = { version = "52.2.0", features = ["flight-sql-experimental"] , optional = true } +arrow-flight = { version = "53.0.0", features = ["flight-sql-experimental"] , optional = true } async-trait = "0.1.80" clap = { version = "4.5.1", features = ["derive"] } color-eyre = "0.6.3" @@ -27,18 +27,18 @@ deltalake = { version = "0.22.0", features = ["datafusion"], optional = true } directories = "5.0.1" env_logger = "0.11.5" futures = "0.3.30" -http = "0.2.9" -http-body = {version = "0.4.5" } +http = "1" +http-body = "1" itertools = "0.13.0" lazy_static = "1.4.0" log = "0.4.22" metrics = {version = "0.24.0", optional = true } metrics-exporter-prometheus = {version = "0.16.0", optional = true } num_cpus = "1.16.0" -object_store = { version = "0.10.2", features = ["aws"], optional = true } +object_store = { version = "0.11.0", features = ["aws"], optional = true } parking_lot = "0.12.3" pin-project-lite = {version = "0.2.14" } -prost = "0.12.3" +prost = "0.13.1" ratatui = "0.28.0" serde = { version = "1.0.197", features = ["derive"] } strum = "0.26.2" @@ -46,8 +46,8 @@ tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] } tokio-stream = { version = "0.1.15", features = ["net"] } tokio-util = "0.7.10" toml = "0.8.12" -tonic = { version = "0.11.0", optional = true } -tower = {version = "0.4.13" } +tonic = { version = "0.12.3", optional = true } +tower = {version = "0.5.0" } tui-logger = {version = "0.12", features = ["tracing-support"]} tui-textarea = { version = "0.6.1", features = ["search"] } url = { version = "2.5.2", optional = true } diff --git a/src/test_utils/trailers_layer.rs b/src/test_utils/trailers_layer.rs index 6a18b2c..ec3c868 100644 --- a/src/test_utils/trailers_layer.rs +++ b/src/test_utils/trailers_layer.rs @@ -99,30 +99,19 @@ impl http_body::Body for WrappedBody { type Data = B::Data; type Error = B::Error; - fn poll_data( - mut self: Pin<&mut Self>, + fn poll_frame( + self: Pin<&mut Self>, cx: &mut Context<'_>, - ) -> Poll>> { - self.as_mut().project().inner.poll_data(cx) - } - - fn poll_trailers( - mut self: Pin<&mut Self>, - cx: &mut Context<'_>, - ) -> Poll, Self::Error>> { - let result: Result, Self::Error> = - ready!(self.as_mut().project().inner.poll_trailers(cx)); - let mut trailers = http::header::HeaderMap::new(); - trailers.insert("test-trailer", HeaderValue::from_static("trailer_val")); + ) -> Poll, Self::Error>>> { + let mut result = ready!(self.project().inner.poll_frame(cx)); - match result { - Ok(Some(mut existing)) => { - existing.extend(trailers.iter().map(|(k, v)| (k.clone(), v.clone()))); - Poll::Ready(Ok(Some(existing))) + if let Some(Ok(frame)) = &mut result { + if let Some(trailers) = frame.trailers_mut() { + trailers.insert("test-trailer", HeaderValue::from_static("trailer_val")); } - Ok(None) => Poll::Ready(Ok(Some(trailers))), - Err(e) => Poll::Ready(Err(e)), } + + Poll::Ready(result) } fn is_end_stream(&self) -> bool {