diff --git a/.guppy/hakari.toml b/.guppy/hakari.toml index 60959c852c..b5c3ca9ef4 100644 --- a/.guppy/hakari.toml +++ b/.guppy/hakari.toml @@ -39,9 +39,6 @@ workspace-members = [ "mutable_batch_tests", ] third-party = [ - { name = "azure_core", version = "0.4" }, - { name = "azure_storage", version = "0.5" }, - { name = "azure_storage_blobs", version = "0.5" }, { name = "criterion" }, { name = "pprof" }, { name = "tikv-jemalloc-sys" }, diff --git a/Cargo.lock b/Cargo.lock index 12736411be..a6d5309286 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "RustyXML" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" - [[package]] name = "addr2line" version = "0.17.0" @@ -29,7 +23,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom", "once_cell", "version_check", ] @@ -41,7 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72" dependencies = [ "cfg-if", - "getrandom 0.2.7", + "getrandom", "once_cell", "version_check", ] @@ -172,7 +166,7 @@ dependencies = [ "datafusion 0.1.0", "hashbrown", "num-traits", - "rand 0.8.4", + "rand", "snafu", "workspace-hack", ] @@ -207,26 +201,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "async-channel" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-lock" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" -dependencies = [ - "event-listener", -] - [[package]] name = "async-socks5" version = "0.5.1" @@ -259,18 +233,6 @@ dependencies = [ "syn", ] -[[package]] -name = "async-timer" -version = "1.0.0-beta.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faacdfdccd10db54656717fddcd1a2ab6cd1ab16c0d6e7d89ec365b885fc9844" -dependencies = [ - "error-code", - "libc", - "wasm-bindgen", - "winapi", -] - [[package]] name = "async-trait" version = "0.1.57" @@ -351,108 +313,12 @@ dependencies = [ "mime", ] -[[package]] -name = "azure_core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e66a6d993197d1b575cffd08bf725e04bc1414de6586baeb3537925e49b4ff" -dependencies = [ - "async-trait", - "base64", - "bytes", - "dyn-clone", - "futures", - "getrandom 0.2.7", - "http-types", - "log", - "paste", - "pin-project", - "rand 0.8.4", - "reqwest", - "rustc_version", - "serde", - "serde_json", - "time 0.3.14", - "url", - "uuid 1.1.2", -] - -[[package]] -name = "azure_identity" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6492760665ae7cf6daccf20847f12c9cd695327aa41c86c5de17d835b43e820" -dependencies = [ - "async-lock", - "async-timer", - "async-trait", - "azure_core", - "base64", - "fix-hidden-lifetime-bug", - "futures", - "log", - "oauth2", - "serde", - "serde_json", - "time 0.3.14", - "url", - "uuid 1.1.2", -] - -[[package]] -name = "azure_storage" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55aa63fb0426c76b9cc909234e94e69764f5e777a62b7ed6411f3cc04aa94a16" -dependencies = [ - "RustyXML", - "async-trait", - "azure_core", - "base64", - "bytes", - "futures", - "hmac", - "log", - "once_cell", - "serde", - "serde-xml-rs", - "serde_derive", - "serde_json", - "sha2", - "time 0.3.14", - "url", - "uuid 1.1.2", -] - -[[package]] -name = "azure_storage_blobs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33f953cedd7c240347ed0f6ed8a0bd7472b32579c38341ab9e117eaa6173e9ba" -dependencies = [ - "RustyXML", - "azure_core", - "azure_storage", - "base64", - "bytes", - "futures", - "log", - "md5", - "serde", - "serde-xml-rs", - "serde_derive", - "serde_json", - "time 0.3.14", - "url", - "uuid 1.1.2", -] - [[package]] name = "backoff" version = "0.1.0" dependencies = [ "observability_deps", - "rand 0.8.4", + "rand", "tokio", "workspace-hack", ] @@ -592,12 +458,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "cache_system" version = "0.1.0" @@ -611,7 +471,7 @@ dependencies = [ "parking_lot 0.12.1", "pdatastructs", "proptest", - "rand 0.8.4", + "rand", "tokio", "tokio-util", "trace", @@ -846,15 +706,6 @@ dependencies = [ "workspace-hack", ] -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - [[package]] name = "console-api" version = "0.4.0" @@ -1172,7 +1023,7 @@ dependencies = [ "parquet", "paste", "pin-project-lite", - "rand 0.8.4", + "rand", "smallvec", "sqlparser 0.20.0", "tempfile", @@ -1239,7 +1090,7 @@ dependencies = [ "md-5", "ordered-float 3.0.0", "paste", - "rand 0.8.4", + "rand", "regex", "sha2", "unicode-segmentation", @@ -1266,7 +1117,7 @@ dependencies = [ "arrow", "datafusion-common", "paste", - "rand 0.8.4", + "rand", ] [[package]] @@ -1379,12 +1230,6 @@ dependencies = [ "dirs", ] -[[package]] -name = "dyn-clone" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" - [[package]] name = "either" version = "1.8.0" @@ -1495,26 +1340,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fix-hidden-lifetime-bug" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ae9c2016a663983d4e40a9ff967d6dcac59819672f0b47f2b17574e99c33c8" -dependencies = [ - "fix-hidden-lifetime-bug-proc_macros", -] - -[[package]] -name = "fix-hidden-lifetime-bug-proc_macros" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1632,21 +1457,6 @@ version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.23" @@ -1745,17 +1555,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.7" @@ -1763,10 +1562,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1945,26 +1742,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "base64", - "futures-lite", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - [[package]] name = "httparse" version = "1.7.1" @@ -2094,12 +1871,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - [[package]] name = "inferno" version = "0.11.7" @@ -2230,7 +2001,7 @@ dependencies = [ "mutable_batch_lp", "mutable_batch_pb", "prost 0.11.0", - "rand 0.8.4", + "rand", "thiserror", "tokio", "tonic", @@ -2270,7 +2041,7 @@ dependencies = [ "hex", "integer-encoding 3.0.4", "observability_deps", - "rand 0.8.4", + "rand", "snafu", "snap", "test_helpers", @@ -2382,7 +2153,7 @@ dependencies = [ "observability_deps", "paste", "pretty_assertions", - "rand 0.8.4", + "rand", "snafu", "sqlx", "sqlx-hotswap-pool", @@ -2407,7 +2178,7 @@ dependencies = [ "humantime", "influxdb2_client", "itertools", - "rand 0.8.4", + "rand", "regex", "serde", "serde_json", @@ -2890,12 +2661,6 @@ dependencies = [ "digest", ] -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" version = "2.5.0" @@ -2983,7 +2748,7 @@ dependencies = [ "httparse", "lazy_static", "log", - "rand 0.8.4", + "rand", "regex", "serde_json", "serde_urlencoded", @@ -3027,7 +2792,7 @@ dependencies = [ "hashbrown", "iox_time", "itertools", - "rand 0.8.4", + "rand", "schema", "snafu", "workspace-hack", @@ -3232,26 +2997,6 @@ dependencies = [ "libc", ] -[[package]] -name = "oauth2" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d62c436394991641b970a92e23e8eeb4eb9bca74af4f5badc53bcd568daadbd" -dependencies = [ - "base64", - "chrono", - "getrandom 0.2.7", - "http", - "rand 0.8.4", - "reqwest", - "serde", - "serde_json", - "serde_path_to_error", - "sha2", - "thiserror", - "url", -] - [[package]] name = "object" version = "0.29.0" @@ -3264,13 +3009,9 @@ dependencies = [ [[package]] name = "object_store" version = "0.4.0" -source = "git+https://github.com/apache/arrow-rs.git?rev=3f0e12d8d362752181c75836d25d424862acc424#3f0e12d8d362752181c75836d25d424862acc424" +source = "git+https://github.com/apache/arrow-rs.git?rev=81f1f81025c9d5f511662f1c017ae17b5e2bff64#81f1f81025c9d5f511662f1c017ae17b5e2bff64" dependencies = [ "async-trait", - "azure_core", - "azure_identity", - "azure_storage", - "azure_storage_blobs", "base64", "bytes", "chrono", @@ -3279,7 +3020,7 @@ dependencies = [ "parking_lot 0.12.1", "percent-encoding", "quick-xml", - "rand 0.8.4", + "rand", "reqwest", "ring", "rustls-pemfile", @@ -3373,7 +3114,7 @@ dependencies = [ "criterion", "influxdb_tsm", "parquet", - "rand 0.8.4", + "rand", "schema", "snafu", "workspace-hack", @@ -3388,12 +3129,6 @@ dependencies = [ "workspace-hack", ] -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - [[package]] name = "parking_lot" version = "0.11.2" @@ -3462,7 +3197,7 @@ dependencies = [ "num", "num-bigint", "parquet-format", - "rand 0.8.4", + "rand", "seq-macro", "snap", "thrift", @@ -3855,8 +3590,8 @@ dependencies = [ "lazy_static", "num-traits", "quick-error", - "rand 0.8.4", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax", ] @@ -4004,7 +3739,7 @@ dependencies = [ "parquet_file", "pin-project", "predicate", - "rand 0.8.4", + "rand", "read_buffer", "schema", "service_common", @@ -4101,19 +3836,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - [[package]] name = "rand" version = "0.8.4" @@ -4121,19 +3843,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] @@ -4143,16 +3855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -4161,7 +3864,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.7", + "getrandom", ] [[package]] @@ -4171,16 +3874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.4", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -4189,7 +3883,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] [[package]] @@ -4198,7 +3892,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] [[package]] @@ -4244,7 +3938,7 @@ dependencies = [ "parking_lot 0.12.1", "permutation", "proptest", - "rand 0.8.4", + "rand", "rand_distr", "schema", "snafu", @@ -4266,7 +3960,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", + "getrandom", "redox_syscall", "thiserror", ] @@ -4398,7 +4092,7 @@ dependencies = [ "paste", "predicate", "pretty_assertions", - "rand 0.8.4", + "rand", "schema", "serde", "serde_urlencoded", @@ -4430,7 +4124,7 @@ dependencies = [ "integer-encoding 3.0.4", "parking_lot 0.12.1", "pin-project-lite", - "rand 0.8.4", + "rand", "snap", "thiserror", "time 0.3.14", @@ -4592,18 +4286,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-xml-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - [[package]] name = "serde_cbor" version = "0.11.2" @@ -4636,26 +4318,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4849,7 +4511,7 @@ dependencies = [ "mutable_batch", "mutable_batch_lp", "parking_lot 0.12.1", - "rand 0.8.4", + "rand", "siphasher", "test_helpers", "workspace-hack", @@ -5024,7 +4686,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rand 0.8.4", + "rand", "rustls", "rustls-pemfile", "serde", @@ -5050,7 +4712,7 @@ dependencies = [ "dotenvy", "either", "futures", - "rand 0.8.4", + "rand", "sqlx", "tokio", "workspace-hack", @@ -5260,7 +4922,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "prost 0.11.0", - "rand 0.8.4", + "rand", "reqwest", "sqlx", "tempfile", @@ -5376,19 +5038,10 @@ version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ - "itoa 1.0.3", "libc", "num_threads", - "serde", - "time-macros", ] -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - [[package]] name = "tinytemplate" version = "1.2.1" @@ -5588,7 +5241,7 @@ dependencies = [ "indexmap", "pin-project", "pin-project-lite", - "rand 0.8.4", + "rand", "slab", "tokio", "tokio-util", @@ -5636,7 +5289,7 @@ dependencies = [ "chrono", "observability_deps", "parking_lot 0.12.1", - "rand 0.8.4", + "rand", "workspace-hack", ] @@ -5867,7 +5520,6 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde", ] [[package]] @@ -5888,7 +5540,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" dependencies = [ - "getrandom 0.2.7", + "getrandom", ] [[package]] @@ -5912,12 +5564,6 @@ dependencies = [ "libc", ] -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" version = "2.3.2" @@ -5939,12 +5585,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -6180,7 +5820,7 @@ dependencies = [ "futures-sink", "futures-task", "futures-util", - "getrandom 0.2.7", + "getrandom", "hashbrown", "heck", "hex", @@ -6200,7 +5840,7 @@ dependencies = [ "predicates", "prost 0.11.0", "prost-types 0.11.1", - "rand 0.8.4", + "rand", "regex", "regex-automata", "regex-syntax", @@ -6216,7 +5856,6 @@ dependencies = [ "sqlx-core", "sqlx-macros", "syn", - "time 0.3.14", "tokio", "tokio-stream", "tokio-util", @@ -6228,7 +5867,6 @@ dependencies = [ "tracing-core", "tracing-log", "tracing-subscriber", - "url", "uuid 1.1.2", "winapi", "windows-sys", @@ -6286,12 +5924,6 @@ dependencies = [ "workspace-hack", ] -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/Cargo.toml b/Cargo.toml index d327465eb3..f04ddec0fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,4 +120,4 @@ incremental = true [patch.crates-io] # remove and bump object_store dep version once this revision is released. -object_store = { git = 'https://github.com/apache/arrow-rs.git', rev = "3f0e12d8d362752181c75836d25d424862acc424", package = "object_store" } +object_store = { git = 'https://github.com/apache/arrow-rs.git', rev = "81f1f81025c9d5f511662f1c017ae17b5e2bff64", package = "object_store" } diff --git a/deny.toml b/deny.toml index 534e49aec3..3ed7124db6 100644 --- a/deny.toml +++ b/deny.toml @@ -16,11 +16,6 @@ ignore = [ # why needed: part of `arrow` # upstream issue: https://github.com/google/flatbuffers/issues/6627 "RUSTSEC-2021-0122", - - # title: xml-rs is Unmaintained - # why needed: upstream of Azure SDK, removal in-progress - # upstream issue: many (https://github.com/netvl/xml-rs/issues) - "RUSTSEC-2022-0048", ] git-fetch-with-cli = true diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 61b15448d8..c9c71e7188 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -43,7 +43,7 @@ memchr = { version = "2", features = ["std"] } nom = { version = "7", features = ["alloc", "std"] } num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm", "std"] } -object_store = { git = "https://github.com/apache/arrow-rs.git", rev = "3f0e12d8d362752181c75836d25d424862acc424", default-features = false, features = ["aws", "azure", "azure_core", "azure_identity", "azure_storage", "azure_storage_blobs", "base64", "gcp", "quick-xml", "rand", "reqwest", "ring", "rustls-pemfile", "serde", "serde_json"] } +object_store = { git = "https://github.com/apache/arrow-rs.git", rev = "81f1f81025c9d5f511662f1c017ae17b5e2bff64", default-features = false, features = ["aws", "azure", "base64", "cloud", "gcp", "quick-xml", "rand", "reqwest", "ring", "rustls-pemfile", "serde", "serde_json"] } once_cell = { version = "1", features = ["alloc", "parking_lot", "parking_lot_core", "race", "std"] } parking_lot = { version = "0.12", features = ["arc_lock"] } parquet = { version = "20", features = ["arrow", "async", "base64", "brotli", "experimental", "flate2", "futures", "lz4", "snap", "tokio", "zstd"] } @@ -54,7 +54,7 @@ rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } regex-automata = { version = "0.1", features = ["regex-syntax", "std"] } regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } -reqwest = { version = "0.11", default-features = false, features = ["__rustls", "__tls", "blocking", "hyper-rustls", "json", "rustls", "rustls-pemfile", "rustls-tls", "rustls-tls-webpki-roots", "serde_json", "stream", "tokio-rustls", "tokio-util", "webpki-roots"] } +reqwest = { version = "0.11", default-features = false, features = ["__rustls", "__tls", "hyper-rustls", "json", "rustls", "rustls-pemfile", "rustls-tls", "rustls-tls-webpki-roots", "serde_json", "stream", "tokio-rustls", "tokio-util", "webpki-roots"] } ring = { version = "0.16", features = ["alloc", "dev_urandom_fallback", "once_cell", "std"] } serde = { version = "1", features = ["derive", "rc", "serde_derive", "std"] } serde_json = { version = "1", features = ["raw_value", "std"] } @@ -62,7 +62,6 @@ sha2 = { version = "0.10", features = ["std"] } smallvec = { version = "1", default-features = false, features = ["union"] } sqlx = { version = "0.6", features = ["_rt-tokio", "json", "macros", "migrate", "postgres", "runtime-tokio-rustls", "sqlx-macros", "tls", "uuid"] } sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "any", "base64", "crc", "dirs", "hkdf", "hmac", "json", "md-5", "migrate", "postgres", "rand", "runtime-tokio-rustls", "rustls", "rustls-pemfile", "serde", "serde_json", "sha-1", "sha2", "tokio-stream", "uuid", "webpki-roots", "whoami"] } -time = { version = "0.3", features = ["alloc", "local-offset", "macros", "serde", "std", "time-macros"] } tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "tracing"] } tokio-stream = { version = "0.1", features = ["fs", "net", "time"] } tokio-util = { version = "0.7", features = ["codec", "tracing"] } @@ -73,7 +72,6 @@ tracing = { version = "0.1", features = ["attributes", "log", "max_level_trace", tracing-core = { version = "0.1", features = ["lazy_static", "std"] } tracing-log = { version = "0.1", features = ["log-tracer", "std", "trace-logger"] } tracing-subscriber = { version = "0.3", features = ["alloc", "ansi", "ansi_term", "env-filter", "fmt", "json", "lazy_static", "matchers", "parking_lot", "regex", "registry", "serde", "serde_json", "sharded-slab", "smallvec", "std", "thread_local", "tracing", "tracing-log", "tracing-serde"] } -url = { version = "2", default-features = false, features = ["serde"] } uuid = { version = "1", features = ["private_getrandom", "rng", "std", "v4"] } zstd = { version = "0.11", features = ["arrays", "legacy", "zdict_builder"] } zstd-safe = { version = "5", default-features = false, features = ["arrays", "legacy", "std", "zdict_builder"] } @@ -126,7 +124,6 @@ syn = { version = "1", features = ["clone-impls", "derive", "extra-traits", "ful tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros", "tracing"] } tokio-stream = { version = "0.1", features = ["fs", "net", "time"] } tonic-build = { version = "0.8", features = ["prost", "prost-build", "transport"] } -url = { version = "2", default-features = false, features = ["serde"] } uuid = { version = "1", features = ["private_getrandom", "rng", "std", "v4"] } [target.x86_64-unknown-linux-gnu.dependencies] @@ -162,7 +159,7 @@ once_cell = { version = "1", default-features = false, features = ["unstable"] } scopeguard = { version = "1", features = ["use_std"] } tokio = { version = "1", default-features = false, features = ["winapi"] } tokio-util = { version = "0.7", default-features = false, features = ["io"] } -winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "threadpoolapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] } +winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] } windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] } [target.x86_64-pc-windows-msvc.build-dependencies] @@ -170,7 +167,7 @@ getrandom = { version = "0.2", default-features = false, features = ["std"] } once_cell = { version = "1", default-features = false, features = ["unstable"] } scopeguard = { version = "1", features = ["use_std"] } tokio = { version = "1", default-features = false, features = ["winapi"] } -winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "threadpoolapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] } +winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "ntstatus", "objbase", "processenv", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] } windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] } ### END HAKARI SECTION