rework dependencies; bump df to 45.0.0

Signed-off-by: Yuchen Liang <[email protected]>

Cargo.toml

@@ -1,3 +1,10 @@
 [workspace]
 members = ["optd-core", "optd-datafusion"]
 resolver = "2"
+
+
+[workspace.dependencies]
+anyhow = "1.0"
+trait-variant = "0.1.2"
+async-recursion = "1.1.1"
+tokio = { version = "1.43.0", features = ["full"] }

optd-core/Cargo.toml

@@ -4,16 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-sqlx = { version = "0.8", features = [ "sqlite", "runtime-tokio", "migrate" ] }
-trait-variant = "0.1.2"
-
 # Pin more recent versions for `-Zminimal-versions`.
 proc-macro2 = "1.0.60" # For a missing feature (https://github.com/rust-lang/rust/issues/113152).
-anyhow = "1.0.95"
-tokio = { version = "1.43.0", features = ["full"] }
+tokio.workspace = true
+anyhow.workspace = true
+async-recursion.workspace = true
+trait-variant.workspace = true
+sqlx = { version = "0.8", features = [ "sqlite", "runtime-tokio", "migrate" ] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1", features = ["raw_value"] }
 dotenvy = "0.15"
-async-recursion = "1.1.1"
 pest = "2.7.15"
 pest_derive = "2.7.15"

optd-core/src/storage/memo.rs

@@ -24,6 +24,7 @@ use crate::{
 };
 
 /// A Storage manager that manages connections to the database.
+#[derive(Debug)]
 pub struct SqliteMemo {
     /// A async connection pool to the SQLite database.
     db: SqlitePool,

optd-datafusion/Cargo.toml

@@ -4,18 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.95"
-arrow = "54.0.0"
+anyhow.workspace = true
 async-trait = "0.1.85"
-datafusion = "44.0.0"
+datafusion = "45.0.0"
 futures = "0.3.31"
 itertools = "0.14.0"
-tokio = { version = "1.43", default-features = false, features = [
-    "rt",
-    "rt-multi-thread",
-    "macros",
-] }
-trait-variant = "0.1.2"
+tokio.workspace = true
+trait-variant.workspace = true 
 optd-core = { path = "../optd-core" }
-async-recursion = "1"
+async-recursion.workspace = true
 

optd-datafusion/src/converter/from_optd.rs

@@ -111,8 +111,13 @@ impl ConversionContext<'_> {
                     datafusion::physical_plan::joins::NestedLoopJoinExec::try_new(
                         left_exec,
                         right_exec,
-                        Some(JoinFilter::new(physical_expr, column_idxs, filter_schema)),
+                        Some(JoinFilter::new(
+                            physical_expr,
+                            column_idxs,
+                            Arc::new(filter_schema),
+                        )),
                         &join_type,
+                        None,
                     )?,
                 ) as Arc<dyn ExecutionPlan + 'static>)
             }

optd-datafusion/src/lib.rs

@@ -6,8 +6,7 @@
 #![allow(clippy::new_without_default)]
 use std::sync::Arc;
 
-use datafusion::catalog::CatalogProviderList;
-use datafusion::catalog_common::MemoryCatalogProviderList;
+use datafusion::catalog::{CatalogProviderList, MemoryCatalogProviderList};
 use datafusion::common::Result;
 use datafusion::execution::runtime_env::RuntimeEnvBuilder;
 use datafusion::execution::SessionStateBuilder;

optd-datafusion/src/planner.rs

@@ -16,6 +16,7 @@ use optd_core::{
 use crate::converter::ConversionContext;
 
 /// A mock optimizer for testing purposes.
+#[derive(Debug)]
 pub struct OptdOptimizer {
     memo: SqliteMemo,
 }
@@ -96,6 +97,7 @@ impl OptdOptimizer {
 /// The physical plan is created by converting the logical plan to an OptD logical plan,
 /// and then running the optd optimizer on the logical plan and then converting it back.
 /// This is the entry point for OptD.
+#[derive(Debug)]
 pub struct OptdQueryPlanner {
     pub optimizer: Arc<OptdOptimizer>,
 }
@@ -167,13 +169,7 @@ impl OptdQueryPlanner {
     }
 }
 
-impl std::fmt::Debug for OptdQueryPlanner {
-    /// Writes the `OptdQueryPlanner` struct to a formatter, usually for debugging purposes.
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "OptdQueryPlanner")
-    }
-}
-
+// making it `async_trait` only because datafusion is taking it.
 #[async_trait]
 impl QueryPlanner for OptdQueryPlanner {
     /// This function is the entry point for the physical planner. It calls the inner function