From c77b9ef6957af971a9faa95c0c719c92075b5910 Mon Sep 17 00:00:00 2001 From: Sean Smith Date: Mon, 19 Sep 2022 14:53:55 -0500 Subject: [PATCH] chore: Update to datafusion 12 --- Cargo.lock | 122 ++++++++++++----------------------- crates/arrowstore/Cargo.toml | 4 +- crates/dfutil/Cargo.toml | 2 +- crates/pgsrv/Cargo.toml | 2 +- crates/sqlexec/Cargo.toml | 2 +- 5 files changed, 45 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6cf74bb9d..58d66bada 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -167,33 +167,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -[[package]] -name = "arrow" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72a69495f06c8abb65b76a87be192a26fa724380d1f292d4e558a32afed9989" -dependencies = [ - "ahash 0.7.6", - "bitflags", - "chrono", - "comfy-table 6.1.0", - "csv", - "flatbuffers", - "half", - "hashbrown", - "hex", - "indexmap", - "lazy_static", - "lexical-core", - "multiversion", - "num", - "regex", - "regex-syntax", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "arrow" version = "22.0.0" @@ -203,6 +176,7 @@ dependencies = [ "ahash 0.8.0", "bitflags", "chrono", + "comfy-table 6.1.0", "csv", "flatbuffers", "half", @@ -262,7 +236,7 @@ dependencies = [ name = "arrowstore" version = "0.1.0" dependencies = [ - "arrow 22.0.0", + "arrow", "async-trait", "datafusion", "datafusion-proto", @@ -1241,12 +1215,12 @@ dependencies = [ [[package]] name = "datafusion" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430b3983c7164cb113f297f45b68a69893c212cb4b80a8aeb6a8069eb93f745e" +checksum = "2aca80caa2b0f7fdf267799b8895ac8b6341ea879db6b1e2d361ec49b47bc676" dependencies = [ - "ahash 0.7.6", - "arrow 20.0.0", + "ahash 0.8.0", + "arrow", "async-trait", "bytes", "chrono", @@ -1271,7 +1245,7 @@ dependencies = [ "pin-project-lite 0.2.9", "rand 0.8.5", "smallvec", - "sqlparser 0.20.0", + "sqlparser 0.23.0", "tempfile", "tokio", "tokio-stream", @@ -1281,37 +1255,37 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "594210b4819cc786d1a3dc7b17ff4f9b0c6ee522bcd0a4a52f80a41fd38d53c4" +checksum = "7721fd550f6a28ad7235b62462aa51e9a43b08f8346d5cbe4d61f1e83f5df511" dependencies = [ - "arrow 20.0.0", + "arrow", "object_store", "ordered-float 3.0.0", "parquet", "serde_json", - "sqlparser 0.20.0", + "sqlparser 0.23.0", ] [[package]] name = "datafusion-expr" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91d4a86776ce8f7fe5df34955481d6fe77876dd278bf13098d6a1bdd3c24fb8" +checksum = "2d81255d043dc594c0ded6240e8a9be6ce8d7c22777a5093357cdb97af3d29ce" dependencies = [ - "ahash 0.7.6", - "arrow 20.0.0", + "ahash 0.8.0", + "arrow", "datafusion-common", - "sqlparser 0.20.0", + "sqlparser 0.23.0", ] [[package]] name = "datafusion-optimizer" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360f86f7dc943ca8e0da39982febac0a0fc0329d7ee58ea046438c9fed6dfec8" +checksum = "71b39f8c75163691fff72b4a71816ad5a912e7c6963ee55f29ed1910b5a6993f" dependencies = [ - "arrow 20.0.0", + "arrow", "async-trait", "chrono", "datafusion-common", @@ -1323,12 +1297,12 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a465299f2eeb2741b33777b42f607fe56458e137d0d7b80f69be72e771a48b81" +checksum = "109c4138220a109feafb63bf05418b86b17a42ece4bf047c38e4fd417572a9f7" dependencies = [ - "ahash 0.7.6", - "arrow 20.0.0", + "ahash 0.8.0", + "arrow", "blake2", "blake3 1.3.1", "chrono", @@ -1348,11 +1322,11 @@ dependencies = [ [[package]] name = "datafusion-proto" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394d1f43af3f8536f1f843c9ed2fc46e773939941a006e97dec8e9d37d9989e5" +checksum = "23ff1bd4294e862a1bd6d6c4278fee8d149f5125c138b9a3fb795540d8d9222e" dependencies = [ - "arrow 20.0.0", + "arrow", "datafusion", "datafusion-common", "datafusion-expr", @@ -1362,11 +1336,11 @@ dependencies = [ [[package]] name = "datafusion-row" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "959a42a1f35c8fa1b47698df6995ab5ae8477e81c9c42852476666aeac4f80b7" +checksum = "87a178fc0fd7693d9c9f608f7b605823eb982c6731ede0cccd99e2319cacabbc" dependencies = [ - "arrow 20.0.0", + "arrow", "datafusion-common", "paste", "rand 0.8.5", @@ -1374,16 +1348,16 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c69404e8774fe2c7d64998e94d856f32d3a908f9dc7215ce01e09895f13b4b62" +checksum = "148cb56e7635faff3b16019393c49b988188c3fdadd1ca90eadb322a80aa1128" dependencies = [ - "ahash 0.7.6", - "arrow 20.0.0", + "ahash 0.8.0", + "arrow", "datafusion-common", "datafusion-expr", "hashbrown", - "sqlparser 0.20.0", + "sqlparser 0.23.0", "tokio", ] @@ -1974,12 +1948,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "hkdf" version = "0.10.0" @@ -2740,9 +2708,9 @@ dependencies = [ [[package]] name = "object_store" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3845781c5ecf37b3e3610df73fff11487591eba423a987e1b21bb4d389c326" +checksum = "2168fee79ee3e7695905bc3a48777d807f82d956f821186fa7a2601c1295a73e" dependencies = [ "async-trait", "bytes", @@ -2892,15 +2860,14 @@ dependencies = [ [[package]] name = "parquet" -version = "20.0.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f0af698fcf8d1d9f2971766ebef25821ffe8c39c91837c276dcd97e075d950" +checksum = "474c423be6f10921adab3b94b42ec7fe87c1b87e1360dee150976caee444224f" dependencies = [ - "ahash 0.7.6", - "arrow 20.0.0", + "ahash 0.8.0", + "arrow", "base64 0.13.0", "brotli", - "byteorder", "bytes", "chrono", "flate2", @@ -3949,15 +3916,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sqlparser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c67d4d5de027da1da5a4ed4623f09ab5131d808364279a5f5abee5de9b8db3" -dependencies = [ - "log", -] - [[package]] name = "sqlparser" version = "0.23.0" diff --git a/crates/arrowstore/Cargo.toml b/crates/arrowstore/Cargo.toml index 720145ccd..ef12de67c 100644 --- a/crates/arrowstore/Cargo.toml +++ b/crates/arrowstore/Cargo.toml @@ -16,8 +16,8 @@ async-trait = "0.1.56" tonic = { version = "0.8.0", features = ["transport", "codegen"] } prost = "0.11.0" futures = "0.3" -datafusion = "11.0.0" -datafusion-proto = "11.0.0" +datafusion = "12.0.0" +datafusion-proto = "12.0.0" serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" diff --git a/crates/dfutil/Cargo.toml b/crates/dfutil/Cargo.toml index 91159bd84..1f28a15dc 100644 --- a/crates/dfutil/Cargo.toml +++ b/crates/dfutil/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -datafusion = "11.0" +datafusion = "12.0" diff --git a/crates/pgsrv/Cargo.toml b/crates/pgsrv/Cargo.toml index ababaa5d1..ca712d935 100644 --- a/crates/pgsrv/Cargo.toml +++ b/crates/pgsrv/Cargo.toml @@ -15,7 +15,7 @@ thiserror = "1.0" tracing = "0.1" async-trait = "0.1.56" futures = "0.3.21" -datafusion = "11.0" +datafusion = "12.0" tokio-util = { version = "0.7.3", features = ["codec"] } bytes = "1.2.1" tokio = { version = "1", features = ["full"] } diff --git a/crates/sqlexec/Cargo.toml b/crates/sqlexec/Cargo.toml index ade17c9ad..655f15d05 100644 --- a/crates/sqlexec/Cargo.toml +++ b/crates/sqlexec/Cargo.toml @@ -13,7 +13,7 @@ thiserror = "1.0" parking_lot = "0.12.1" tokio = { version = "1", features = ["full"] } sqlparser = "0.23.0" -datafusion = "11.0" +datafusion = "12.0" futures = "0.3.21" tracing = "0.1" async-trait = "0.1.56"