From 961250c31aeea4b9eb7169cfcedd260540d3d1e7 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Mon, 13 Feb 2023 15:11:08 -0700 Subject: [PATCH] Upgrade to DataFusion 18.0.0 --- .gitignore | 1 - Cargo.lock | 64 ++++++++++++++++++++++++++++++------------------------ Cargo.toml | 10 ++++----- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 7785b3c46..4e4450082 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ target -Cargo.lock /venv .idea /docs/temp diff --git a/Cargo.lock b/Cargo.lock index 6ca4adbee..2d6fffb2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -618,9 +618,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "90d59d9acd2a682b4e40605a242f6670eaa58c5957471cbf85e8aa6a0b97a5e8" dependencies = [ "cc", "cxxbridge-flags", @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "ebfa40bda659dd5c864e65f4c9a2b0aff19bea56b017b9b77c73d3766a453a38" dependencies = [ "cc", "codespan-reporting", @@ -645,15 +645,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "457ce6757c5c70dc6ecdbda6925b958aae7f959bda7d8fb9bde889e34a09dc03" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263" dependencies = [ "proc-macro2", "quote", @@ -675,8 +675,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd805bdf93d3137b37fd9966042df0c84ddfca0df5a8d32eaacb16cf6ab0d93d" dependencies = [ "ahash", "apache-avro", @@ -723,8 +724,9 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c58d6714427f52f9815d19debab7adab5bac5b4d2a99d51c250e606acb6cf5" dependencies = [ "apache-avro", "arrow", @@ -738,8 +740,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a32ee054230dd9a57d0bed587406869c4a7814d90154616aff2cb9991c1756f" dependencies = [ "ahash", "arrow", @@ -750,8 +753,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6de4d144924de29a835feeff8313a81fdc2c7190111301508e09ea59a80edbbc" dependencies = [ "arrow", "async-trait", @@ -766,8 +770,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943e42356f0f6f5ac37ceacd412de9c4d7d8eba1e81b6f724f88699540c7f070" dependencies = [ "ahash", "arrow", @@ -817,8 +822,9 @@ dependencies = [ [[package]] name = "datafusion-row" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a506f5924f8af54e0806a995da0897f8c2b548d492793e045a3896d88d6714a" dependencies = [ "arrow", "datafusion-common", @@ -828,8 +834,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3d12047a5847f9667f4e2aa8fa2e7d5a6e1094b8e3546d58de492152a50dc7" dependencies = [ "arrow-schema", "datafusion-common", @@ -840,8 +847,9 @@ dependencies = [ [[package]] name = "datafusion-substrait" -version = "17.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=8a262c3ec0a100607ae97641d7a374c847a71f20#8a262c3ec0a100607ae97641d7a374c847a71f20" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583485c8cf64a5b91b82a3bbd8bb5ab395ca1f74f16b75b3a30d8d6fecd309be" dependencies = [ "async-recursion", "chrono", @@ -2515,9 +2523,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "tempfile" @@ -2662,9 +2670,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6a3b08b64e6dfad376fa2432c7b1f01522e37a623c3050bc95db2d3ff21583" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index 30e04545e..642da2d9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,11 +34,11 @@ default = ["mimalloc"] tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync"] } rand = "0.8" pyo3 = { version = "0.18.0", features = ["extension-module", "abi3", "abi3-py37"] } -datafusion = { git="https://github.com/apache/arrow-datafusion.git", rev="8a262c3ec0a100607ae97641d7a374c847a71f20", features = ["pyarrow", "avro"] } -datafusion-expr = { git="https://github.com/apache/arrow-datafusion.git", rev="8a262c3ec0a100607ae97641d7a374c847a71f20" } -datafusion-optimizer = { git="https://github.com/apache/arrow-datafusion.git", rev="8a262c3ec0a100607ae97641d7a374c847a71f20" } -datafusion-common = { git="https://github.com/apache/arrow-datafusion.git", rev="8a262c3ec0a100607ae97641d7a374c847a71f20", features = ["pyarrow"] } -datafusion-substrait = { git="https://github.com/apache/arrow-datafusion.git", rev="8a262c3ec0a100607ae97641d7a374c847a71f20" } +datafusion = { version = "18.0.0", features = ["pyarrow", "avro"] } +datafusion-expr = "18.0.0" +datafusion-optimizer = "18.0.0" +datafusion-common = { version = "18.0.0", features = ["pyarrow"] } +datafusion-substrait = "18.0.0" uuid = { version = "1.2", features = ["v4"] } mimalloc = { version = "*", optional = true, default-features = false } async-trait = "0.1"