diff --git a/Cargo.lock b/Cargo.lock index 585e64cb..026dd483 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -688,8 +688,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e3bb3a788d9fa793268e9cec2601d79831ed1be437ba74d1deb32b226ae734" dependencies = [ "ahash", "apache-avro", @@ -738,24 +739,35 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd256483875270612d4fa439359bafa6f1760bae080ecb69eecc59a92b5016f" dependencies = [ "apache-avro", "arrow", "arrow-array", + "async-compression", + "bytes", + "bzip2", "chrono", + "flate2", + "futures", "num_cpus", "object_store", "parquet", "pyo3", "sqlparser", + "tokio", + "tokio-util", + "xz2", + "zstd", ] [[package]] name = "datafusion-execution" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4973610d680bdc38f409a678c838d3873356cc6c29a543d1f56d7b4801e8d0a4" dependencies = [ "arrow", "dashmap", @@ -773,8 +785,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3599f4cfcf22490f7b7d6d2fc70610ca8045b8bdcd99ef9d4309cf2b387537" dependencies = [ "ahash", "arrow", @@ -787,8 +800,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f067401eea6a0967c83021e714746f9153368cca964d45c4a1a4f99869a1512f" dependencies = [ "arrow", "async-trait", @@ -804,8 +818,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "964c19161288d374fe066535f84de37a1dab419e47a24e02f3a0ca6413744451" dependencies = [ "ahash", "arrow", @@ -865,8 +880,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0939df21e440efcb35078c22b0192c537f7a53ebf1a34288a3a134753dd364" dependencies = [ "arrow", "arrow-schema", @@ -878,8 +894,9 @@ dependencies = [ [[package]] name = "datafusion-substrait" -version = "29.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=29.0.0-rc1#8265e99d05382fca57cc7399f8ee241966f4a1f5" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dcfeab7816290f77c76f9b54f71d0bad66ecf33a2e601f2c92564438b429067" dependencies = [ "async-recursion", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 169d3f5d..e948ceb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,12 +36,12 @@ protoc = [ "datafusion-substrait/protoc" ] tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync"] } rand = "0.8" pyo3 = { version = "0.19", features = ["extension-module", "abi3", "abi3-py38"] } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1", features = ["pyarrow", "avro"] } -datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1", features = ["pyarrow"] } -datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" } -datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" } -datafusion-sql = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" } -datafusion-substrait = { git = "https://github.com/apache/arrow-datafusion.git", rev = "29.0.0-rc1" } +datafusion = { version = "30.0.0", features = ["pyarrow", "avro"] } +datafusion-common = { version = "30.0.0", features = ["pyarrow"] } +datafusion-expr = { version = "30.0.0" } +datafusion-optimizer = { version = "30.0.0" } +datafusion-sql = { version = "30.0.0" } +datafusion-substrait = { version = "30.0.0" } prost = "0.11" prost-types = "0.11" uuid = { version = "1.3", features = ["v4"] } diff --git a/src/context.rs b/src/context.rs index c7f89f2e..b5ba4d87 100644 --- a/src/context.rs +++ b/src/context.rs @@ -41,7 +41,7 @@ use crate::utils::{get_tokio_runtime, wait_for_future}; use datafusion::arrow::datatypes::{DataType, Schema}; use datafusion::arrow::pyarrow::PyArrowType; use datafusion::arrow::record_batch::RecordBatch; -use datafusion::datasource::file_format::file_type::FileCompressionType; +use datafusion::common::FileCompressionType; use datafusion::datasource::MemTable; use datafusion::datasource::TableProvider; use datafusion::execution::context::{SessionConfig, SessionContext, TaskContext};