From e3ff0aacb8fe74dd249926ed6d5d6d19ab35850a Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Wed, 3 Jul 2024 14:02:01 +0800 Subject: [PATCH 1/8] chore(dep): bump arrow-udf-flight Signed-off-by: MrCroxx --- Cargo.lock | 126 +++++++++++++++++++++++++++++++---------------------- Cargo.toml | 1 + 2 files changed, 74 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c85ea791906e..5dda11e2a8215 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -633,11 +633,32 @@ dependencies = [ "bytes", "futures", "paste", - "prost 0.12.1", + "prost 0.12.6", "tokio", "tonic 0.10.2", ] +[[package]] +name = "arrow-flight" +version = "52.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd624aafd1f34710a1d6ed44ea0e9b06f7b75adc4277c53bac4a2d23229030b" +dependencies = [ + "arrow-array 52.0.0", + "arrow-buffer 52.0.0", + "arrow-cast 52.0.0", + "arrow-ipc 52.0.0", + "arrow-schema 52.0.0", + "base64 0.22.0", + "bytes", + "futures", + "paste", + "prost 0.12.6", + "prost-types 0.12.6", + "tokio", + "tonic 0.11.0", +] + [[package]] name = "arrow-ipc" version = "48.0.1" @@ -905,17 +926,16 @@ dependencies = [ [[package]] name = "arrow-udf-flight" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adb3a066bd22fb520bc3d040d9d59ee54f320c21faeb6df815ea20445c80c54" +source = "git+https://github.com/risingwavelabs/arrow-udf?rev=54f6d69#54f6d69c618bfb749abddc507e46ee06497c71b2" dependencies = [ - "arrow-array 50.0.0", - "arrow-flight", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", + "arrow-array 52.0.0", + "arrow-flight 52.0.0", + "arrow-schema 52.0.0", + "arrow-select 52.0.0", "futures-util", "thiserror", "tokio", - "tonic 0.10.2", + "tonic 0.11.0", "tracing", ] @@ -2907,8 +2927,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" dependencies = [ "futures-core", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.6", + "prost-types 0.12.6", "tonic 0.11.0", "tracing-core", ] @@ -2925,8 +2945,8 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.6", + "prost-types 0.12.6", "serde", "serde_json", "thread_local", @@ -3860,7 +3880,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "object_store", - "prost 0.12.1", + "prost 0.12.6", ] [[package]] @@ -5026,7 +5046,7 @@ version = "0.12.1" source = "git+https://github.com/risingwavelabs/etcd-client.git?rev=4e84d40#4e84d40a84b35718d814cc2afccc9274c9d78e1e" dependencies = [ "http 0.2.9", - "prost 0.12.1", + "prost 0.12.6", "tokio", "tokio-stream", "tonic 0.10.2", @@ -6018,8 +6038,8 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cd184c52aa2619ac1b16ad8b5a752e91d25be88a8cf08eaec19777dfacbe54" dependencies = [ - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.6", + "prost-types 0.12.6", "tonic 0.10.2", ] @@ -6046,7 +6066,7 @@ dependencies = [ "google-cloud-gax", "google-cloud-googleapis", "google-cloud-token", - "prost-types 0.12.1", + "prost-types 0.12.6", "thiserror", "tokio", "tokio-util", @@ -8712,7 +8732,7 @@ dependencies = [ "itertools 0.12.1", "madsim-tonic", "madsim-tonic-build", - "prost 0.12.1", + "prost 0.12.6", "rust-embed", "schnellru", "serde", @@ -9758,12 +9778,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.1", + "prost-derive 0.12.6", ] [[package]] @@ -9796,14 +9816,14 @@ checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.11.0", + "itertools 0.10.5", "log", "multimap 0.8.3", "once_cell", "petgraph", "prettyplease 0.2.15", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.6", + "prost-types 0.12.6", "regex", "syn 2.0.66", "tempfile", @@ -9825,12 +9845,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.66", @@ -9852,8 +9872,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ae9372e3227f3685376a0836e5c248611eafc95a0be900d44bc6cdf225b700f" dependencies = [ "once_cell", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.6", + "prost-types 0.12.6", ] [[package]] @@ -9867,11 +9887,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.1" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.1", + "prost 0.12.6", ] [[package]] @@ -10678,7 +10698,7 @@ dependencies = [ "bytes", "itertools 0.12.1", "parking_lot 0.12.1", - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_hummock_sdk", "risingwave_meta_model_v2", @@ -10719,7 +10739,7 @@ dependencies = [ "parking_lot 0.12.1", "paste", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "rand", "risingwave_common", "risingwave_common_estimate_size", @@ -10913,7 +10933,7 @@ dependencies = [ "pretty_assertions", "procfs 0.16.0", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "rand", "regex", "reqwest 0.12.4", @@ -11093,7 +11113,7 @@ dependencies = [ "madsim-tokio", "madsim-tonic", "parking_lot 0.12.1", - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_common_heap_profiling", "risingwave_common_service", @@ -11126,7 +11146,7 @@ dependencies = [ "maplit", "pprof", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "rand", "risingwave_batch", "risingwave_common", @@ -11229,10 +11249,10 @@ dependencies = [ "postgres-openssl", "pretty_assertions", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "prost-build 0.12.1", "prost-reflect", - "prost-types 0.12.1", + "prost-types 0.12.6", "protobuf-native", "protobuf-src", "pulsar", @@ -11327,7 +11347,7 @@ dependencies = [ "madsim-etcd-client", "madsim-tokio", "memcomparable", - "prost 0.12.1", + "prost 0.12.6", "regex", "risingwave_common", "risingwave_connector", @@ -11455,7 +11475,7 @@ dependencies = [ "aho-corasick", "anyhow", "arrow-array 50.0.0", - "arrow-flight", + "arrow-flight 50.0.0", "arrow-schema 50.0.0", "arrow-schema 52.0.0", "arrow-udf-flight", @@ -11565,7 +11585,7 @@ dependencies = [ "pretty-xmlish", "pretty_assertions", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "rand", "risingwave_batch", "risingwave_common", @@ -11617,7 +11637,7 @@ dependencies = [ "hex", "itertools 0.12.1", "parse-display", - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_common_estimate_size", "risingwave_pb", @@ -11675,7 +11695,7 @@ dependencies = [ "madsim-tokio", "mockall", "parking_lot 0.12.1", - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_hummock_sdk", "risingwave_pb", @@ -11694,7 +11714,7 @@ dependencies = [ "futures", "jni", "madsim-tokio", - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_expr", "risingwave_hummock_sdk", @@ -11724,7 +11744,7 @@ dependencies = [ "jni", "madsim-tokio", "paste", - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_expr", "risingwave_hummock_sdk", @@ -11806,7 +11826,7 @@ dependencies = [ "parking_lot 0.12.1", "prometheus", "prometheus-http-query", - "prost 0.12.1", + "prost 0.12.6", "rand", "risingwave_backup", "risingwave_common", @@ -11875,7 +11895,7 @@ dependencies = [ name = "risingwave_meta_model_v2" version = "1.11.0-alpha" dependencies = [ - "prost 0.12.1", + "prost 0.12.6", "risingwave_common", "risingwave_hummock_sdk", "risingwave_pb", @@ -11990,7 +12010,7 @@ dependencies = [ "madsim-tonic-build", "pbjson", "pbjson-build", - "prost 0.12.1", + "prost 0.12.6", "prost-helpers", "risingwave_error", "serde", @@ -12261,7 +12281,7 @@ dependencies = [ "parking_lot 0.12.1", "procfs 0.16.0", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "rand", "risingwave_backup", "risingwave_common", @@ -12329,7 +12349,7 @@ dependencies = [ "pin-project", "prehash", "prometheus", - "prost 0.12.1", + "prost 0.12.6", "rand", "risingwave_common", "risingwave_common_estimate_size", @@ -15438,7 +15458,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.1", + "prost 0.12.6", "rustls 0.21.11", "rustls-pemfile 1.0.4", "tokio", @@ -15469,7 +15489,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.1", + "prost 0.12.6", "tokio", "tokio-stream", "tower", diff --git a/Cargo.toml b/Cargo.toml index f6c0d5bc229ef..03b187c60ea7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -346,6 +346,7 @@ deno_web = { git = "https://github.com/bakjos/deno", rev = "787a232" } deno_websocket = { git = "https://github.com/bakjos/deno", rev = "787a232" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" } +arrow-udf-flight = { git = "https://github.com/risingwavelabs/arrow-udf", rev = "54f6d69" } [workspace.metadata.dylint] libraries = [{ path = "./lints" }] From 3c102d50a5ea39ee02b9250edfd7ece6f896fc02 Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Wed, 3 Jul 2024 17:58:29 +0800 Subject: [PATCH 2/8] todo: for runji Signed-off-by: MrCroxx --- Cargo.lock | 121 +++++------------- Cargo.toml | 28 ++-- src/batch/Cargo.toml | 1 - src/batch/src/executor/iceberg_scan.rs | 2 +- src/common/Cargo.toml | 4 - src/common/src/array/arrow/arrow_iceberg.rs | 21 +-- src/common/src/array/arrow/arrow_udf.rs | 2 +- src/connector/Cargo.toml | 2 - src/connector/src/error.rs | 2 +- src/connector/src/sink/iceberg/mod.rs | 4 +- .../prometheus/monitored_base_file_writer.rs | 4 +- .../prometheus/monitored_partition_writer.rs | 4 +- .../monitored_position_delete_writer.rs | 2 +- .../prometheus/monitored_write_writer.rs | 4 +- .../src/source/pulsar/source/reader.rs | 2 +- src/expr/impl/Cargo.toml | 1 - src/expr/impl/src/scalar/external/iceberg.rs | 4 +- src/frontend/Cargo.toml | 1 - src/frontend/src/handler/create_sink.rs | 2 +- src/frontend/src/handler/create_source.rs | 6 +- 20 files changed, 70 insertions(+), 147 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5dda11e2a8215..841ed332603ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -618,26 +618,6 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-flight" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7f215461ad6346f2e4cc853e377d4e076d533e1ed78d327debe83023e3601f" -dependencies = [ - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", - "base64 0.21.7", - "bytes", - "futures", - "paste", - "prost 0.12.6", - "tokio", - "tonic 0.10.2", -] - [[package]] name = "arrow-flight" version = "52.0.0" @@ -925,11 +905,12 @@ dependencies = [ [[package]] name = "arrow-udf-flight" -version = "0.1.0" -source = "git+https://github.com/risingwavelabs/arrow-udf?rev=54f6d69#54f6d69c618bfb749abddc507e46ee06497c71b2" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a419f7d50bfd3d80f06c138f7e7e56526177eb2bedf2029f20543373299cb57c" dependencies = [ "arrow-array 52.0.0", - "arrow-flight 52.0.0", + "arrow-flight", "arrow-schema 52.0.0", "arrow-select 52.0.0", "futures-util", @@ -946,9 +927,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cb6d108605c5489fff1ef9c520656946ad05ed0de3ea6d26d56bcb34bdb8c5" dependencies = [ "anyhow", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", + "arrow-array 52.0.0", + "arrow-buffer 52.0.0", + "arrow-schema 52.0.0", "atomic-time", "rquickjs", ] @@ -959,10 +940,10 @@ version = "0.0.1" source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=fa36365#fa3636559de986aa592da6e8b3fbfac7bdd4bb78" dependencies = [ "anyhow", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-data 50.0.0", - "arrow-schema 50.0.0", + "arrow-array 52.0.0", + "arrow-buffer 52.0.0", + "arrow-data 52.0.0", + "arrow-schema 52.0.0", "arrow-udf-js-deno-runtime", "async-trait", "deno_core", @@ -1010,10 +991,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4506efc6fbc200c083add2a7ed4e3616a859941a745e922320ae7051d90d12ec" dependencies = [ "anyhow", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", + "arrow-array 52.0.0", + "arrow-buffer 52.0.0", + "arrow-ipc 52.0.0", + "arrow-schema 52.0.0", "lazy_static", "pyo3", "pyo3-build-config", @@ -1026,9 +1007,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb829e25925161d93617d4b053bae03fe51e708f2cce088d85df856011d4f369" dependencies = [ "anyhow", - "arrow-array 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", + "arrow-array 52.0.0", + "arrow-ipc 52.0.0", + "arrow-schema 52.0.0", "async-trait", "base64 0.22.0", "genawaiter", @@ -5943,7 +5924,7 @@ dependencies = [ "http 0.2.9", "thiserror", "tokio", - "tonic 0.10.2", + "tonic 0.11.0", "tower", "tracing", "trust-dns-resolver 0.23.2", @@ -8935,38 +8916,6 @@ dependencies = [ "zstd 0.13.0", ] -[[package]] -name = "parquet" -version = "50.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750" -dependencies = [ - "ahash 0.8.11", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-cast 50.0.0", - "arrow-data 50.0.0", - "arrow-ipc 50.0.0", - "arrow-schema 50.0.0", - "arrow-select 50.0.0", - "base64 0.21.7", - "brotli 3.5.0", - "bytes", - "chrono", - "flate2", - "half 2.3.1", - "hashbrown 0.14.3", - "lz4_flex", - "num", - "num-bigint", - "paste", - "seq-macro", - "snap", - "thrift", - "twox-hash", - "zstd 0.13.0", -] - [[package]] name = "parquet" version = "52.0.0" @@ -9816,7 +9765,7 @@ checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck 0.4.1", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap 0.8.3", "once_cell", @@ -9850,7 +9799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.66", @@ -10715,9 +10664,8 @@ name = "risingwave_batch" version = "1.11.0-alpha" dependencies = [ "anyhow", - "arrow-array 50.0.0", "arrow-array 52.0.0", - "arrow-schema 50.0.0", + "arrow-schema 52.0.0", "assert_matches", "async-recursion", "async-trait", @@ -10869,16 +10817,12 @@ dependencies = [ "anyhow", "arc-swap", "arrow-array 48.0.1", - "arrow-array 50.0.0", "arrow-array 52.0.0", "arrow-buffer 48.0.1", - "arrow-buffer 50.0.0", "arrow-buffer 52.0.0", "arrow-cast 48.0.1", - "arrow-cast 50.0.0", "arrow-cast 52.0.0", "arrow-schema 48.0.1", - "arrow-schema 50.0.0", "arrow-schema 52.0.0", "async-trait", "auto_enums", @@ -11177,12 +11121,10 @@ version = "1.11.0-alpha" dependencies = [ "anyhow", "apache-avro 0.16.0", - "arrow-array 50.0.0", "arrow-array 52.0.0", - "arrow-row 50.0.0", - "arrow-schema 50.0.0", + "arrow-row 52.0.0", "arrow-schema 52.0.0", - "arrow-select 50.0.0", + "arrow-select 52.0.0", "assert_matches", "async-nats", "async-trait", @@ -11243,7 +11185,7 @@ dependencies = [ "opendal 0.47.0", "openssl", "parking_lot 0.12.1", - "parquet 50.0.0", + "parquet 52.0.0", "paste", "pg_bigdecimal", "postgres-openssl", @@ -11432,8 +11374,8 @@ name = "risingwave_expr" version = "1.11.0-alpha" dependencies = [ "anyhow", - "arrow-array 50.0.0", - "arrow-schema 50.0.0", + "arrow-array 52.0.0", + "arrow-schema 52.0.0", "async-trait", "auto_impl", "await-tree", @@ -11474,9 +11416,8 @@ version = "1.11.0-alpha" dependencies = [ "aho-corasick", "anyhow", - "arrow-array 50.0.0", - "arrow-flight 50.0.0", - "arrow-schema 50.0.0", + "arrow-array 52.0.0", + "arrow-flight", "arrow-schema 52.0.0", "arrow-udf-flight", "arrow-udf-js", @@ -11542,7 +11483,6 @@ version = "1.11.0-alpha" dependencies = [ "anyhow", "arc-swap", - "arrow-schema 50.0.0", "arrow-schema 52.0.0", "assert_matches", "async-recursion", @@ -15490,7 +15430,10 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.6", + "rustls-pemfile 2.1.1", + "rustls-pki-types", "tokio", + "tokio-rustls 0.25.0", "tokio-stream", "tower", "tower-layer", diff --git a/Cargo.toml b/Cargo.toml index 03b187c60ea7a..5109b5206607a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -135,28 +135,25 @@ prost = { version = "0.12" } icelake = { git = "https://github.com/icelake-io/icelake", rev = "07d53893d7788b4e41fc11efad8a6be828405c31", features = [ "prometheus", ] } -arrow-array-iceberg = { package = "arrow-array", version = "52" } -arrow-schema-iceberg = { package = "arrow-schema", version = "52" } -arrow-buffer-iceberg = { package = "arrow-buffer", version = "52" } -arrow-cast-iceberg = { package = "arrow-cast", version = "52" } + # TODO # After apache/iceberg-rust#411 is merged, we move to the upstream version. iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "0c6e133e6f4655ff9ce4ad57b577dc7f692dd902" } iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "0c6e133e6f4655ff9ce4ad57b577dc7f692dd902" } -arrow-array = "50" -arrow-arith = "50" -arrow-cast = "50" -arrow-schema = "50" -arrow-buffer = "50" -arrow-flight = "50" -arrow-select = "50" -arrow-ord = "50" -arrow-row = "50" +arrow-array = "52" +arrow-arith = "52" +arrow-cast = "52" +arrow-schema = "52" +arrow-buffer = "52" +arrow-flight = "52" +arrow-select = "52" +arrow-ord = "52" +arrow-row = "52" arrow-udf-js = "0.3.1" arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "fa36365" } arrow-udf-wasm = { version = "0.2.2", features = ["build"] } arrow-udf-python = "0.2" -arrow-udf-flight = "0.1" +arrow-udf-flight = "0.2" arrow-array-deltalake = { package = "arrow-array", version = "48.0.1" } arrow-buffer-deltalake = { package = "arrow-buffer", version = "48.0.1" } arrow-cast-deltalake = { package = "arrow-cast", version = "48.0.1" } @@ -171,7 +168,7 @@ deltalake = { git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd itertools = "0.12.0" jsonbb = "0.1.4" lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "2682b85" } -parquet = "50" +parquet = "52" thiserror-ext = "0.1.2" tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" } tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [ @@ -346,7 +343,6 @@ deno_web = { git = "https://github.com/bakjos/deno", rev = "787a232" } deno_websocket = { git = "https://github.com/bakjos/deno", rev = "787a232" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" } -arrow-udf-flight = { git = "https://github.com/risingwavelabs/arrow-udf", rev = "54f6d69" } [workspace.metadata.dylint] libraries = [{ path = "./lints" }] diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml index ef4badfe07666..2ca8ed1be4e77 100644 --- a/src/batch/Cargo.toml +++ b/src/batch/Cargo.toml @@ -16,7 +16,6 @@ normal = ["workspace-hack"] [dependencies] anyhow = "1" arrow-array = { workspace = true } -arrow-array-iceberg = { workspace = true } arrow-schema = { workspace = true } assert_matches = "1" async-recursion = "1" diff --git a/src/batch/src/executor/iceberg_scan.rs b/src/batch/src/executor/iceberg_scan.rs index 2025c20752887..0c7503f61b293 100644 --- a/src/batch/src/executor/iceberg_scan.rs +++ b/src/batch/src/executor/iceberg_scan.rs @@ -15,7 +15,7 @@ use std::hash::{DefaultHasher, Hash, Hasher}; use anyhow::anyhow; -use arrow_array_iceberg::RecordBatch; +use arrow_array::RecordBatch; use futures_async_stream::try_stream; use futures_util::stream::StreamExt; use icelake::io::{FileScan, TableScan}; diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index ae6f67faf3aac..34507dd87cd75 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -19,16 +19,12 @@ anyhow = "1" arc-swap = "1" arrow-array = { workspace = true } arrow-array-deltalake = { workspace = true } -arrow-array-iceberg = { workspace = true } arrow-buffer = { workspace = true } arrow-buffer-deltalake = { workspace = true } -arrow-buffer-iceberg = { workspace = true } arrow-cast = { workspace = true } arrow-cast-deltalake = { workspace = true } -arrow-cast-iceberg = { workspace = true } arrow-schema = { workspace = true } arrow-schema-deltalake = { workspace = true } -arrow-schema-iceberg = { workspace = true } async-trait = "0.1" auto_enums = { workspace = true } auto_impl = "1" diff --git a/src/common/src/array/arrow/arrow_iceberg.rs b/src/common/src/array/arrow/arrow_iceberg.rs index ff23bc102ee6b..f6ac7dda50e00 100644 --- a/src/common/src/array/arrow/arrow_iceberg.rs +++ b/src/common/src/array/arrow/arrow_iceberg.rs @@ -15,13 +15,10 @@ use std::ops::{Div, Mul}; use std::sync::Arc; -use arrow_array_iceberg::{self as arrow_array, ArrayRef}; -use arrow_buffer_iceberg::IntervalMonthDayNano as ArrowIntervalType; +use arrow_array::{self, ArrayRef}; +use arrow_buffer::IntervalMonthDayNano as ArrowIntervalType; use num_traits::abs; -use { - arrow_buffer_iceberg as arrow_buffer, arrow_cast_iceberg as arrow_cast, - arrow_schema_iceberg as arrow_schema, -}; +use {arrow_buffer, arrow_cast, arrow_schema}; use crate::array::{Array, ArrayError, ArrayImpl, DataChunk, DataType, DecimalArray}; use crate::types::{Interval, StructType}; @@ -49,11 +46,7 @@ impl ArrowIntervalTypeTrait for ArrowIntervalType { } } -#[path = "./arrow_impl.rs"] -mod arrow_impl; - -use arrow_impl::{FromArrow, ToArrow}; - +use super::arrow_udf::arrow_impl::{FromArrow, ToArrow}; use crate::array::arrow::ArrowIntervalTypeTrait; pub struct IcebergArrowConvert; @@ -175,11 +168,11 @@ impl FromArrow for IcebergArrowConvert {} mod test { use std::sync::Arc; - use arrow_array_iceberg::{ArrayRef, Decimal128Array}; - use arrow_schema_iceberg::DataType; + use arrow_array::{ArrayRef, Decimal128Array}; + use arrow_schema::DataType; - use super::arrow_impl::ToArrow; use super::IcebergArrowConvert; + use crate::array::arrow::ToArrow; use crate::array::{Decimal, DecimalArray}; #[test] diff --git a/src/common/src/array/arrow/arrow_udf.rs b/src/common/src/array/arrow/arrow_udf.rs index e461f49e576a6..4c47eee231e79 100644 --- a/src/common/src/array/arrow/arrow_udf.rs +++ b/src/common/src/array/arrow/arrow_udf.rs @@ -28,7 +28,7 @@ use crate::array::{ArrayError, ArrayImpl, DataType, DecimalArray, JsonbArray}; #[expect(clippy::duplicate_mod)] #[path = "./arrow_impl.rs"] -mod arrow_impl; +pub mod arrow_impl; /// Arrow conversion for UDF. #[derive(Default, Debug)] diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index 3d8bf618eca58..df1813832f066 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -17,10 +17,8 @@ normal = ["workspace-hack"] anyhow = "1" apache-avro = { workspace = true } arrow-array = { workspace = true } -arrow-array-iceberg = { workspace = true } arrow-row = { workspace = true } arrow-schema = { workspace = true } -arrow-schema-iceberg = { workspace = true } arrow-select = { workspace = true } assert_matches = "1" async-nats = "0.35" diff --git a/src/connector/src/error.rs b/src/connector/src/error.rs index 3a86062d18a07..dda7235e4d955 100644 --- a/src/connector/src/error.rs +++ b/src/connector/src/error.rs @@ -60,7 +60,7 @@ def_anyhow_newtype! { iceberg::Error => "IcebergV2 error", redis::RedisError => "Redis error", arrow_schema::ArrowError => "Arrow error", - arrow_schema_iceberg::ArrowError => "Arrow error", + arrow_schema::ArrowError => "Arrow error", google_cloud_pubsub::client::google_cloud_auth::error::Error => "Google Cloud error", rumqttc::tokio_rustls::rustls::Error => "TLS error", rumqttc::v5::ClientError => "MQTT error", diff --git a/src/connector/src/sink/iceberg/mod.rs b/src/connector/src/sink/iceberg/mod.rs index a46597456678e..1bee9622e7f21 100644 --- a/src/connector/src/sink/iceberg/mod.rs +++ b/src/connector/src/sink/iceberg/mod.rs @@ -24,7 +24,7 @@ use std::ops::Deref; use std::sync::Arc; use anyhow::{anyhow, Context}; -use arrow_schema_iceberg::{ +use arrow_schema::{ DataType as ArrowDataType, Field as ArrowField, Fields, Schema as ArrowSchema, SchemaRef, }; use async_trait::async_trait; @@ -1162,7 +1162,7 @@ mod test { #[test] fn test_compatible_arrow_schema() { - use arrow_schema_iceberg::{DataType as ArrowDataType, Field as ArrowField}; + use arrow_schema::{DataType as ArrowDataType, Field as ArrowField}; use super::*; let risingwave_schema = Schema::new(vec![ diff --git a/src/connector/src/sink/iceberg/prometheus/monitored_base_file_writer.rs b/src/connector/src/sink/iceberg/prometheus/monitored_base_file_writer.rs index 3c205fd3b104e..b7c04289b7590 100644 --- a/src/connector/src/sink/iceberg/prometheus/monitored_base_file_writer.rs +++ b/src/connector/src/sink/iceberg/prometheus/monitored_base_file_writer.rs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use arrow_array_iceberg::RecordBatch; -use arrow_schema_iceberg::SchemaRef; +use arrow_array::RecordBatch; +use arrow_schema::SchemaRef; use icelake::io_v2::{ BaseFileWriter, BaseFileWriterBuilder, BaseFileWriterMetrics, CurrentFileStatus, FileWriter, FileWriterBuilder, diff --git a/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs b/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs index d85d712c41ac3..c2134d1974551 100644 --- a/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs +++ b/src/connector/src/sink/iceberg/prometheus/monitored_partition_writer.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use arrow_schema_iceberg::SchemaRef; +use arrow_schema::SchemaRef; use icelake::io_v2::{ FanoutPartitionedWriter, FanoutPartitionedWriterBuilder, FanoutPartitionedWriterMetrics, IcebergWriter, IcebergWriterBuilder, @@ -75,7 +75,7 @@ impl MonitoredFanoutPartitionedWriter { impl IcebergWriter for MonitoredFanoutPartitionedWriter { type R = as IcebergWriter>::R; - async fn write(&mut self, batch: arrow_array_iceberg::RecordBatch) -> Result<()> { + async fn write(&mut self, batch: arrow_array::RecordBatch) -> Result<()> { self.inner.write(batch).await?; self.update_metrics()?; Ok(()) diff --git a/src/connector/src/sink/iceberg/prometheus/monitored_position_delete_writer.rs b/src/connector/src/sink/iceberg/prometheus/monitored_position_delete_writer.rs index 43314c3fae384..e4fdc75f30e8b 100644 --- a/src/connector/src/sink/iceberg/prometheus/monitored_position_delete_writer.rs +++ b/src/connector/src/sink/iceberg/prometheus/monitored_position_delete_writer.rs @@ -43,7 +43,7 @@ impl IcebergWriterBuilder { type R = MonitoredPositionDeleteWriter; - async fn build(self, schema: &arrow_schema_iceberg::SchemaRef) -> Result { + async fn build(self, schema: &arrow_schema::SchemaRef) -> Result { let writer = self.inner.build(schema).await?; Ok(MonitoredPositionDeleteWriter { writer, diff --git a/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs b/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs index dc44434e5d9c2..be9f35aae2a51 100644 --- a/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs +++ b/src/connector/src/sink/iceberg/prometheus/monitored_write_writer.rs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use arrow_array_iceberg::RecordBatch; -use arrow_schema_iceberg::SchemaRef; +use arrow_array::RecordBatch; +use arrow_schema::SchemaRef; use async_trait::async_trait; use icelake::io_v2::{IcebergWriter, IcebergWriterBuilder}; use icelake::Result; diff --git a/src/connector/src/source/pulsar/source/reader.rs b/src/connector/src/source/pulsar/source/reader.rs index 212c459388b25..33a3930198e15 100644 --- a/src/connector/src/source/pulsar/source/reader.rs +++ b/src/connector/src/source/pulsar/source/reader.rs @@ -15,7 +15,7 @@ use std::collections::HashMap; use anyhow::Context; -use arrow_array_iceberg::{Int32Array, Int64Array, RecordBatch}; +use arrow_array::{Int32Array, Int64Array, RecordBatch}; use async_trait::async_trait; use futures::StreamExt; use futures_async_stream::try_stream; diff --git a/src/expr/impl/Cargo.toml b/src/expr/impl/Cargo.toml index 0f69c91e34162..6dfbcc5905750 100644 --- a/src/expr/impl/Cargo.toml +++ b/src/expr/impl/Cargo.toml @@ -28,7 +28,6 @@ anyhow = "1" arrow-array = { workspace = true } arrow-flight = { workspace = true, optional = true } arrow-schema = { workspace = true } -arrow-schema-iceberg = { workspace = true } arrow-udf-flight = { workspace = true, optional = true } arrow-udf-js = { workspace = true, optional = true } arrow-udf-js-deno = { workspace = true, optional = true } diff --git a/src/expr/impl/src/scalar/external/iceberg.rs b/src/expr/impl/src/scalar/external/iceberg.rs index 902545d01c25d..8d242d3cf3852 100644 --- a/src/expr/impl/src/scalar/external/iceberg.rs +++ b/src/expr/impl/src/scalar/external/iceberg.rs @@ -34,8 +34,8 @@ use thiserror_ext::AsReport; pub struct IcebergTransform { child: BoxedExpression, transform: BoxedTransformFunction, - input_arrow_type: arrow_schema_iceberg::DataType, - output_arrow_field: arrow_schema_iceberg::Field, + input_arrow_type: arrow_schema::DataType, + output_arrow_field: arrow_schema::Field, return_type: DataType, } diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml index a59ce2e55f678..feb4aa596c55f 100644 --- a/src/frontend/Cargo.toml +++ b/src/frontend/Cargo.toml @@ -18,7 +18,6 @@ normal = ["workspace-hack"] anyhow = "1" arc-swap = "1" arrow-schema = { workspace = true } -arrow-schema-iceberg = { workspace = true } async-recursion = "1.1.0" async-trait = "0.1" auto_enums = { workspace = true } diff --git a/src/frontend/src/handler/create_sink.rs b/src/frontend/src/handler/create_sink.rs index a9e8dde489b21..46d7a71a2b1c8 100644 --- a/src/frontend/src/handler/create_sink.rs +++ b/src/frontend/src/handler/create_sink.rs @@ -17,7 +17,7 @@ use std::rc::Rc; use std::sync::{Arc, LazyLock}; use anyhow::Context; -use arrow_schema_iceberg::DataType as ArrowDataType; +use arrow_schema::DataType as ArrowDataType; use either::Either; use itertools::Itertools; use maplit::{convert_args, hashmap}; diff --git a/src/frontend/src/handler/create_source.rs b/src/frontend/src/handler/create_source.rs index 89c5afca08a4c..1f03338bb01b2 100644 --- a/src/frontend/src/handler/create_source.rs +++ b/src/frontend/src/handler/create_source.rs @@ -1222,7 +1222,7 @@ pub async fn extract_iceberg_columns( if let ConnectorProperties::Iceberg(properties) = props { let iceberg_config: IcebergConfig = properties.to_iceberg_config(); let table = iceberg_config.load_table().await?; - let iceberg_schema: arrow_schema_iceberg::Schema = table + let iceberg_schema: arrow_schema::Schema = table .current_table_metadata() .current_schema()? .clone() @@ -1278,7 +1278,7 @@ pub async fn check_iceberg_source( let table = iceberg_config.load_table().await?; - let iceberg_schema: arrow_schema_iceberg::Schema = table + let iceberg_schema: arrow_schema::Schema = table .current_table_metadata() .current_schema()? .clone() @@ -1299,7 +1299,7 @@ pub async fn check_iceberg_source( .filter(|f1| schema.fields.iter().any(|f2| f1.name() == &f2.name)) .cloned() .collect::>(); - let new_iceberg_schema = arrow_schema_iceberg::Schema::new(new_iceberg_field); + let new_iceberg_schema = arrow_schema::Schema::new(new_iceberg_field); risingwave_connector::sink::iceberg::try_matches_arrow_schema(&schema, &new_iceberg_schema)?; From 06628c4bf848ce73e55e7126b05678886e890f16 Mon Sep 17 00:00:00 2001 From: Runji Wang Date: Thu, 4 Jul 2024 14:52:38 +0800 Subject: [PATCH 3/8] fix Signed-off-by: Runji Wang --- src/common/src/array/arrow/arrow_iceberg.rs | 3 +-- src/common/src/array/arrow/arrow_udf.rs | 2 +- src/connector/src/error.rs | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/src/array/arrow/arrow_iceberg.rs b/src/common/src/array/arrow/arrow_iceberg.rs index f6ac7dda50e00..69e807f4dfda0 100644 --- a/src/common/src/array/arrow/arrow_iceberg.rs +++ b/src/common/src/array/arrow/arrow_iceberg.rs @@ -15,10 +15,9 @@ use std::ops::{Div, Mul}; use std::sync::Arc; -use arrow_array::{self, ArrayRef}; +use arrow_array::ArrayRef; use arrow_buffer::IntervalMonthDayNano as ArrowIntervalType; use num_traits::abs; -use {arrow_buffer, arrow_cast, arrow_schema}; use crate::array::{Array, ArrayError, ArrayImpl, DataChunk, DataType, DecimalArray}; use crate::types::{Interval, StructType}; diff --git a/src/common/src/array/arrow/arrow_udf.rs b/src/common/src/array/arrow/arrow_udf.rs index 4c47eee231e79..2c503e1d61f71 100644 --- a/src/common/src/array/arrow/arrow_udf.rs +++ b/src/common/src/array/arrow/arrow_udf.rs @@ -20,9 +20,9 @@ use std::sync::Arc; +use arrow_buffer::IntervalMonthDayNano as ArrowIntervalType; pub use arrow_impl::{FromArrow, ToArrow}; use {arrow_array, arrow_buffer, arrow_cast, arrow_schema}; -type ArrowIntervalType = i128; use crate::array::{ArrayError, ArrayImpl, DataType, DecimalArray, JsonbArray}; diff --git a/src/connector/src/error.rs b/src/connector/src/error.rs index dda7235e4d955..241db7eeb5ea9 100644 --- a/src/connector/src/error.rs +++ b/src/connector/src/error.rs @@ -60,7 +60,6 @@ def_anyhow_newtype! { iceberg::Error => "IcebergV2 error", redis::RedisError => "Redis error", arrow_schema::ArrowError => "Arrow error", - arrow_schema::ArrowError => "Arrow error", google_cloud_pubsub::client::google_cloud_auth::error::Error => "Google Cloud error", rumqttc::tokio_rustls::rustls::Error => "TLS error", rumqttc::v5::ClientError => "MQTT error", From 3657d44403bc241c46f3e3e21a6d1ff1153683fe Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Thu, 4 Jul 2024 15:40:20 +0800 Subject: [PATCH 4/8] chore: bump arrow udf js deno Signed-off-by: MrCroxx --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52f51c10b0c12..77ff54c463263 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -937,13 +937,13 @@ dependencies = [ [[package]] name = "arrow-udf-js-deno" version = "0.0.1" -source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=fa36365#fa3636559de986aa592da6e8b3fbfac7bdd4bb78" +source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=d248f21#d248f2100e4911127d917df463a168a776c1d0e0" dependencies = [ "anyhow", - "arrow-array 52.0.0", + "arrow-array 50.0.0", "arrow-buffer 52.0.0", "arrow-data 52.0.0", - "arrow-schema 52.0.0", + "arrow-schema 50.0.0", "arrow-udf-js-deno-runtime", "async-trait", "deno_core", @@ -959,7 +959,7 @@ dependencies = [ [[package]] name = "arrow-udf-js-deno-runtime" version = "0.0.1" -source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=fa36365#fa3636559de986aa592da6e8b3fbfac7bdd4bb78" +source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=d248f21#d248f2100e4911127d917df463a168a776c1d0e0" dependencies = [ "anyhow", "deno_ast", diff --git a/Cargo.toml b/Cargo.toml index 5109b5206607a..4b5cb296e3ff6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -150,7 +150,7 @@ arrow-select = "52" arrow-ord = "52" arrow-row = "52" arrow-udf-js = "0.3.1" -arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "fa36365" } +arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "d248f21" } arrow-udf-wasm = { version = "0.2.2", features = ["build"] } arrow-udf-python = "0.2" arrow-udf-flight = "0.2" From 865343d988ab8eef185e98d1e9cc54ad40c67a59 Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Thu, 4 Jul 2024 15:50:34 +0800 Subject: [PATCH 5/8] chore: upgrade deps Signed-off-by: MrCroxx --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77ff54c463263..4f5189c2a5a7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -940,10 +940,10 @@ version = "0.0.1" source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=d248f21#d248f2100e4911127d917df463a168a776c1d0e0" dependencies = [ "anyhow", - "arrow-array 50.0.0", + "arrow-array 52.0.0", "arrow-buffer 52.0.0", "arrow-data 52.0.0", - "arrow-schema 50.0.0", + "arrow-schema 52.0.0", "arrow-udf-js-deno-runtime", "async-trait", "deno_core", From ebdb0f50850b1ad368f869088b2bd1a7eb6a84a8 Mon Sep 17 00:00:00 2001 From: Runji Wang Date: Thu, 4 Jul 2024 16:34:31 +0800 Subject: [PATCH 6/8] disable deno Signed-off-by: Runji Wang --- Cargo.lock | 1853 ++++++-------------------------------- Cargo.toml | 24 +- src/cmd_all/Cargo.toml | 4 +- src/connector/Cargo.toml | 31 +- src/expr/impl/Cargo.toml | 4 +- 5 files changed, 308 insertions(+), 1608 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f5189c2a5a7b..703ca7a7cba07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "addr2line" version = "0.21.0" @@ -54,29 +44,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes-kw" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" -dependencies = [ - "aes", -] - [[package]] name = "aes-siv" version = "0.7.0" @@ -934,56 +901,6 @@ dependencies = [ "rquickjs", ] -[[package]] -name = "arrow-udf-js-deno" -version = "0.0.1" -source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=d248f21#d248f2100e4911127d917df463a168a776c1d0e0" -dependencies = [ - "anyhow", - "arrow-array 52.0.0", - "arrow-buffer 52.0.0", - "arrow-data 52.0.0", - "arrow-schema 52.0.0", - "arrow-udf-js-deno-runtime", - "async-trait", - "deno_core", - "futures", - "futures-util", - "libc", - "serde", - "serde_json", - "tokio", - "v8", -] - -[[package]] -name = "arrow-udf-js-deno-runtime" -version = "0.0.1" -source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=d248f21#d248f2100e4911127d917df463a168a776c1d0e0" -dependencies = [ - "anyhow", - "deno_ast", - "deno_console", - "deno_core", - "deno_crypto", - "deno_fetch", - "deno_http", - "deno_io", - "deno_net", - "deno_tls", - "deno_url", - "deno_web", - "deno_webidl", - "deno_websocket", - "hyper 0.14.27", - "libc", - "serde", - "serde_json", - "signal-hook-registry", - "tokio", - "v8", -] - [[package]] name = "arrow-udf-python" version = "0.2.0" @@ -1025,18 +942,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "ast_node" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.66", -] - [[package]] name = "async-attributes" version = "1.1.2" @@ -1077,7 +982,6 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ - "brotli 3.5.0", "bzip2", "flate2", "futures-core", @@ -1250,9 +1154,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -1735,7 +1639,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" dependencies = [ - "base64-simd 0.8.0", + "base64-simd", "bytes", "bytes-utils", "futures-core", @@ -1828,7 +1732,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.1.0", + "hyper 1.4.0", "hyper-util", "itoa", "matchit", @@ -1971,22 +1875,13 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" -[[package]] -name = "base64-simd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" -dependencies = [ - "simd-abstraction", -] - [[package]] name = "base64-simd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "outref 0.5.1", + "outref", "vsimd", ] @@ -2025,15 +1920,6 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f40afb3abbf90895dda3ddbc6d8734d24215130a22d646067690f5e318f81bc" -[[package]] -name = "better_scoped_tls" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" -dependencies = [ - "scoped-tls", -] - [[package]] name = "bigdecimal" version = "0.3.1" @@ -2113,7 +1999,7 @@ dependencies = [ "rustc-hash", "shlex", "syn 2.0.66", - "which 4.4.2", + "which", ] [[package]] @@ -2428,12 +2314,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" -[[package]] -name = "cache_control" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" - [[package]] name = "camino" version = "1.1.6" @@ -3006,12 +2886,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "cooked-waker" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" - [[package]] name = "core-foundation" version = "0.9.3" @@ -3911,7 +3785,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde", "uuid", ] @@ -3985,471 +3858,127 @@ dependencies = [ ] [[package]] -name = "deno_ast" -version = "0.34.2" +name = "der" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d986a1df3f1538ffa04162b5c5f00b856121391b860dc003bde2a6a741e878" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ - "anyhow", - "base64 0.21.7", - "deno_media_type", - "deno_terminal", - "dprint-swc-ext", - "once_cell", - "percent-encoding", - "serde", - "swc_atoms", - "swc_common", - "swc_config", - "swc_config_macro", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_codegen_macros", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_transforms_proposal", - "swc_ecma_transforms_react", - "swc_ecma_transforms_typescript", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_eq_ignore_macros", - "swc_macros_common", - "swc_visit", - "swc_visit_macros", - "text_lines", - "unicode-width", - "url", + "const-oid", + "zeroize", ] [[package]] -name = "deno_console" -version = "0.144.0" +name = "der" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372a00d0d0c42c3f5a451037e0ce327fa284144112c3109d32b50b40a2ef9532" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ - "deno_core", + "const-oid", + "pem-rfc7468", + "zeroize", ] [[package]] -name = "deno_core" -version = "0.272.0" -source = "git+https://github.com/bakjos/deno_core?rev=9b241c6#9b241c6aa536fd64add55b34b9532efc2ced9b7c" +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ - "anyhow", - "bincode 1.3.3", - "bit-set", - "bit-vec", - "bytes", - "cooked-waker", - "deno_core_icudata", - "deno_ops", - "deno_unsync", - "futures", - "libc", - "log", - "memoffset", - "parking_lot 0.12.1", - "pin-project", + "powerfmt", "serde", - "serde_json", - "serde_v8", - "smallvec", - "sourcemap 7.1.1", - "static_assertions", - "tokio", - "url", - "v8", ] [[package]] -name = "deno_core_icudata" -version = "0.0.73" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] -name = "deno_crypto" -version = "0.158.0" +name = "derive_builder" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26b7ac283934ee9c1ebb0b2328e4edda1487dd147d444c886993a96edf74b79" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "aes", - "aes-gcm", - "aes-kw", - "base64 0.21.7", - "cbc", - "const-oid", - "ctr", - "curve25519-dalek", - "deno_core", - "deno_web", - "elliptic-curve 0.13.8", - "num-traits", - "once_cell", - "p256 0.13.2", - "p384", - "p521", - "rand", - "ring 0.17.5", - "rsa", - "serde", - "serde_bytes", - "sha1", - "sha2", - "signature 2.2.0", - "spki 0.7.2", - "tokio", - "uuid", - "x25519-dalek", + "derive_builder_macro 0.12.0", ] [[package]] -name = "deno_fetch" -version = "0.168.0" -source = "git+https://github.com/bakjos/deno?rev=787a232#787a232c51f1ea390a2aff2b622016217d854328" +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "bytes", - "data-url", - "deno_core", - "deno_tls", - "dyn-clone", - "http 1.1.0", - "pin-project", - "reqwest 0.12.4", - "serde", - "serde_json", - "tokio", - "tokio-util", + "derive_builder_macro 0.20.0", ] [[package]] -name = "deno_http" -version = "0.141.0" -source = "git+https://github.com/bakjos/deno?rev=787a232#787a232c51f1ea390a2aff2b622016217d854328" +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "async-compression", - "async-trait", - "base64 0.21.7", - "brotli 3.5.0", - "bytes", - "cache_control", - "deno_core", - "deno_net", - "deno_websocket", - "flate2", - "http 1.1.0", - "httparse", - "hyper 0.14.27", - "hyper 1.1.0", - "hyper-util", - "itertools 0.10.5", - "memmem", - "mime", - "once_cell", - "percent-encoding", - "phf", - "pin-project", - "ring 0.17.5", - "scopeguard", - "serde", - "smallvec", - "thiserror", - "tokio", - "tokio-util", + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "deno_io" -version = "0.54.0" +name = "derive_builder_core" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3200f90cc9d232fd864cfcf25c535ab114fe824d9a38161e89418676360915e4" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "async-trait", - "deno_core", - "filetime", - "fs3", - "once_cell", - "os_pipe", - "rand", - "tokio", - "winapi", + "darling 0.20.9", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] -name = "deno_media_type" -version = "0.1.3" +name = "derive_builder_macro" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf9879493856d1622be70f396b0b0d3e519538dd6501b7c609ecbaa7e2194d2" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "data-url", - "serde", - "url", + "derive_builder_core 0.12.0", + "syn 1.0.109", ] [[package]] -name = "deno_native_certs" -version = "0.2.0" +name = "derive_builder_macro" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4785d0bdc13819b665b71e4fb7e119d859568471e4c245ec5610857e70c9345" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ - "dlopen2", - "dlopen2_derive", - "once_cell", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", + "derive_builder_core 0.20.0", + "syn 2.0.66", ] [[package]] -name = "deno_net" -version = "0.136.0" -source = "git+https://github.com/bakjos/deno?rev=787a232#787a232c51f1ea390a2aff2b622016217d854328" +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "deno_core", - "deno_tls", - "enum-as-inner 0.5.1", - "log", - "pin-project", - "rustls-tokio-stream", - "serde", - "socket2 0.5.6", - "tokio", - "trust-dns-proto 0.22.0", - "trust-dns-resolver 0.22.0", + "convert_case 0.4.0", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn 1.0.109", ] [[package]] -name = "deno_ops" -version = "0.148.0" -source = "git+https://github.com/bakjos/deno_core?rev=9b241c6#9b241c6aa536fd64add55b34b9532efc2ced9b7c" -dependencies = [ - "proc-macro-rules", - "proc-macro2", - "quote", - "strum 0.25.0", - "strum_macros 0.25.3", - "syn 2.0.66", - "thiserror", -] - -[[package]] -name = "deno_terminal" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e6337d4e7f375f8b986409a76fbeecfa4bd8a1343e63355729ae4befa058eaf" -dependencies = [ - "once_cell", - "termcolor", -] - -[[package]] -name = "deno_tls" -version = "0.131.0" -source = "git+https://github.com/bakjos/deno?rev=787a232#787a232c51f1ea390a2aff2b622016217d854328" -dependencies = [ - "deno_core", - "deno_native_certs", - "once_cell", - "rustls 0.22.4", - "rustls-pemfile 1.0.4", - "rustls-tokio-stream", - "rustls-webpki 0.101.7", - "serde", - "webpki-roots 0.25.2", -] - -[[package]] -name = "deno_unsync" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30dff7e03584dbae188dae96a0f1876740054809b2ad0cf7c9fc5d361f20e739" -dependencies = [ - "tokio", -] - -[[package]] -name = "deno_url" -version = "0.144.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e172f44cffc771f0050d1befb12523d0420b6a44983d0c74d572609f4d3e02e3" -dependencies = [ - "deno_core", - "serde", - "urlpattern", -] - -[[package]] -name = "deno_web" -version = "0.175.0" -source = "git+https://github.com/bakjos/deno?rev=787a232#787a232c51f1ea390a2aff2b622016217d854328" -dependencies = [ - "async-trait", - "base64-simd 0.8.0", - "bytes", - "deno_core", - "encoding_rs", - "flate2", - "futures", - "serde", - "tokio", - "uuid", - "windows-sys 0.48.0", -] - -[[package]] -name = "deno_webidl" -version = "0.144.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0484ffd8b436e926538fc0db4bc588832800b6681e554cebb3ae21f346c84e" -dependencies = [ - "deno_core", -] - -[[package]] -name = "deno_websocket" -version = "0.149.0" -source = "git+https://github.com/bakjos/deno?rev=787a232#787a232c51f1ea390a2aff2b622016217d854328" -dependencies = [ - "bytes", - "deno_core", - "deno_net", - "deno_tls", - "fastwebsockets", - "h2 0.4.4", - "http 1.1.0", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "once_cell", - "rustls-tokio-stream", - "serde", - "tokio", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "zeroize", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro 0.12.0", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro 0.20.0", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core 0.12.0", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core 0.20.0", - "syn 2.0.66", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "derive_utils" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" +name = "derive_utils" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", @@ -4551,29 +4080,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" -[[package]] -name = "dlopen2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "dlv-list" version = "0.5.2" @@ -4607,21 +4113,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dprint-swc-ext" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bad772f9e49af3a613fcddf1671d1e2e877e0a6d94f2b7162bfea4ac8140bee" -dependencies = [ - "num-bigint", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "text_lines", -] - [[package]] name = "duct" version = "0.13.6" @@ -4656,9 +4147,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easy-ext" @@ -4870,18 +4361,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum-as-inner" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enum-as-inner" version = "0.6.0" @@ -5151,25 +4630,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" -[[package]] -name = "fastwebsockets" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" -dependencies = [ - "base64 0.21.7", - "http-body-util", - "hyper 1.1.0", - "hyper-util", - "pin-project", - "rand", - "sha1", - "simdutf8", - "thiserror", - "tokio", - "utf-8", -] - [[package]] name = "fd-lock" version = "4.0.1" @@ -5216,18 +4676,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - [[package]] name = "findshlibs" version = "0.10.2" @@ -5500,21 +4948,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] -name = "from_variant" -version = "0.1.7" +name = "frunk" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" -dependencies = [ - "proc-macro2", - "swc_macros_common", - "syn 2.0.66", -] - -[[package]] -name = "frunk" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" +checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" dependencies = [ "frunk_core", "frunk_derives", @@ -5592,33 +5029,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs3" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90" -dependencies = [ - "libc", - "rustc_version 0.2.3", - "winapi", -] - [[package]] name = "fs_extra" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "function_name" version = "0.3.0" @@ -5818,17 +5234,16 @@ dependencies = [ [[package]] name = "gcp-bigquery-client" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0ce6fcbdaca0a4521a734f2bc7f2f6bd872fe40576e24f8bd0b05732c19a74f" +checksum = "ebc3e5c4b8a072ca074ab0d4f53dc6b04f45eb9bc0cc046a4a1428c8498af71e" dependencies = [ "async-stream", "async-trait", "dyn-clone", - "hyper 0.14.27", - "hyper-rustls 0.24.2", + "hyper 1.4.0", "log", - "reqwest 0.11.20", + "reqwest 0.12.4", "serde", "serde_json", "thiserror", @@ -5892,16 +5307,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - [[package]] name = "gimli" version = "0.28.0" @@ -5970,11 +5375,33 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "google-cloud-auth" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1112c453c2e155b3e683204ffff52bcc6d6495d04b68d9e90cd24161270c5058" +dependencies = [ + "async-trait", + "base64 0.21.7", + "google-cloud-metadata", + "google-cloud-token", + "home", + "jsonwebtoken", + "reqwest 0.12.4", + "serde", + "serde_json", + "thiserror", + "time", + "tokio", + "tracing", + "urlencoding", +] + [[package]] name = "google-cloud-bigquery" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e321c127945bb44a5cf5129c37530e2494b97afefe7f334a983ac754e40914e" +checksum = "c667febc48fa96cec42f991adad60f0c0875f97594ba4745ab6fda053a4b01af" dependencies = [ "anyhow", "arrow 50.0.0", @@ -5982,9 +5409,9 @@ dependencies = [ "backon", "base64 0.21.7", "bigdecimal 0.4.5", - "google-cloud-auth", - "google-cloud-gax", - "google-cloud-googleapis", + "google-cloud-auth 0.16.0", + "google-cloud-gax 0.18.0", + "google-cloud-googleapis 0.14.0", "google-cloud-token", "num-bigint", "reqwest 0.12.4", @@ -6013,6 +5440,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "google-cloud-gax" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c2abd6bdcde7a6583e50b02c2c02e05d1337fa5d22e15997a44e116f9c4726" +dependencies = [ + "google-cloud-token", + "http 0.2.9", + "thiserror", + "tokio", + "tokio-retry", + "tonic 0.11.0", + "tower", + "tracing", +] + [[package]] name = "google-cloud-googleapis" version = "0.13.0" @@ -6024,6 +5467,17 @@ dependencies = [ "tonic 0.10.2", ] +[[package]] +name = "google-cloud-googleapis" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a213e794a47db2d924df10caf76a6ba6336d64a396110aa8c78b4d496b73c3" +dependencies = [ + "prost 0.12.6", + "prost-types 0.12.6", + "tonic 0.11.0", +] + [[package]] name = "google-cloud-metadata" version = "0.5.0" @@ -6043,9 +5497,28 @@ checksum = "0a35e4a008db5cf01a5c03d3c67bd90b3cad77427ca949f3c8eddd90c4a3c932" dependencies = [ "async-channel 1.9.0", "async-stream", - "google-cloud-auth", - "google-cloud-gax", - "google-cloud-googleapis", + "google-cloud-auth 0.15.0", + "google-cloud-gax 0.17.0", + "google-cloud-googleapis 0.13.0", + "google-cloud-token", + "prost-types 0.12.6", + "thiserror", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "google-cloud-pubsub" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aad1da3067d17c740491cef0028139353e5006f64eca20a2a74000455cb99050" +dependencies = [ + "async-channel 1.9.0", + "async-stream", + "google-cloud-auth 0.16.0", + "google-cloud-gax 0.18.0", + "google-cloud-googleapis 0.14.0", "google-cloud-token", "prost-types 0.12.6", "thiserror", @@ -6056,9 +5529,9 @@ dependencies = [ [[package]] name = "google-cloud-token" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcd62eb34e3de2f085bcc33a09c3e17c4f65650f36d53eb328b00d63bcb536a" +checksum = "8f49c12ba8b21d128a2ce8585955246977fbce4415f680ebf9199b6f9d6d725f" dependencies = [ "async-trait", ] @@ -6102,15 +5575,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "gzip-header" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" -dependencies = [ - "crc32fast", -] - [[package]] name = "h2" version = "0.3.26" @@ -6312,20 +5776,6 @@ dependencies = [ "windows 0.52.0", ] -[[package]] -name = "hstr" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f5356d62012374578cd3a5c013d6586de3efbca3b53379fc1edfbb95c9db14" -dependencies = [ - "hashbrown 0.14.3", - "new_debug_unreachable", - "once_cell", - "phf", - "rustc-hash", - "triomphe", -] - [[package]] name = "http" version = "0.2.9" @@ -6432,9 +5882,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" dependencies = [ "bytes", "futures-channel", @@ -6446,6 +5896,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", "want", ] @@ -6467,6 +5918,23 @@ dependencies = [ "webpki-roots 0.25.2", ] +[[package]] +name = "hyper-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" +dependencies = [ + "futures-util", + "http 0.2.9", + "hyper 0.14.27", + "log", + "rustls 0.22.4", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", +] + [[package]] name = "hyper-rustls" version = "0.26.0" @@ -6475,7 +5943,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.1.0", + "hyper 1.4.0", "hyper-util", "rustls 0.22.4", "rustls-pki-types", @@ -6517,7 +5985,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.1.0", + "hyper 1.4.0", "hyper-util", "native-tls", "tokio", @@ -6536,7 +6004,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.1.0", + "hyper 1.4.0", "pin-project-lite", "socket2 0.5.6", "tokio", @@ -6737,12 +6205,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "indexmap" version = "1.9.3" @@ -6906,18 +6368,6 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" -[[package]] -name = "is-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "is-terminal" version = "0.4.9" @@ -7571,16 +7021,16 @@ dependencies = [ [[package]] name = "madsim-tonic" -version = "0.4.1+0.10.0" +version = "0.4.2+0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "813977c7870103e113a0332d97731f961bc48aaa8860edd318ef7d7754214436" +checksum = "5e8efb0d3351b7d2cb9394a26d56b166e38909acab492821f6b3d0765bf4665d" dependencies = [ "async-stream", "chrono", "futures-util", "madsim", "tokio", - "tonic 0.10.2", + "tonic 0.11.0", "tower", "tracing", ] @@ -7689,12 +7139,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memmem" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" - [[package]] name = "memoffset" version = "0.9.0" @@ -8070,12 +7514,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "newline-converter" version = "0.3.0" @@ -8222,7 +7660,6 @@ checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ "num-integer", "num-traits", - "rand", "serde", ] @@ -8252,6 +7689,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-format" version = "0.4.4" @@ -8433,12 +7876,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - [[package]] name = "opendal" version = "0.47.2" @@ -8716,12 +8153,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "outref" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" - [[package]] name = "outref" version = "0.5.1" @@ -8775,20 +8206,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "p521" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" -dependencies = [ - "base16ct 0.2.0", - "ecdsa 0.16.9", - "elliptic-curve 0.13.8", - "primeorder", - "rand_core", - "sha2", -] - [[package]] name = "panic-message" version = "0.3.0" @@ -8979,12 +8396,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - [[package]] name = "pbjson" version = "0.6.0" @@ -9120,7 +8531,6 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros", "phf_shared", ] @@ -9144,19 +8554,6 @@ dependencies = [ "rand", ] -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "phf_shared" version = "0.11.2" @@ -9287,17 +8684,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "polling" version = "2.8.0" @@ -9314,18 +8700,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "portable-atomic" version = "1.6.0" @@ -9586,29 +8960,6 @@ version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" -[[package]] -name = "proc-macro-rules" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" -dependencies = [ - "proc-macro-rules-macros", - "proc-macro2", - "syn 2.0.66", -] - -[[package]] -name = "proc-macro-rules-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "proc-macro2" version = "1.0.85" @@ -9724,7 +9075,7 @@ dependencies = [ "regex", "syn 1.0.109", "tempfile", - "which 4.4.2", + "which", ] [[package]] @@ -9746,7 +9097,7 @@ dependencies = [ "regex", "syn 2.0.66", "tempfile", - "which 4.4.2", + "which", ] [[package]] @@ -10383,7 +9734,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "async-compression", "base64 0.22.0", "bytes", "encoding_rs", @@ -10394,7 +9744,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.1.0", + "hyper 1.4.0", "hyper-rustls 0.26.0", "hyper-tls 0.6.0", "hyper-util", @@ -10418,7 +9768,6 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.25.0", - "tokio-socks", "tokio-util", "tower-service", "url", @@ -10530,7 +9879,7 @@ dependencies = [ "console", "fs-err", "glob", - "google-cloud-pubsub", + "google-cloud-pubsub 0.25.0", "indicatif", "itertools 0.12.1", "madsim-rdkafka", @@ -11098,9 +10447,9 @@ dependencies = [ "gcp-bigquery-client", "glob", "google-cloud-bigquery", - "google-cloud-gax", - "google-cloud-googleapis", - "google-cloud-pubsub", + "google-cloud-gax 0.18.0", + "google-cloud-googleapis 0.14.0", + "google-cloud-pubsub 0.27.0", "http 0.2.9", "iceberg", "iceberg-catalog-rest", @@ -11359,7 +10708,6 @@ dependencies = [ "arrow-schema 52.0.0", "arrow-udf-flight", "arrow-udf-js", - "arrow-udf-js-deno", "arrow-udf-python", "arrow-udf-wasm", "async-trait", @@ -12659,18 +12007,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" -[[package]] -name = "rustls-tokio-stream" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696a389edb0b54b9bb888c8318404d9a0c0b9091fb03ca3d9c64731511db03f6" -dependencies = [ - "futures", - "rustls 0.22.4", - "socket2 0.5.6", - "tokio", -] - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -12768,12 +12104,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "ryu-js" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" - [[package]] name = "salsa20" version = "0.10.2" @@ -12840,12 +12170,6 @@ dependencies = [ "hashbrown 0.13.2", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -13305,19 +12629,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_v8" -version = "0.181.0" -source = "git+https://github.com/bakjos/deno_core?rev=9b241c6#9b241c6aa536fd64add55b34b9532efc2ced9b7c" -dependencies = [ - "bytes", - "num-bigint", - "serde", - "smallvec", - "thiserror", - "v8", -] - [[package]] name = "serde_with" version = "1.14.0" @@ -13558,15 +12869,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "simd-abstraction" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" -dependencies = [ - "outref 0.1.0", -] - [[package]] name = "simd-json" version = "0.13.3" @@ -13683,17 +12985,6 @@ dependencies = [ "serde", ] -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - [[package]] name = "snafu" version = "0.7.5" @@ -13742,39 +13033,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "sourcemap" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[package]] -name = "sourcemap" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7768edd06c02535e0d50653968f46e1e0d3aa54742190d35dd9466f59de9c71" -dependencies = [ - "base64-simd 0.7.0", - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id-start", - "url", -] - [[package]] name = "speedate" version = "0.14.0" @@ -14141,18 +13399,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" -[[package]] -name = "string_enum" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.66", -] - [[package]] name = "stringprep" version = "0.1.4" @@ -14171,455 +13417,104 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "structmeta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.66", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", -] - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros 0.26.4", -] - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.66", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.66", -] - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subst" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca1318e5d6716d6541696727c88d9b8dfc8cfe6afd6908e186546fd4af7f5b98" -dependencies = [ - "memchr", - "unicode-width", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "swc_atoms" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" -dependencies = [ - "hstr", - "once_cell", - "rustc-hash", - "serde", -] - -[[package]] -name = "swc_cached" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630c761c74ac8021490b78578cc2223aa4a568241e26505c27bf0e4fd4ad8ec2" -dependencies = [ - "ahash 0.8.11", - "anyhow", - "dashmap", - "once_cell", - "regex", - "serde", -] - -[[package]] -name = "swc_common" -version = "0.33.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e8b15d0fb87691e27c8f3cf953748db3ccd2a39e165d6d5275a48fb0d29e3" -dependencies = [ - "ast_node", - "better_scoped_tls", - "cfg-if", - "either", - "from_variant", - "new_debug_unreachable", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "siphasher", - "sourcemap 6.4.1", - "swc_atoms", - "swc_eq_ignore_macros", - "swc_visit", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "swc_config" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" -dependencies = [ - "anyhow", - "indexmap 2.2.6", - "serde", - "serde_json", - "swc_cached", - "swc_config_macro", -] - -[[package]] -name = "swc_config_macro" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.66", -] - -[[package]] -name = "swc_ecma_ast" -version = "0.112.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36226eb87bfd2f5620bde04f149a4b869ab34e78496d60cb0d8eb9da765d0732" -dependencies = [ - "bitflags 2.5.0", - "is-macro", - "num-bigint", - "phf", - "scoped-tls", - "serde", - "string_enum", - "swc_atoms", - "swc_common", - "unicode-id", -] - -[[package]] -name = "swc_ecma_codegen" -version = "0.148.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba8669ab28bb5d1e65c1e8690257c026745ac368e0101c2c6544d4a03afc95e" -dependencies = [ - "memchr", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "sourcemap 6.4.1", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen_macros", - "tracing", -] - -[[package]] -name = "swc_ecma_codegen_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.66", -] - -[[package]] -name = "swc_ecma_loader" -version = "0.45.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0058cf970880f5382effe43eb2b727a73ba09ae41922fa140c2c3fa6ca9b2d1" -dependencies = [ - "anyhow", - "pathdiff", - "serde", - "swc_atoms", - "swc_common", - "tracing", -] - -[[package]] -name = "swc_ecma_parser" -version = "0.143.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20823cac99a9adbd4c03fb5e126aaccbf92446afedad99252a0e1fc76e2ffc43" -dependencies = [ - "either", - "new_debug_unreachable", - "num-bigint", - "num-traits", - "phf", - "serde", - "smallvec", - "smartstring", - "stacker", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "tracing", - "typed-arena", -] - -[[package]] -name = "swc_ecma_transforms_base" -version = "0.137.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66539401f619730b26d380a120b91b499f80cbdd9bb15d00aa73bc3a4d4cc394" -dependencies = [ - "better_scoped_tls", - "bitflags 2.5.0", - "indexmap 2.2.6", - "once_cell", - "phf", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_utils", - "swc_ecma_visit", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_classes" -version = "0.126.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf9048e687b746d2bbe6149601c3eedd819fef08d7657e5fddcef99b22febba" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_utils", - "swc_ecma_visit", -] - -[[package]] -name = "swc_ecma_transforms_macros" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.66", -] - -[[package]] -name = "swc_ecma_transforms_proposal" -version = "0.171.10" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35f0a72ee781aa9208836046fd2c12e483f5515898858511b68863290cb97b45" -dependencies = [ - "either", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "swc_ecma_transforms_react" -version = "0.183.10" +name = "structmeta" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ec75c1194365abe4d44d94e58f918ec853469ecd39733b381a089cfdcdee1a" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" dependencies = [ - "base64 0.21.7", - "dashmap", - "indexmap 2.2.6", - "once_cell", - "serde", - "sha-1", - "string_enum", - "swc_atoms", - "swc_common", - "swc_config", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.66", ] [[package]] -name = "swc_ecma_transforms_typescript" -version = "0.188.10" +name = "structmeta-derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec5e95a9c840eb13562884123eaa627cb6e05e0461c94a2ce69ae7e70313010" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ - "ryu-js", - "serde", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_react", - "swc_ecma_utils", - "swc_ecma_visit", + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] -name = "swc_ecma_utils" -version = "0.127.7" +name = "strum" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14482e455df85486d68a51533a31645d511e56df93a35cadf0eabbe7abe96b98" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "indexmap 2.2.6", - "num_cpus", - "once_cell", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_visit", - "tracing", - "unicode-id", + "strum_macros 0.25.3", ] [[package]] -name = "swc_ecma_visit" -version = "0.98.4" +name = "strum" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0127694c36d656ea9eab5c170cdd8ab398246ae2a335de26961c913a4aca47" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "num-bigint", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_visit", - "tracing", + "strum_macros 0.26.4", ] [[package]] -name = "swc_eq_ignore_macros" -version = "0.1.3" +name = "strum_macros" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ + "heck 0.4.1", "proc-macro2", "quote", + "rustversion", "syn 2.0.66", ] [[package]] -name = "swc_macros_common" -version = "0.3.9" +name = "strum_macros" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ + "heck 0.5.0", "proc-macro2", "quote", + "rustversion", "syn 2.0.66", ] [[package]] -name = "swc_visit" -version = "0.5.9" +name = "subprocess" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358e246dedeb4ae8efacebcce1360dc2f9b6c0b4c1ad8b737cc60f5b6633691a" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" dependencies = [ - "either", - "swc_visit_macros", + "libc", + "winapi", ] [[package]] -name = "swc_visit_macros" -version = "0.5.10" +name = "subst" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbbb9d77d5112f90ed7ea00477135b16c4370c872b93a0b63b766e8710650ad" +checksum = "ca1318e5d6716d6541696727c88d9b8dfc8cfe6afd6908e186546fd4af7f5b98" dependencies = [ - "Inflector", - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.66", + "memchr", + "unicode-width", ] +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "symbolic-common" version = "12.4.0" @@ -14806,15 +13701,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "text_lines" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" -dependencies = [ - "serde", -] - [[package]] name = "thiserror" version = "1.0.61" @@ -14959,13 +13845,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -14981,10 +13868,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -15175,22 +14063,10 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - [[package]] name = "tokio-stream" -version = "0.1.14" -source = "git+https://github.com/madsim-rs/tokio.git?rev=fe39bb8e#fe39bb8e8ab0ed96ee1b4477ab5508c20ce017fb" +version = "0.1.15" +source = "git+https://github.com/madsim-rs/tokio.git?rev=0dd10556#0dd105567b323c863c29f794d2221ed588956d8d" dependencies = [ "futures-core", "madsim-tokio", @@ -15353,6 +14229,7 @@ dependencies = [ "axum 0.6.20", "base64 0.21.7", "bytes", + "flate2", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", @@ -15370,6 +14247,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", + "webpki-roots 0.26.1", ] [[package]] @@ -15596,10 +14474,6 @@ name = "triomphe" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" -dependencies = [ - "serde", - "stable_deref_trait", -] [[package]] name = "triple_accel" @@ -15632,32 +14506,6 @@ dependencies = [ "url", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner 0.5.1", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand", - "serde", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - [[package]] name = "trust-dns-proto" version = "0.23.2" @@ -15703,27 +14551,6 @@ dependencies = [ "trust-dns-proto 0.21.2", ] -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot 0.12.1", - "resolv-conf", - "serde", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto 0.22.0", -] - [[package]] name = "trust-dns-resolver" version = "0.23.2" @@ -15773,12 +14600,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - [[package]] name = "typed-builder" version = "0.10.0" @@ -15845,47 +14666,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - [[package]] name = "unicase" version = "2.7.0" @@ -15901,18 +14681,6 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -[[package]] -name = "unicode-id" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" - -[[package]] -name = "unicode-id-start" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f73150333cb58412db36f2aca8f2875b013049705cc77b94ded70a1ab1f5da" - [[package]] name = "unicode-ident" version = "1.0.11" @@ -15958,16 +14726,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "unsafe-libyaml" version = "0.2.10" @@ -16004,25 +14762,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "urlpattern" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" -dependencies = [ - "derive_more", - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf8parse" version = "0.2.1" @@ -16040,21 +14779,6 @@ dependencies = [ "serde", ] -[[package]] -name = "v8" -version = "0.89.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2197fbef82c98f7953d13568a961d4e1c663793b5caf3c74455a13918cdf33" -dependencies = [ - "bitflags 2.5.0", - "fslock", - "gzip-header", - "home", - "miniz_oxide", - "once_cell", - "which 5.0.0", -] - [[package]] name = "valuable" version = "0.1.0" @@ -16695,19 +15419,6 @@ dependencies = [ "rustix 0.38.31", ] -[[package]] -name = "which" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.31", - "windows-sys 0.48.0", -] - [[package]] name = "whoami" version = "1.5.0" @@ -17172,18 +15883,6 @@ dependencies = [ "tap", ] -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - [[package]] name = "xmlparser" version = "0.13.5" @@ -17232,21 +15931,21 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yup-oauth2" -version = "8.3.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364ca376b5c04d9b2be9693054e3e0d2d146b363819d0f9a10c6ee66e4c8406b" +checksum = "f75463c432f5d4ca9c75047514df3d768f8ac3276ac22c9a6531af6d0a3da7ee" dependencies = [ "anyhow", "async-trait", - "base64 0.13.1", + "base64 0.21.7", "futures", "http 0.2.9", "hyper 0.14.27", - "hyper-rustls 0.24.2", - "itertools 0.10.5", + "hyper-rustls 0.25.0", + "itertools 0.12.1", "log", "percent-encoding", - "rustls 0.21.11", + "rustls 0.22.4", "rustls-pemfile 1.0.4", "seahash", "serde", @@ -17288,20 +15987,6 @@ name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] [[package]] name = "zstd" diff --git a/Cargo.toml b/Cargo.toml index 4b5cb296e3ff6..61953204c65f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,7 +128,7 @@ rdkafka = { package = "madsim-rdkafka", version = "0.4.1", features = [ ] } hashbrown = { version = "0.14", features = ["ahash", "inline-more", "nightly"] } criterion = { version = "0.5", features = ["async_futures"] } -tonic = { package = "madsim-tonic", version = "0.4.1" } +tonic = { package = "madsim-tonic", version = "0.4.2" } tonic-build = { package = "madsim-tonic-build", version = "0.4.2" } otlp-embedded = { git = "https://github.com/risingwavelabs/otlp-embedded", rev = "492c244e0be91feb659c0cd48a624bbd96045a33" } prost = { version = "0.12" } @@ -150,7 +150,7 @@ arrow-select = "52" arrow-ord = "52" arrow-row = "52" arrow-udf-js = "0.3.1" -arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "d248f21" } +# arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "d248f21" } arrow-udf-wasm = { version = "0.2.2", features = ["build"] } arrow-udf-python = "0.2" arrow-udf-flight = "0.2" @@ -326,21 +326,21 @@ debug = 1 # Patch third-party crates for deterministic simulation. quanta = { git = "https://github.com/madsim-rs/quanta.git", rev = "948bdc3" } getrandom = { git = "https://github.com/madsim-rs/getrandom.git", rev = "e79a7ae" } -tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e" } +tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0dd10556" } tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev = "95e2fd3" } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88" } futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" } # patch: unlimit 4MB message size for grpc client etcd-client = { git = "https://github.com/risingwavelabs/etcd-client.git", rev = "4e84d40" } -# patch to remove preserve_order from serde_json -deno_core = { git = "https://github.com/bakjos/deno_core", rev = "9b241c6" } -# patch to user reqwest 0.12.2 -deno_fetch = { git = "https://github.com/bakjos/deno", rev = "787a232" } -deno_http = { git = "https://github.com/bakjos/deno", rev = "787a232" } -deno_net = { git = "https://github.com/bakjos/deno", rev = "787a232" } -deno_tls = { git = "https://github.com/bakjos/deno", rev = "787a232" } -deno_web = { git = "https://github.com/bakjos/deno", rev = "787a232" } -deno_websocket = { git = "https://github.com/bakjos/deno", rev = "787a232" } +# # patch to remove preserve_order from serde_json +# deno_core = { git = "https://github.com/bakjos/deno_core", rev = "9b241c6" } +# # patch to user reqwest 0.12.2 +# deno_fetch = { git = "https://github.com/bakjos/deno", rev = "787a232" } +# deno_http = { git = "https://github.com/bakjos/deno", rev = "787a232" } +# deno_net = { git = "https://github.com/bakjos/deno", rev = "787a232" } +# deno_tls = { git = "https://github.com/bakjos/deno", rev = "787a232" } +# deno_web = { git = "https://github.com/bakjos/deno", rev = "787a232" } +# deno_websocket = { git = "https://github.com/bakjos/deno", rev = "787a232" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" } diff --git a/src/cmd_all/Cargo.toml b/src/cmd_all/Cargo.toml index d3341b3137d43..4a685c75d3ab8 100644 --- a/src/cmd_all/Cargo.toml +++ b/src/cmd_all/Cargo.toml @@ -11,11 +11,11 @@ repository = { workspace = true } default = ["rw-static-link"] rw-static-link = ["workspace-config/rw-static-link"] rw-dynamic-link = ["workspace-config/rw-dynamic-link"] -all-udf = ["external-udf", "wasm-udf", "js-udf", "deno-udf", "python-udf"] +all-udf = ["external-udf", "wasm-udf", "js-udf", "python-udf"] external-udf = ["risingwave_expr_impl/external-udf"] wasm-udf = ["risingwave_expr_impl/wasm-udf"] js-udf = ["risingwave_expr_impl/js-udf"] -deno-udf = ["risingwave_expr_impl/deno-udf"] +# deno-udf = ["risingwave_expr_impl/deno-udf"] python-udf = ["risingwave_expr_impl/python-udf"] [package.metadata.cargo-machete] diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index df1813832f066..a5a2e38a55cc7 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -55,12 +55,15 @@ easy-ext = "1" enum-as-inner = "0.6" futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } -gcp-bigquery-client = "0.18.0" +gcp-bigquery-client = "0.20.0" glob = "0.3" -google-cloud-bigquery = { version = "0.9.0", features = ["auth"] } -google-cloud-gax = "0.17.0" -google-cloud-googleapis = { version = "0.13", features = ["pubsub", "bigquery"] } -google-cloud-pubsub = "0.25" +google-cloud-bigquery = { version = "0.10.0", features = ["auth"] } +google-cloud-gax = "0.18.0" +google-cloud-googleapis = { version = "0.14", features = [ + "pubsub", + "bigquery", +] } +google-cloud-pubsub = "0.27" http = "0.2" iceberg = { workspace = true } iceberg-catalog-rest = { workspace = true } @@ -112,7 +115,12 @@ rdkafka = { workspace = true, features = [ "gssapi", "zstd", ] } -redis = { version = "0.25", features = ["aio", "tokio-comp", "async-std-comp","cluster-async"] } +redis = { version = "0.25", features = [ + "aio", + "tokio-comp", + "async-std-comp", + "cluster-async", +] } regex = "1.4" reqwest = { version = "0.12.2", features = ["json", "stream"] } risingwave_common = { workspace = true } @@ -144,7 +152,14 @@ strum_macros = "0.26" tempfile = "3" thiserror = "1" thiserror-ext = { workspace = true } -tiberius = { version = "0.12", default-features = false, features = ["chrono", "time", "tds73", "rust_decimal", "bigdecimal", "rustls"] } +tiberius = { version = "0.12", default-features = false, features = [ + "chrono", + "time", + "tds73", + "rust_decimal", + "bigdecimal", + "rustls", +] } time = "0.3.30" tokio = { version = "0.2", package = "madsim-tokio", features = [ "rt", @@ -166,7 +181,7 @@ url = "2" urlencoding = "2" uuid = { version = "1", features = ["v4", "fast-rng"] } with_options = { path = "./with_options" } -yup-oauth2 = "8.3" +yup-oauth2 = "9.0" [target.'cfg(not(madsim))'.dependencies] workspace-hack = { path = "../workspace-hack" } diff --git a/src/expr/impl/Cargo.toml b/src/expr/impl/Cargo.toml index 6dfbcc5905750..7130b7f4c1a87 100644 --- a/src/expr/impl/Cargo.toml +++ b/src/expr/impl/Cargo.toml @@ -18,7 +18,7 @@ normal = ["workspace-hack", "ctor"] [features] external-udf = ["arrow-udf-flight", "arrow-flight", "tonic"] js-udf = ["arrow-udf-js"] -deno-udf = ["arrow-udf-js-deno", "zstd"] +# deno-udf = ["arrow-udf-js-deno", "zstd"] python-udf = ["arrow-udf-python"] wasm-udf = ["arrow-udf-wasm", "zstd"] @@ -30,7 +30,7 @@ arrow-flight = { workspace = true, optional = true } arrow-schema = { workspace = true } arrow-udf-flight = { workspace = true, optional = true } arrow-udf-js = { workspace = true, optional = true } -arrow-udf-js-deno = { workspace = true, optional = true } +# arrow-udf-js-deno = { workspace = true, optional = true } arrow-udf-python = { workspace = true, optional = true } arrow-udf-wasm = { workspace = true, optional = true } async-trait = "0.1" From 929f91c8e9545642f682da4cf948430b5a31ab96 Mon Sep 17 00:00:00 2001 From: Runji Wang Date: Fri, 12 Jul 2024 16:44:05 +0800 Subject: [PATCH 7/8] bump etcd-client to v0.13 Signed-off-by: Runji Wang --- Cargo.lock | 166 ++++++++++++------ Cargo.toml | 2 +- .../src/rpc/service/monitor_service.rs | 2 +- src/meta/src/telemetry.rs | 1 - 4 files changed, 112 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 519dc5be6fe34..4d2c6ede36a39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1281,7 +1281,7 @@ dependencies = [ "aws-types", "bytes", "fastrand 2.0.1", - "http 0.2.9", + "http 0.2.12", "hyper 0.14.27", "time", "tokio", @@ -1310,7 +1310,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "pin-project-lite", "tracing", @@ -1376,7 +1376,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "fastrand 2.0.1", - "http 0.2.9", + "http 0.2.12", "percent-encoding", "tracing", "uuid", @@ -1400,7 +1400,7 @@ dependencies = [ "aws-types", "bytes", "fastrand 2.0.1", - "http 0.2.9", + "http 0.2.12", "regex", "tracing", ] @@ -1422,7 +1422,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.9", + "http 0.2.12", "regex", "tracing", ] @@ -1448,7 +1448,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "once_cell", "percent-encoding", @@ -1475,7 +1475,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http 0.2.9", + "http 0.2.12", "regex", "tracing", ] @@ -1496,7 +1496,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http 0.2.9", + "http 0.2.12", "once_cell", "p256 0.11.1", "percent-encoding", @@ -1531,7 +1531,7 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "md-5", "pin-project-lite", @@ -1563,7 +1563,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "once_cell", "percent-encoding", @@ -1604,7 +1604,7 @@ dependencies = [ "bytes", "fastrand 2.0.1", "h2 0.3.26", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", "hyper-rustls 0.24.2", @@ -1625,7 +1625,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes", - "http 0.2.9", + "http 0.2.12", "http 1.1.0", "pin-project-lite", "tokio", @@ -1643,7 +1643,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", "itoa", @@ -1686,7 +1686,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http 0.2.9", + "http 0.2.12", "rustc_version 0.4.0", "tracing", ] @@ -1702,7 +1702,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", "itoa", @@ -1762,7 +1762,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "mime", "rustversion", @@ -4502,16 +4502,16 @@ dependencies = [ [[package]] name = "etcd-client" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae697f3928e8c89ae6f4dcf788059f49fd01a76dc53e63628f5a33881f5715e" +checksum = "5b915bb9b1e143ab7062e0067ed663e3dfeffc69ce0ceb9e93b35fecfc158d28" dependencies = [ - "http 0.2.9", + "http 0.2.12", "prost 0.12.6", "tokio", "tokio-stream", - "tonic 0.10.2", - "tonic-build", + "tonic 0.11.0", + "tonic-build 0.11.0", "tower", "tower-service", ] @@ -5349,7 +5349,7 @@ checksum = "3b00ef897d4082727a53ea1111cd19bfa4ccdc476a5eb9f49087047113a43891" dependencies = [ "anyhow", "async-trait", - "http 0.2.9", + "http 0.2.12", "thiserror", "tokio", "tonic 0.11.0", @@ -5454,7 +5454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cb60314136e37de9e2a05ddb427b9c5a39c3d188de2e2f026c6af74425eef44" dependencies = [ "google-cloud-token", - "http 0.2.9", + "http 0.2.12", "thiserror", "tokio", "tokio-retry", @@ -5470,7 +5470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9c2abd6bdcde7a6583e50b02c2c02e05d1337fa5d22e15997a44e116f9c4726" dependencies = [ "google-cloud-token", - "http 0.2.9", + "http 0.2.12", "thiserror", "tokio", "tokio-retry", @@ -5609,7 +5609,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.9", + "http 0.2.12", "indexmap 2.2.6", "slab", "tokio", @@ -5801,9 +5801,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -5828,7 +5828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http 0.2.9", + "http 0.2.12", "pin-project-lite", ] @@ -5890,7 +5890,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.26", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "httparse", "httpdate", @@ -5931,7 +5931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.9", + "http 0.2.12", "hyper 0.14.27", "log", "rustls 0.21.11", @@ -5948,7 +5948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", - "http 0.2.9", + "http 0.2.12", "hyper 0.14.27", "log", "rustls 0.22.4", @@ -5987,6 +5987,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.0", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -6018,9 +6031,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", @@ -6977,13 +6990,13 @@ dependencies = [ [[package]] name = "madsim-etcd-client" -version = "0.4.0+0.12.1" +version = "0.5.0+0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4b5de48bb7f3f7eae0bca62b3ed0b7d714b1b273d7347329b92c3a2eef113" +checksum = "19ac1f322fa9d4378bb40ad4b03836c2ae64c2bff4c0f5ac8e11a23e8e732a26" dependencies = [ "etcd-client", "futures-util", - "http 0.2.9", + "http 1.1.0", "madsim", "serde", "serde_with 3.8.0", @@ -6991,7 +7004,7 @@ dependencies = [ "thiserror", "tokio", "toml 0.8.12", - "tonic 0.10.2", + "tonic 0.12.0", "tracing", ] @@ -7069,7 +7082,7 @@ dependencies = [ "prost-build 0.12.1", "quote", "syn 2.0.66", - "tonic-build", + "tonic-build 0.10.2", ] [[package]] @@ -7838,7 +7851,7 @@ dependencies = [ "base64 0.13.1", "chrono", "getrandom", - "http 0.2.9", + "http 0.2.12", "rand", "reqwest 0.11.20", "serde", @@ -7955,7 +7968,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http 0.2.9", + "http 0.2.12", "itertools 0.10.5", "log", "oauth2", @@ -8042,7 +8055,7 @@ checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" dependencies = [ "async-trait", "futures-core", - "http 0.2.9", + "http 0.2.12", "opentelemetry", "opentelemetry-proto", "opentelemetry_sdk", @@ -9736,7 +9749,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.26", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", "hyper-rustls 0.24.2", @@ -10180,7 +10193,7 @@ dependencies = [ "governor", "hashbrown 0.14.3", "hex", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "humantime", "hytra", @@ -10292,7 +10305,7 @@ dependencies = [ "darwin-libproc", "easy-ext", "futures", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", "hytra", @@ -10494,7 +10507,7 @@ dependencies = [ "google-cloud-gax 0.18.0", "google-cloud-googleapis 0.14.0", "google-cloud-pubsub 0.27.0", - "http 0.2.9", + "http 0.2.12", "iceberg", "iceberg-catalog-rest", "icelake", @@ -11341,7 +11354,7 @@ dependencies = [ "easy-ext", "either", "futures", - "http 0.2.9", + "http 0.2.12", "hyper 0.14.27", "itertools 0.12.1", "lru 0.7.6", @@ -12115,7 +12128,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "fastrand 2.0.1", - "http 0.2.9", + "http 0.2.12", "regex", "tracing", ] @@ -13979,9 +13992,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -14009,9 +14022,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -14238,10 +14251,10 @@ dependencies = [ "bytes", "flate2", "h2 0.3.26", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.12.6", @@ -14270,10 +14283,10 @@ dependencies = [ "bytes", "flate2", "h2 0.3.26", - "http 0.2.9", + "http 0.2.12", "http-body 0.4.5", "hyper 0.14.27", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.12.6", @@ -14289,6 +14302,34 @@ dependencies = [ "webpki-roots 0.26.1", ] +[[package]] +name = "tonic" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f738b6a169a29bca4e39656db89c44a08e09c5b700b896ee9e7459f0652e81dd" +dependencies = [ + "async-stream", + "axum 0.7.4", + "base64 0.22.0", + "bytes", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.0", + "hyper-timeout 0.5.1", + "hyper-util", + "percent-encoding", + "pin-project", + "socket2 0.5.6", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tonic-build" version = "0.10.2" @@ -14302,6 +14343,19 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "tonic-build" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +dependencies = [ + "prettyplease 0.2.15", + "proc-macro2", + "prost-build 0.12.1", + "quote", + "syn 2.0.66", +] + [[package]] name = "tower" version = "0.4.13" @@ -15968,7 +16022,7 @@ dependencies = [ "async-trait", "base64 0.21.7", "futures", - "http 0.2.9", + "http 0.2.12", "hyper 0.14.27", "hyper-rustls 0.25.0", "itertools 0.12.1", diff --git a/Cargo.toml b/Cargo.toml index 8415465f355d5..93652bd1372ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,7 +120,7 @@ aws-smithy-types = { version = "1", default-features = false, features = [ aws-endpoint = "0.60" aws-types = "1" axum = "=0.7.4" # TODO: 0.7.5+ does not work with current toolchain -etcd-client = { package = "madsim-etcd-client", version = "0.4" } +etcd-client = { package = "madsim-etcd-client", version = "0.5" } # etcd-client v0.13 futures-async-stream = "0.2.9" hytra = "0.1" rdkafka = { package = "madsim-rdkafka", version = "0.4.1", features = [ diff --git a/src/compute/src/rpc/service/monitor_service.rs b/src/compute/src/rpc/service/monitor_service.rs index a9a41d753ac96..78602013c0c33 100644 --- a/src/compute/src/rpc/service/monitor_service.rs +++ b/src/compute/src/rpc/service/monitor_service.rs @@ -390,7 +390,7 @@ pub mod grpc_middleware { use either::Either; use futures::Future; use hyper::Body; - use tonic::transport::NamedService; + use tonic::server::NamedService; use tower::{Layer, Service}; /// Manages the await-trees of `gRPC` requests that are currently served by the compute node. diff --git a/src/meta/src/telemetry.rs b/src/meta/src/telemetry.rs index 27456289aa3d3..a3d5c063c36de 100644 --- a/src/meta/src/telemetry.rs +++ b/src/meta/src/telemetry.rs @@ -164,7 +164,6 @@ impl MetaReportCreator { #[async_trait::async_trait] impl TelemetryReportCreator for MetaReportCreator { - #[expect(refining_impl_trait)] async fn create_report( &self, tracking_id: String, From b6126056c816a0d30d6e24be43fd9ecff95e4205 Mon Sep 17 00:00:00 2001 From: Runji Wang Date: Fri, 12 Jul 2024 17:02:02 +0800 Subject: [PATCH 8/8] fix tonic version Signed-off-by: Runji Wang --- Cargo.lock | 2 +- src/expr/impl/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d2c6ede36a39..4893eefc3e42b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10806,7 +10806,7 @@ dependencies = [ "sql-json-path", "thiserror", "thiserror-ext", - "tonic 0.10.2", + "tonic 0.11.0", "tracing", "workspace-hack", "zstd 0.13.0", diff --git a/src/expr/impl/Cargo.toml b/src/expr/impl/Cargo.toml index 7130b7f4c1a87..6ef428c8e4b94 100644 --- a/src/expr/impl/Cargo.toml +++ b/src/expr/impl/Cargo.toml @@ -71,7 +71,7 @@ sql-json-path = { version = "0.1", features = ["jsonbb"] } thiserror = "1" thiserror-ext = { workspace = true } tokio = { version = "0.2", package = "madsim-tokio", features = ["time"] } -tonic = { version = "0.10", optional = true } +tonic = { version = "0.11", optional = true } tracing = "0.1" zstd = { version = "0.13", default-features = false, optional = true }