Resolve conflicts with main

Cargo.toml

@@ -14,28 +14,29 @@ default-run = "dft"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-arrow-flight = { version = "53.0.0", features = [
+arrow-flight = { version = "54.1.0", features = [
   "flight-sql-experimental",
 ], optional = true }
 async-trait = "0.1.80"
+chrono = "=0.4.39"
 clap = { version = "4.5.27", features = ["derive"] }
 color-eyre = "0.6.3"
 crossterm = { version = "0.28.1", features = ["event-stream"] }
-datafusion = "43.0.0"
+datafusion = { version = "45.0.0" }
 datafusion-auth = { version = "0.1.0", path = "crates/datafusion-auth", optional = true }
-datafusion-common = "43.0.0"
-datafusion-functions-json = { version = "0.43.0", optional = true }
+datafusion-functions-json = { version = "0.45", optional = true }
 datafusion-functions-parquet = { version = "0.1.0", path = "crates/datafusion-functions-parquet", optional = true }
 datafusion-udfs-wasm = { version = "0.1.0", path = "crates/datafusion-udfs-wasm", features = ["serde"], optional = true }
-deltalake = { version = "0.22.0", features = ["datafusion"], optional = true }
+deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "d8995e64c305dc795f62d33ce2a4614b335944ff", features = ["datafusion"], optional = true }
 directories = "5.0.1"
 env_logger = "0.11.5"
 futures = "0.3.30"
+home = "=0.5.9"
 http = "1"
 http-body = "1"
-hudi = { version = "0.3.0", features = ["datafusion"], optional = true }
-iceberg-catalog-rest = { version = "0.4", optional = true }
-iceberg-datafusion = { version = "0.4", optional = true }
+hudi = { git = "https://github.com/apache/hudi-rs", rev = "eab36e2d3ea39372c52d2bf6fe41c9aa406c0bea", features = ["datafusion"], optional = true }
+iceberg-catalog-rest = { git = "https://github.com/apache/iceberg-rust", rev = "210134573569be0b6e49464aca076cb122e33e24", optional = true }
+iceberg-datafusion = { git = "https://github.com/apache/iceberg-rust", rev = "210134573569be0b6e49464aca076cb122e33e24", optional = true }
 itertools = "0.13.0"
 lazy_static = "1.4.0"
 log = "0.4.22"
@@ -48,7 +49,7 @@ opendal = { version = "0.51", features = [
 ], optional = true }
 object_store_opendal = { version = "0.49", optional = true }
 parking_lot = "0.12.3"
-parquet = "53.0.0"
+parquet = "54.1.0"
 pin-project-lite = { version = "0.2.14" }
 prost = "0.13.1"
 ratatui = "0.28.0"

crates/datafusion-functions-parquet/Cargo.toml

@@ -11,16 +11,7 @@ edition = "2021"
 keywords = ["parquet", "query", "sql", "datafusion"]
 
 [dependencies]
-arrow = { version = "53.0.0" }
+arrow = { version = "54.1.0" }
 async-trait = "0.1.41"
-datafusion = { version = "43.0.0", features = [
-  "avro",
-  "crypto_expressions",
-  "datetime_expressions",
-  "encoding_expressions",
-  "parquet",
-  "regex_expressions",
-  "unicode_expressions",
-  "compression",
-] }
-parquet = { version = "53.0.0", default-features = false }
+datafusion = { version = "45.0.0" }
+parquet = { version = "54.1.0", default-features = false }

crates/datafusion-functions-parquet/src/lib.rs

@@ -21,8 +21,8 @@ use arrow::record_batch::RecordBatch;
 use async_trait::async_trait;
 
 use datafusion::catalog::Session;
+use datafusion::catalog::TableFunctionImpl;
 use datafusion::common::{plan_err, Column};
-use datafusion::datasource::function::TableFunctionImpl;
 use datafusion::datasource::TableProvider;
 use datafusion::error::Result;
 use datafusion::logical_expr::Expr;

crates/datafusion-udfs-wasm/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-datafusion = "43.0.0"
+datafusion = {version ="45.0.0", default-features = false}
 log = "0.4.25"
 serde = { version = "1.0.217", optional = true }
 wasi-common = "29.0.1"

rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.83.0"
+channel = "1.84.0"

src/execution/stats.rs

@@ -382,7 +382,7 @@ impl From<PlanIOVisitor> for ExecutionIOStats {
 }
 
 impl ExecutionPlanVisitor for PlanIOVisitor {
-    type Error = datafusion_common::DataFusionError;
+    type Error = datafusion::common::DataFusionError;
 
     fn pre_visit(&mut self, plan: &dyn ExecutionPlan) -> color_eyre::Result<bool, Self::Error> {
         if is_io_plan(plan) {
@@ -712,7 +712,7 @@ impl From<PlanComputeVisitor> for ExecutionComputeStats {
 }
 
 impl ExecutionPlanVisitor for PlanComputeVisitor {
-    type Error = datafusion_common::DataFusionError;
+    type Error = datafusion::common::DataFusionError;
 
     fn pre_visit(&mut self, plan: &dyn ExecutionPlan) -> color_eyre::Result<bool, Self::Error> {
         if !is_io_plan(plan) {

src/extensions/builder.rs

@@ -18,8 +18,8 @@
 //! [`DftSessionStateBuilder`] for configuring DataFusion [`SessionState`]
 
 use color_eyre::eyre;
+use datafusion::catalog::MemoryCatalogProviderList;
 use datafusion::catalog::{CatalogProvider, CatalogProviderList, TableProviderFactory};
-use datafusion::catalog_common::MemoryCatalogProviderList;
 use datafusion::execution::context::SessionState;
 use datafusion::execution::runtime_env::RuntimeEnv;
 use datafusion::execution::session_state::SessionStateBuilder;
@@ -164,7 +164,7 @@ impl DftSessionStateBuilder {
     }
 
     /// Build the [`SessionState`] from the specified configuration
-    pub fn build(self) -> datafusion_common::Result<SessionState> {
+    pub fn build(self) -> datafusion::common::Result<SessionState> {
         let Self {
             app_type,
             execution_config,

src/extensions/deltalake.rs

@@ -37,7 +37,7 @@ impl Extension for DeltaLakeExtension {
         &self,
         _config: ExecutionConfig,
         builder: &mut DftSessionStateBuilder,
-    ) -> datafusion_common::Result<()> {
+    ) -> datafusion::common::Result<()> {
         println!("Registering deltalake");
         builder.add_table_factory("DELTATABLE", Arc::new(DeltaTableFactory {}));
         Ok(())

src/extensions/hudi.rs

@@ -37,7 +37,7 @@ impl Extension for HudiExtension {
         &self,
         _config: ExecutionConfig,
         builder: &mut DftSessionStateBuilder,
-    ) -> datafusion_common::Result<()> {
+    ) -> datafusion::common::Result<()> {
         builder.add_table_factory("HUDI", Arc::new(HudiTableFactory {}));
         Ok(())
     }

src/extensions/huggingface.rs

@@ -19,7 +19,7 @@
 
 use crate::config::ExecutionConfig;
 use crate::extensions::{DftSessionStateBuilder, Extension};
-use datafusion_common::DataFusionError;
+use datafusion::common::DataFusionError;
 use log::info;
 use std::sync::Arc;
 
@@ -41,7 +41,7 @@ impl Extension for HuggingFaceExtension {
         &self,
         config: ExecutionConfig,
         builder: &mut DftSessionStateBuilder,
-    ) -> datafusion_common::Result<()> {
+    ) -> datafusion::common::Result<()> {
         let Some(object_store_config) = &config.object_store else {
             return Ok(());
         };
@@ -72,7 +72,7 @@ impl Extension for HuggingFaceExtension {
 
                 let operator = Operator::new(hf_builder)
                     .map_err(|e| {
-                        datafusion_common::error::DataFusionError::External(e.to_string().into())
+                        datafusion::common::error::DataFusionError::External(e.to_string().into())
                     })?
                     .finish();
 

src/extensions/iceberg.rs

@@ -19,7 +19,7 @@
 
 use crate::config::ExecutionConfig;
 use crate::extensions::{DftSessionStateBuilder, Extension};
-use datafusion_common::DataFusionError;
+use datafusion::common::DataFusionError;
 use iceberg_catalog_rest::{RestCatalog, RestCatalogConfig};
 use iceberg_datafusion::{IcebergCatalogProvider, IcebergTableProviderFactory};
 use std::sync::Arc;
@@ -39,7 +39,7 @@ impl Extension for IcebergExtension {
         &self,
         config: ExecutionConfig,
         builder: &mut DftSessionStateBuilder,
-    ) -> datafusion_common::Result<()> {
+    ) -> datafusion::common::Result<()> {
         for cfg in config.iceberg.rest_catalogs {
             let rest_catalog_config = RestCatalogConfig::builder().uri(cfg.addr).build();
             let rest_catalog = RestCatalog::new(rest_catalog_config);

src/extensions/s3.rs

@@ -39,7 +39,7 @@ impl Extension for AwsS3Extension {
         &self,
         config: ExecutionConfig,
         builder: &mut DftSessionStateBuilder,
-    ) -> datafusion_common::Result<()> {
+    ) -> datafusion::common::Result<()> {
         let Some(object_store_config) = &config.object_store else {
             return Ok(());
         };

tests/extension_cases/mod.rs

@@ -34,8 +34,8 @@ mod udfs_wasm;
 
 use datafusion::arrow::array::RecordBatch;
 use datafusion::arrow::util::pretty::pretty_format_batches;
+use datafusion::common::Result;
 use datafusion::sql::parser::DFParser;
-use datafusion_common::Result;
 use datafusion_dft::execution::local::ExecutionContext;
 use datafusion_dft::extensions::DftSessionStateBuilder;
 use datafusion_dft::{config::AppConfig, execution::AppType};