Refactor dependency imports

Cargo.toml

@@ -17,18 +17,7 @@ description = "Embeddable stream processing engine"
 
 [workspace.dependencies]
 df-streams-core = { path = "crates/core" }
-
-datafusion = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-common = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-expr = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-functions = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-functions-aggregate = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-optimizer = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-physical-expr = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-physical-plan = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-physical-optimizer = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-sql = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
-datafusion-execution = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }
+datafusion = "40.0"
 
 arrow = { version = "52.0.0", features = ["prettyprint"] }
 arrow-array = { version = "52.0.0", default-features = false, features = [
@@ -59,3 +48,6 @@ serde_json = "1"
 base64 = "0.22.1"
 chrono = { version = "0.4.38", default-features = false }
 itertools = "0.13"
+
+[patch.crates-io]
+datafusion = { git = "https://github.com/probably-nothing-labs/arrow-datafusion" }

crates/core/Cargo.toml

@@ -5,12 +5,6 @@ edition = { workspace = true }
 
 [dependencies]
 datafusion = { workspace = true }
-datafusion-expr = { workspace = true }
-datafusion-common = { workspace = true }
-datafusion-execution = { workspace = true }
-datafusion-physical-expr = { workspace = true }
-datafusion-physical-plan = { workspace = true }
-datafusion-physical-optimizer = { workspace = true }
 
 arrow = { workspace = true }
 arrow-schema = { workspace = true }

crates/core/src/config_extensions/denormalized_config.rs

@@ -1,5 +1,5 @@
 use datafusion::config::ConfigExtension;
-use datafusion_common::extensions_options;
+use datafusion::common::extensions_options;
 
 extensions_options! {
     pub struct DenormalizedConfig {

crates/core/src/context.rs

@@ -6,7 +6,7 @@ use datafusion::execution::{
     config::SessionConfig, context::SessionContext, runtime_env::RuntimeEnv,
     session_state::SessionStateBuilder,
 };
-use datafusion_common::{DataFusionError, Result};
+use datafusion::common::{DataFusionError, Result};
 
 use crate::datasource::kafka::TopicReader;
 use crate::datastream::DataStream;
@@ -23,7 +23,7 @@ impl Context {
     pub fn new() -> Result<Self, DataFusionError> {
         let config = SessionConfig::new().set(
             "datafusion.execution.batch_size",
-            datafusion_common::ScalarValue::UInt64(Some(32)),
+            datafusion::common::ScalarValue::UInt64(Some(32)),
         );
         let runtime = Arc::new(RuntimeEnv::default());