cleanup

Author: Jeadie

datafusion-federation/src/lib.rs

@@ -64,7 +64,7 @@ pub trait FederationProvider: Send + Sync + std::fmt::Debug {
     //
     // Returns [`None`] if either the provider cannot federate any plan
     // (e.g. [`crate::analyzer::NopFederationProvider`]), or cannot federate
-    //  this [`LogicalPlan`].
+    //  this specific [`LogicalPlan`].
     fn analyzer(&self, plan: &LogicalPlan) -> Option<Arc<Analyzer>>;
 }
 

datafusion-federation/src/sql/mod.rs

@@ -84,7 +84,6 @@ impl FederationProvider for SQLFederationProvider {
     }
 }
 
-/// This is actually where we figure out how much of the LP we can federate.
 #[derive(Debug)]
 struct SQLFederationAnalyzerRule {
     planner: Arc<SQLFederationPlanner>,

integration-test/src/main.rs

@@ -3,9 +3,6 @@ mod validation;
 
 use anyhow::{anyhow, Result};
 use bench::{Benchmark, Query};
-use datafusion::catalog::TableProvider;
-use datafusion_federation::sql::{SQLFederationProvider, SQLTableSource};
-use datafusion_federation::FederatedTableProviderAdaptor;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
@@ -82,7 +79,7 @@ fn get_duckdb_table_factory(db_name: String) -> Result<DuckDBTableFactory> {
         .map_err(|e| anyhow!("Failed to create DuckDB connection pool: {}", e))?,
     );
 
-    Ok(DuckDBTableFactory::new(duckdb_pool))
+    Ok(DuckDBTableFactory::new(duckdb_pool)
 }
 
 #[tokio::main]
@@ -152,16 +149,13 @@ async fn register_federated_duckdb_tables(
     duckdb_table_factory: &DuckDBTableFactory,
 ) -> Result<()> {
     for table_name in table_names {
-        let tbl: Arc<dyn TableProvider> = Arc::new(
+        ctx.register_table(
+            &table_name,
             duckdb_table_factory
-                .table_provider_fed(TableReference::bare(table_name.as_str()))
+                .table_provider(TableReference::bare(table_name.as_str()))
                 .await
                 .map_err(|e| anyhow!("Failed to register duckdb table: {}", e))?,
-        );
-        tbl.as_any()
-            .downcast_ref::<FederatedTableProviderAdaptor>()
-            .expect("was not 'FederatedTableProviderAdaptor");
-        ctx.register_table(&table_name, tbl)?;
+        )?;
     }
 
     Ok(())