Use latest DataFusion rev in preparation for DF 18 release (#174)

apache · Feb 11, 2023 · f7e1c21 · f7e1c21
1 parent 35fded6
commit f7e1c21
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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="a265509b272084e758b9ec21f2133856f56e617d", features = ["pyarrow", "avro"] }
-datafusion-expr = { git="https://github.com/apache/arrow-datafusion.git", rev="a265509b272084e758b9ec21f2133856f56e617d" }
-datafusion-optimizer = { git="https://github.com/apache/arrow-datafusion.git", rev="a265509b272084e758b9ec21f2133856f56e617d" }
-datafusion-common = { git="https://github.com/apache/arrow-datafusion.git", rev="a265509b272084e758b9ec21f2133856f56e617d", features = ["pyarrow"] }
-datafusion-substrait = { git="https://github.com/apache/arrow-datafusion.git", rev="a265509b272084e758b9ec21f2133856f56e617d" }
+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" }
 uuid = { version = "1.2", features = ["v4"] }
 mimalloc = { version = "*", optional = true, default-features = false }
 async-trait = "0.1"

diff --git a/src/substrait.rs b/src/substrait.rs
@@ -19,10 +19,12 @@ use pyo3::prelude::*;
 
 use crate::context::PySessionContext;
 use crate::errors::py_datafusion_err;
+use crate::errors::DataFusionError;
 use crate::{logical::PyLogicalPlan, utils::wait_for_future};
 
-use crate::errors::DataFusionError;
-use datafusion_substrait::{consumer, producer, serializer, substrait::proto::Plan};
+use datafusion_substrait::logical_plan::{consumer, producer};
+use datafusion_substrait::serializer;
+use datafusion_substrait::substrait::proto::Plan;
 
 #[pyclass(name = "plan", module = "datafusion.substrait", subclass, unsendable)]
 #[derive(Debug, Clone)]