From 7db9f2b6949326ce0eda2f23f13300582355257c Mon Sep 17 00:00:00 2001 From: Gabriel Musat Mestre Date: Wed, 24 Dec 2025 11:52:35 +0100 Subject: [PATCH 1/3] Bump arrow version --- Cargo.lock | 69 ++++++++++++++++++++++--------------------- Cargo.toml | 12 ++++---- benchmarks/Cargo.toml | 4 +-- cli/Cargo.toml | 2 +- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9da3720d..b8412934 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,9 +178,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrow" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df8bb5b0bd64c0b9bc61317fcc480bad0f00e56d3bc32c69a4c8dada4786bae" +checksum = "cb372a7cbcac02a35d3fb7b3fc1f969ec078e871f9bb899bf00a2e1809bec8a3" dependencies = [ "arrow-arith", "arrow-array", @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a640186d3bd30a24cb42264c2dafb30e236a6f50d510e56d40b708c9582491" +checksum = "0f377dcd19e440174596d83deb49cd724886d91060c07fec4f67014ef9d54049" dependencies = [ "arrow-array", "arrow-buffer", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219fe420e6800979744c8393b687afb0252b3f8a89b91027d27887b72aa36d31" +checksum = "a23eaff85a44e9fa914660fb0d0bb00b79c4a3d888b5334adb3ea4330c84f002" dependencies = [ "ahash", "arrow-buffer", @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76885a2697a7edf6b59577f568b456afc94ce0e2edc15b784ce3685b6c3c5c27" +checksum = "a2819d893750cb3380ab31ebdc8c68874dd4429f90fd09180f3c93538bd21626" dependencies = [ "bytes", "half", @@ -244,13 +244,14 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9ebb4c987e6b3b236fb4a14b20b34835abfdd80acead3ccf1f9bf399e1f168" +checksum = "e3d131abb183f80c450d4591dc784f8d7750c50c6e2bc3fcaad148afc8361271" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", + "arrow-ord", "arrow-schema", "arrow-select", "atoi", @@ -265,9 +266,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92386159c8d4bce96f8bd396b0642a0d544d471bdc2ef34d631aec80db40a09c" +checksum = "2275877a0e5e7e7c76954669366c2aa1a829e340ab1f612e647507860906fb6b" dependencies = [ "arrow-array", "arrow-cast", @@ -280,9 +281,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727681b95de313b600eddc2a37e736dcb21980a40f640314dcf360e2f36bc89b" +checksum = "05738f3d42cb922b9096f7786f606fcb8669260c2640df8490533bb2fa38c9d3" dependencies = [ "arrow-buffer", "arrow-schema", @@ -293,9 +294,9 @@ dependencies = [ [[package]] name = "arrow-flight" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f70bb56412a007b0cfc116d15f24dda6adeed9611a213852a004cda20085a3b9" +checksum = "8b5f57c3d39d1b1b7c1376a772ea86a131e7da310aed54ebea9363124bb885e3" dependencies = [ "arrow-array", "arrow-buffer", @@ -313,9 +314,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9ba92e3de170295c98a84e5af22e2b037f0c7b32449445e6c493b5fca27f27" +checksum = "3d09446e8076c4b3f235603d9ea7c5494e73d441b01cd61fb33d7254c11964b3" dependencies = [ "arrow-array", "arrow-buffer", @@ -329,9 +330,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b969b4a421ae83828591c6bf5450bd52e6d489584142845ad6a861f42fe35df8" +checksum = "371ffd66fa77f71d7628c63f209c9ca5341081051aa32f9c8020feb0def787c0" dependencies = [ "arrow-array", "arrow-buffer", @@ -353,9 +354,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141c05298b21d03e88062317a1f1a73f5ba7b6eb041b350015b1cd6aabc0519b" +checksum = "cbc94fc7adec5d1ba9e8cd1b1e8d6f72423b33fe978bf1f46d970fafab787521" dependencies = [ "arrow-array", "arrow-buffer", @@ -366,9 +367,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f3c06a6abad6164508ed283c7a02151515cef3de4b4ff2cebbcaeb85533db2" +checksum = "169676f317157dc079cc5def6354d16db63d8861d61046d2f3883268ced6f99f" dependencies = [ "arrow-array", "arrow-buffer", @@ -379,9 +380,9 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cfa7a03d1eee2a4d061476e1840ad5c9867a544ca6c4c59256496af5d0a8be5" +checksum = "d27609cd7dd45f006abae27995c2729ef6f4b9361cde1ddd019dc31a5aa017e0" dependencies = [ "serde_core", "serde_json", @@ -389,9 +390,9 @@ dependencies = [ [[package]] name = "arrow-select" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafa595babaad59f2455f4957d0f26448fb472722c186739f4fac0823a1bdb47" +checksum = "ae980d021879ea119dd6e2a13912d81e64abed372d53163e804dfe84639d8010" dependencies = [ "ahash", "arrow-array", @@ -403,9 +404,9 @@ dependencies = [ [[package]] name = "arrow-string" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f46457dbbb99f2650ff3ac23e46a929e0ab81db809b02aa5511c258348bef2" +checksum = "cf35e8ef49dcf0c5f6d175edee6b8af7b45611805333129c541a8b89a0fc0534" dependencies = [ "arrow-array", "arrow-buffer", @@ -3336,9 +3337,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lz4_flex" -version = "0.11.5" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" +checksum = "ab6473172471198271ff72e9379150e9dfd70d8e533e0752a27e515b48dd375e" dependencies = [ "twox-hash", ] @@ -3594,9 +3595,9 @@ dependencies = [ [[package]] name = "parquet" -version = "57.0.0" +version = "57.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0f31027ef1af7549f7cec603a9a21dce706d3f8d7c2060a68f43c1773be95a" +checksum = "be3e4f6d320dd92bfa7d612e265d7d08bba0a240bab86af3425e1d255a511d89" dependencies = [ "ahash", "arrow-array", diff --git a/Cargo.toml b/Cargo.toml index 3868f544..8f8490ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,8 @@ datafusion = { workspace = true, features = [ "datetime_expressions", ] } datafusion-proto = { workspace = true } -arrow-flight = "57.0.0" -arrow-select = "57.0.0" +arrow-flight = "57.1.0" +arrow-select = "57.1.0" async-trait = "0.1.88" tokio = { version = "1.46.1", features = ["full"] } tonic = { version = "0.14.1", features = ["transport"] } @@ -43,8 +43,8 @@ tokio-stream = "0.1.17" insta = { version = "1.43.1", features = ["filters"], optional = true } tpchgen = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "e83365a5a9101906eb9f78c5607b83bc59849acf", optional = true } tpchgen-arrow = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "e83365a5a9101906eb9f78c5607b83bc59849acf", optional = true } -parquet = { version = "57.0.0", optional = true } -arrow = { version = "57.0.0", optional = true } +parquet = { version = "57.1.0", optional = true } +arrow = { version = "57.1.0", optional = true } hyper-util = { version = "0.1.16", optional = true } pretty_assertions = { version = "1.4", optional = true } @@ -68,8 +68,8 @@ structopt = "0.3" insta = { version = "1.43.1", features = ["filters"] } tpchgen = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "e83365a5a9101906eb9f78c5607b83bc59849acf" } tpchgen-arrow = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "e83365a5a9101906eb9f78c5607b83bc59849acf" } -parquet = "57.0.0" -arrow = "57.0.0" +parquet = "57.1.0" +arrow = "57.1.0" tokio-stream = "0.1.17" hyper-util = "0.1.16" pretty_assertions = "1.4" diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 1a30ae2b..77f481a9 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -9,7 +9,7 @@ datafusion = { workspace = true } datafusion-proto = { workspace = true } datafusion-distributed = { path = "..", features = ["integration"] } tokio = { version = "1.46.1", features = ["full"] } -parquet = { version = "57.0.0" } +parquet = { version = "57.1.0" } structopt = { version = "0.3.26" } log = "0.4.27" serde = "1.0.219" @@ -21,7 +21,7 @@ futures = "0.3.31" dashmap = "6.1.0" prost = "0.14.0" url = "2.5.4" -arrow-flight = "57.0.0" +arrow-flight = "57.1.0" tonic = { version = "0.14.1", features = ["transport"] } axum = "0.7" object_store = { version = "0.12.4", features = ["aws"] } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ee76ce2e..bd23b27d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -11,7 +11,7 @@ tokio = { version = "1.46.1", features = ["full"] } clap = { version = "4", features = ["derive"] } env_logger = "0.11" dirs = "6" -arrow-flight = "57.0.0" +arrow-flight = "57.1.0" tonic = { version = "0.14.1", features = ["transport"] } tower = "0.5.2" hyper-util = "0.1.16" From c50e5ba0d077ace9ea79da7e8d79de16713589af Mon Sep 17 00:00:00 2001 From: Gabriel Musat Mestre Date: Wed, 24 Dec 2025 11:59:07 +0100 Subject: [PATCH 2/3] Downgrade prost and tonic to 0.13 --- Cargo.lock | 78 +++++++++++++++++++++++++++++++++++-------- Cargo.toml | 4 +-- benchmarks/Cargo.toml | 4 +-- cli/Cargo.toml | 2 +- 4 files changed, 70 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8412934..83b9eb87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,9 +306,9 @@ dependencies = [ "base64", "bytes", "futures", - "prost", + "prost 0.14.1", "prost-types", - "tonic", + "tonic 0.14.2", "tonic-prost", ] @@ -1811,12 +1811,12 @@ dependencies = [ "parquet", "pin-project", "pretty_assertions", - "prost", + "prost 0.13.5", "rand 0.8.5", "structopt", "tokio", "tokio-stream", - "tonic", + "tonic 0.13.1", "tower", "tpchgen", "tpchgen-arrow", @@ -1843,12 +1843,12 @@ dependencies = [ "log", "object_store", "parquet", - "prost", + "prost 0.13.5", "serde", "serde_json", "structopt", "tokio", - "tonic", + "tonic 0.13.1", "url", ] @@ -1867,7 +1867,7 @@ dependencies = [ "hyper-util", "tokio", "tokio-stream", - "tonic", + "tonic 0.13.1", "tower", "url", ] @@ -2222,7 +2222,7 @@ dependencies = [ "datafusion-physical-plan", "datafusion-proto-common", "object_store", - "prost", + "prost 0.14.1", ] [[package]] @@ -2233,7 +2233,7 @@ checksum = "3b6aef3d5e5c1d2bc3114c4876730cb76a9bdc5a8df31ef1b6db48f0c1671895" dependencies = [ "arrow", "datafusion-common", - "prost", + "prost 0.14.1", ] [[package]] @@ -3812,6 +3812,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "prost" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive 0.13.5", +] + [[package]] name = "prost" version = "0.14.1" @@ -3819,7 +3829,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.14.1", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 2.0.110", ] [[package]] @@ -3841,7 +3864,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" dependencies = [ - "prost", + "prost 0.14.1", ] [[package]] @@ -4912,6 +4935,35 @@ dependencies = [ "winnow", ] +[[package]] +name = "tonic" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9" +dependencies = [ + "async-trait", + "axum 0.8.7", + "base64", + "bytes", + "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.1", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.5", + "socket2 0.5.10", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tonic" version = "0.14.2" @@ -4948,8 +5000,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" dependencies = [ "bytes", - "prost", - "tonic", + "prost 0.14.1", + "tonic 0.14.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8f8490ff..24467645 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ arrow-flight = "57.1.0" arrow-select = "57.1.0" async-trait = "0.1.88" tokio = { version = "1.46.1", features = ["full"] } -tonic = { version = "0.14.1", features = ["transport"] } +tonic = { version = "0.13", features = ["transport"] } tower = "0.5.2" http = "1.3.1" itertools = "0.14.0" @@ -32,7 +32,7 @@ url = "2.5.4" uuid = "1.17.0" delegate = "0.13.4" dashmap = "6.1.0" -prost = "0.14.0" +prost = "0.13" rand = "0.8.5" object_store = "0.12.3" bytes = "1.10.1" diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 77f481a9..b9a2cc5e 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -19,10 +19,10 @@ async-trait = "0.1.88" chrono = "0.4.41" futures = "0.3.31" dashmap = "6.1.0" -prost = "0.14.0" +prost = "0.13" url = "2.5.4" arrow-flight = "57.1.0" -tonic = { version = "0.14.1", features = ["transport"] } +tonic = { version = "0.13", features = ["transport"] } axum = "0.7" object_store = { version = "0.12.4", features = ["aws"] } aws-config = "1" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index bd23b27d..a21bba35 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -12,7 +12,7 @@ clap = { version = "4", features = ["derive"] } env_logger = "0.11" dirs = "6" arrow-flight = "57.1.0" -tonic = { version = "0.14.1", features = ["transport"] } +tonic = { version = "0.13", features = ["transport"] } tower = "0.5.2" hyper-util = "0.1.16" tokio-stream = "0.1.17" From 2e5b056e3e3886a2e35f58d68d75fb37440abc97 Mon Sep 17 00:00:00 2001 From: Gabriel Musat Mestre Date: Wed, 24 Dec 2025 12:07:13 +0100 Subject: [PATCH 3/3] Patch dependencies with DD forks so that the project compiles --- Cargo.lock | 436 +++++++++++++++++++++-------------------------------- Cargo.toml | 21 +++ 2 files changed, 197 insertions(+), 260 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83b9eb87..7f657e4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,15 +128,16 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "apache-avro" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a033b4ced7c585199fb78ef50fca7fe2f444369ec48080c5fd072efa1a03cc7" +checksum = "36fa98bc79671c7981272d91a8753a928ff6a1cd8e4f20a44c45bd5d313840bf" dependencies = [ "bigdecimal", "bon", - "bzip2 0.6.1", + "bzip2", "crc32fast", "digest", + "liblzma", "log", "miniz_oxide", "num-bigint", @@ -151,7 +152,6 @@ dependencies = [ "strum_macros", "thiserror", "uuid", - "xz2", "zstd", ] @@ -179,8 +179,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrow" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb372a7cbcac02a35d3fb7b3fc1f969ec078e871f9bb899bf00a2e1809bec8a3" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-arith", "arrow-array", @@ -200,8 +199,7 @@ dependencies = [ [[package]] name = "arrow-arith" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f377dcd19e440174596d83deb49cd724886d91060c07fec4f67014ef9d54049" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -214,8 +212,7 @@ dependencies = [ [[package]] name = "arrow-array" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23eaff85a44e9fa914660fb0d0bb00b79c4a3d888b5334adb3ea4330c84f002" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "ahash", "arrow-buffer", @@ -233,8 +230,7 @@ dependencies = [ [[package]] name = "arrow-buffer" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2819d893750cb3380ab31ebdc8c68874dd4429f90fd09180f3c93538bd21626" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "bytes", "half", @@ -245,8 +241,7 @@ dependencies = [ [[package]] name = "arrow-cast" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d131abb183f80c450d4591dc784f8d7750c50c6e2bc3fcaad148afc8361271" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -267,8 +262,7 @@ dependencies = [ [[package]] name = "arrow-csv" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275877a0e5e7e7c76954669366c2aa1a829e340ab1f612e647507860906fb6b" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-cast", @@ -282,8 +276,7 @@ dependencies = [ [[package]] name = "arrow-data" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05738f3d42cb922b9096f7786f606fcb8669260c2640df8490533bb2fa38c9d3" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-buffer", "arrow-schema", @@ -295,8 +288,7 @@ dependencies = [ [[package]] name = "arrow-flight" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5f57c3d39d1b1b7c1376a772ea86a131e7da310aed54ebea9363124bb885e3" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -306,17 +298,15 @@ dependencies = [ "base64", "bytes", "futures", - "prost 0.14.1", + "prost", "prost-types", - "tonic 0.14.2", - "tonic-prost", + "tonic", ] [[package]] name = "arrow-ipc" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d09446e8076c4b3f235603d9ea7c5494e73d441b01cd61fb33d7254c11964b3" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -331,8 +321,7 @@ dependencies = [ [[package]] name = "arrow-json" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371ffd66fa77f71d7628c63f209c9ca5341081051aa32f9c8020feb0def787c0" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -355,8 +344,7 @@ dependencies = [ [[package]] name = "arrow-ord" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc94fc7adec5d1ba9e8cd1b1e8d6f72423b33fe978bf1f46d970fafab787521" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -368,8 +356,7 @@ dependencies = [ [[package]] name = "arrow-row" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169676f317157dc079cc5def6354d16db63d8861d61046d2f3883268ced6f99f" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -381,8 +368,7 @@ dependencies = [ [[package]] name = "arrow-schema" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27609cd7dd45f006abae27995c2729ef6f4b9361cde1ddd019dc31a5aa017e0" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "serde_core", "serde_json", @@ -391,8 +377,7 @@ dependencies = [ [[package]] name = "arrow-select" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae980d021879ea119dd6e2a13912d81e64abed372d53163e804dfe84639d8010" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "ahash", "arrow-array", @@ -405,8 +390,7 @@ dependencies = [ [[package]] name = "arrow-string" version = "57.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf35e8ef49dcf0c5f6d175edee6b8af7b45611805333129c541a8b89a0fc0534" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" dependencies = [ "arrow-array", "arrow-buffer", @@ -421,19 +405,15 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.19" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06575e6a9673580f52661c92107baabffbf41e2141373441cbcdc47cb733003c" +checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" dependencies = [ - "bzip2 0.5.2", - "flate2", + "compression-codecs", + "compression-core", "futures-core", - "memchr", "pin-project-lite", "tokio", - "xz2", - "zstd", - "zstd-safe", ] [[package]] @@ -1134,15 +1114,6 @@ dependencies = [ "either", ] -[[package]] -name = "bzip2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47" -dependencies = [ - "bzip2-sys", -] - [[package]] name = "bzip2" version = "0.6.1" @@ -1152,16 +1123,6 @@ dependencies = [ "libbz2-rs-sys", ] -[[package]] -name = "bzip2-sys" -version = "0.1.13+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" -dependencies = [ - "cc", - "pkg-config", -] - [[package]] name = "cc" version = "1.2.47" @@ -1299,6 +1260,27 @@ dependencies = [ "unicode-width 0.2.2", ] +[[package]] +name = "compression-codecs" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" +dependencies = [ + "bzip2", + "compression-core", + "flate2", + "liblzma", + "memchr", + "zstd", + "zstd-safe", +] + +[[package]] +name = "compression-core" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" + [[package]] name = "console" version = "0.15.11" @@ -1466,18 +1448,17 @@ dependencies = [ [[package]] name = "datafusion" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba7cb113e9c0bedf9e9765926031e132fa05a1b09ba6e93a6d1a4d7044457b8" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "arrow-schema", "async-trait", "bytes", - "bzip2 0.6.1", + "bzip2", "chrono", "datafusion-catalog", "datafusion-catalog-listing", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-datasource-arrow", @@ -1504,6 +1485,7 @@ dependencies = [ "flate2", "futures", "itertools", + "liblzma", "log", "object_store", "parking_lot", @@ -1516,20 +1498,18 @@ dependencies = [ "tokio", "url", "uuid", - "xz2", "zstd", ] [[package]] name = "datafusion-catalog" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a3a799f914a59b1ea343906a0486f17061f39509af74e874a866428951130d" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "dashmap", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-execution", @@ -1548,13 +1528,12 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db1b113c80d7a0febcd901476a57aef378e717c54517a163ed51417d87621b0" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-datasource", "datafusion-execution", "datafusion-expr", @@ -1582,7 +1561,7 @@ dependencies = [ "chrono", "clap 4.5.53", "datafusion", - "datafusion-common", + "datafusion-common 51.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "dirs", "env_logger", "futures", @@ -1602,6 +1581,25 @@ name = "datafusion-common" version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c10f7659e96127d25e8366be7c8be4109595d6a2c3eac70421f380a7006a1b0" +dependencies = [ + "ahash", + "arrow", + "arrow-ipc", + "chrono", + "half", + "hashbrown 0.14.5", + "indexmap", + "libc", + "log", + "paste", + "tokio", + "web-time", +] + +[[package]] +name = "datafusion-common" +version = "51.0.0" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "ahash", "apache-avro", @@ -1626,8 +1624,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92065bbc6532c6651e2f7dd30b55cba0c7a14f860c7e1d15f165c41a1868d95" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "futures", "log", @@ -1637,16 +1634,15 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde13794244bc7581cd82f6fff217068ed79cdc344cafe4ab2c3a1c3510b38d6" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-compression", "async-trait", "bytes", - "bzip2 0.6.1", + "bzip2", "chrono", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", @@ -1659,27 +1655,26 @@ dependencies = [ "futures", "glob", "itertools", + "liblzma", "log", "object_store", "rand 0.9.2", "tokio", "tokio-util", "url", - "xz2", "zstd", ] [[package]] name = "datafusion-datasource-arrow" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804fa9b4ecf3157982021770617200ef7c1b2979d57bec9044748314775a9aea" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "arrow-ipc", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-execution", @@ -1696,14 +1691,13 @@ dependencies = [ [[package]] name = "datafusion-datasource-avro" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388ed8be535f562cc655b9c3d22edbfb0f1a50a25c242647a98b6d92a75b55a1" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "apache-avro", "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-datasource", "datafusion-physical-expr-common", "datafusion-physical-plan", @@ -1716,13 +1710,12 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a1641a40b259bab38131c5e6f48fac0717bedb7dc93690e604142a849e0568" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-execution", @@ -1739,13 +1732,12 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adeacdb00c1d37271176f8fb6a1d8ce096baba16ea7a4b2671840c5c9c64fe85" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-execution", @@ -1761,13 +1753,12 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d0b60ffd66f28bfb026565d62b0a6cbc416da09814766a3797bba7d85a3cd9" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "bytes", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-datasource", "datafusion-execution", @@ -1811,12 +1802,12 @@ dependencies = [ "parquet", "pin-project", "pretty_assertions", - "prost 0.13.5", + "prost", "rand 0.8.5", "structopt", "tokio", "tokio-stream", - "tonic 0.13.1", + "tonic", "tower", "tpchgen", "tpchgen-arrow", @@ -1843,12 +1834,12 @@ dependencies = [ "log", "object_store", "parquet", - "prost 0.13.5", + "prost", "serde", "serde_json", "structopt", "tokio", - "tonic 0.13.1", + "tonic", "url", ] @@ -1867,7 +1858,7 @@ dependencies = [ "hyper-util", "tokio", "tokio-stream", - "tonic 0.13.1", + "tonic", "tower", "url", ] @@ -1875,19 +1866,17 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b99e13947667b36ad713549237362afb054b2d8f8cc447751e23ec61202db07" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" [[package]] name = "datafusion-execution" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63695643190679037bc946ad46a263b62016931547bf119859c511f7ff2f5178" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "dashmap", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr", "futures", "log", @@ -1902,13 +1891,12 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a4787cbf5feb1ab351f789063398f67654a6df75c4d37d7f637dc96f951a91" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "chrono", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-doc", "datafusion-expr-common", "datafusion-functions-aggregate-common", @@ -1925,11 +1913,10 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce2fb1b8c15c9ac45b0863c30b268c69dc9ee7a1ee13ecf5d067738338173dc" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "indexmap", "itertools", "paste", @@ -1938,8 +1925,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794a9db7f7b96b3346fc007ff25e994f09b8f0511b4cf7dff651fadfe3ebb28f" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "arrow-buffer", @@ -1947,7 +1933,7 @@ dependencies = [ "blake2", "blake3", "chrono", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-doc", "datafusion-execution", "datafusion-expr", @@ -1968,12 +1954,11 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c25210520a9dcf9c2b2cbbce31ebd4131ef5af7fc60ee92b266dc7d159cb305" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "ahash", "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-doc", "datafusion-execution", "datafusion-expr", @@ -1989,12 +1974,11 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f4a66f3b87300bb70f4124b55434d2ae3fe80455f3574701d0348da040b55d" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "ahash", "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr-common", "datafusion-physical-expr-common", ] @@ -2002,12 +1986,11 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae5c06eed03918dc7fe7a9f082a284050f0e9ecf95d72f57712d1496da03b8c4" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "arrow-ord", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-doc", "datafusion-execution", "datafusion-expr", @@ -2025,13 +2008,12 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4fed1d71738fbe22e2712d71396db04c25de4111f1ec252b8f4c6d3b25d7f5" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "async-trait", "datafusion-catalog", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr", "datafusion-physical-plan", "parking_lot", @@ -2041,11 +2023,10 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d92206aa5ae21892f1552b4d61758a862a70956e6fd7a95cb85db1de74bc6d1" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-doc", "datafusion-expr", "datafusion-functions-window-common", @@ -2059,18 +2040,16 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ae9bcc39800820d53a22d758b3b8726ff84a5a3e24cecef04ef4e5fdf1c7cc" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-physical-expr-common", ] [[package]] name = "datafusion-macros" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1063ad4c9e094b3f798acee16d9a47bd7372d9699be2de21b05c3bd3f34ab848" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "datafusion-doc", "quote", @@ -2080,12 +2059,11 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35f9ec5d08b87fd1893a30c2929f2559c2f9806ca072d8fefca5009dc0f06a" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "chrono", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr", "datafusion-expr-common", "datafusion-physical-expr", @@ -2100,12 +2078,11 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c30cc8012e9eedcb48bbe112c6eff4ae5ed19cf3003cb0f505662e88b7014c5d" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "ahash", "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr", "datafusion-expr-common", "datafusion-functions-aggregate-common", @@ -2117,16 +2094,16 @@ dependencies = [ "parking_lot", "paste", "petgraph", + "tokio", ] [[package]] name = "datafusion-physical-expr-adapter" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9ff2dbd476221b1f67337699eff432781c4e6e1713d2aefdaa517dfbf79768" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr", "datafusion-functions", "datafusion-physical-expr", @@ -2137,12 +2114,11 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90da43e1ec550b172f34c87ec68161986ced70fd05c8d2a2add66eef9c276f03" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "ahash", "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr-common", "hashbrown 0.14.5", "itertools", @@ -2151,11 +2127,10 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9804f799acd7daef3be7aaffe77c0033768ed8fdbf5fb82fc4c5f2e6bc14e6" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-execution", "datafusion-expr", "datafusion-expr-common", @@ -2170,8 +2145,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0acf0ad6b6924c6b1aa7d213b181e012e2d3ec0a64ff5b10ee6282ab0f8532ac" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "ahash", "arrow", @@ -2179,7 +2153,7 @@ dependencies = [ "arrow-schema", "async-trait", "chrono", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", @@ -2201,14 +2175,13 @@ dependencies = [ [[package]] name = "datafusion-proto" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d368093a98a17d1449b1083ac22ed16b7128e4c67789991869480d8c4a40ecb9" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "chrono", "datafusion-catalog", "datafusion-catalog-listing", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-datasource", "datafusion-datasource-arrow", "datafusion-datasource-csv", @@ -2222,28 +2195,26 @@ dependencies = [ "datafusion-physical-plan", "datafusion-proto-common", "object_store", - "prost 0.14.1", + "prost", ] [[package]] name = "datafusion-proto-common" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b6aef3d5e5c1d2bc3114c4876730cb76a9bdc5a8df31ef1b6db48f0c1671895" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", - "datafusion-common", - "prost 0.14.1", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", + "prost", ] [[package]] name = "datafusion-pruning" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2c2498a1f134a9e11a9f5ed202a2a7d7e9774bd9249295593053ea3be999db" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-datasource", "datafusion-expr-common", "datafusion-physical-expr", @@ -2256,11 +2227,10 @@ dependencies = [ [[package]] name = "datafusion-session" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f96eebd17555386f459037c65ab73aae8df09f464524c709d6a3134ad4f4776" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "async-trait", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-execution", "datafusion-expr", "datafusion-physical-plan", @@ -2270,13 +2240,12 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "51.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc195fe60634b2c6ccfd131b487de46dc30eccae8a3c35a13f136e7f440414f" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" dependencies = [ "arrow", "bigdecimal", "chrono", - "datafusion-common", + "datafusion-common 51.0.0 (git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52)", "datafusion-expr", "indexmap", "log", @@ -3267,6 +3236,26 @@ version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +[[package]] +name = "liblzma" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73c36d08cad03a3fbe2c4e7bb3a9e84c57e4ee4135ed0b065cade3d98480c648" +dependencies = [ + "liblzma-sys", +] + +[[package]] +name = "liblzma-sys" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "libm" version = "0.2.15" @@ -3344,17 +3333,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "matchit" version = "0.7.3" @@ -3819,17 +3797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ "bytes", - "prost-derive 0.13.5", -] - -[[package]] -name = "prost" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" -dependencies = [ - "bytes", - "prost-derive 0.14.1", + "prost-derive", ] [[package]] @@ -3845,26 +3813,13 @@ dependencies = [ "syn 2.0.110", ] -[[package]] -name = "prost-derive" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "prost-types" -version = "0.14.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" dependencies = [ - "prost 0.14.1", + "prost", ] [[package]] @@ -4954,7 +4909,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.5", + "prost", "socket2 0.5.10", "tokio", "tokio-stream", @@ -4964,46 +4919,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tonic" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" -dependencies = [ - "async-trait", - "axum 0.8.7", - "base64", - "bytes", - "h2 0.4.12", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.8.1", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "socket2 0.6.1", - "sync_wrapper", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-prost" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" -dependencies = [ - "bytes", - "prost 0.14.1", - "tonic 0.14.2", -] - [[package]] name = "tower" version = "0.5.2" @@ -5614,15 +5529,6 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - [[package]] name = "yansi" version = "1.0.1" @@ -5765,3 +5671,13 @@ dependencies = [ "cc", "pkg-config", ] + +[[patch.unused]] +name = "arrow-avro" +version = "57.1.0" +source = "git+https://github.com/DataDog/arrow-rs?rev=dd2c5a10fd433374c896d62e9e4fee92b4717a7e#dd2c5a10fd433374c896d62e9e4fee92b4717a7e" + +[[patch.unused]] +name = "datafusion-substrait" +version = "51.0.0" +source = "git+https://github.com/DataDog/datafusion?rev=3ae66138c1d6551b29a0039059570c9927a27d52#3ae66138c1d6551b29a0039059570c9927a27d52" diff --git a/Cargo.toml b/Cargo.toml index 24467645..3dafb2a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,3 +73,24 @@ arrow = "57.1.0" tokio-stream = "0.1.17" hyper-util = "0.1.16" pretty_assertions = "1.4" + +[patch.crates-io] +datafusion = { git = "https://github.com/DataDog/datafusion", rev = "3ae66138c1d6551b29a0039059570c9927a27d52", package = "datafusion" } +datafusion-substrait = { git = "https://github.com/DataDog/datafusion", rev = "3ae66138c1d6551b29a0039059570c9927a27d52", package = "datafusion-substrait" } +datafusion-proto = { git = "https://github.com/DataDog/datafusion", rev = "3ae66138c1d6551b29a0039059570c9927a27d52", package = "datafusion-proto" } +datafusion-proto-common = { git = "https://github.com/DataDog/datafusion", rev = "3ae66138c1d6551b29a0039059570c9927a27d52", package = "datafusion-proto-common" } +arrow = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow" } +arrow-flight = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-flight" } +arrow-select = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-select" } +arrow-ord = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-ord" } +arrow-array = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-array" } +arrow-data = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-data" } +arrow-ipc = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-ipc" } +arrow-schema = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-schema" } +arrow-cast = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-cast" } +arrow-buffer = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-buffer" } +arrow-row = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-row" } +arrow-string = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-string" } +arrow-json = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-json" } +arrow-avro = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-avro" } +arrow-arith = { git = "https://github.com/DataDog/arrow-rs", rev = "dd2c5a10fd433374c896d62e9e4fee92b4717a7e", package = "arrow-arith" }