Move catalog_common out of core

datafusion/catalog/Cargo.toml

@@ -42,6 +42,7 @@ datafusion-sql = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
+object_store = { workspace = true }
 parking_lot = { workspace = true }
 
 [dev-dependencies]

datafusion/catalog/src/lib.rs

@@ -26,25 +26,17 @@
 //! Implementations
 //! * Information schema: [`information_schema`]
 //! * Simple memory based catalog: [`MemoryCatalogProviderList`], [`MemoryCatalogProvider`], [`MemorySchemaProvider`]
+//! * Listing schema: [`listing_schema`]
 
 pub mod memory;
-#[deprecated(
-    since = "46.0.0",
-    note = "use datafusion_sql::resolve::resolve_table_references"
-)]
-pub use datafusion_sql::resolve::resolve_table_references;
-#[deprecated(
-    since = "46.0.0",
-    note = "use datafusion_common::{ResolvedTableReference, TableReference}"
-)]
-pub use datafusion_sql::{ResolvedTableReference, TableReference};
 pub use memory::{
     MemoryCatalogProvider, MemoryCatalogProviderList, MemorySchemaProvider,
 };
 mod r#async;
 mod catalog;
 mod dynamic_file;
 pub mod information_schema;
+pub mod listing_schema;
 mod schema;
 mod session;
 mod table;

datafusion/core/src/catalog_common/listing_schema.rs → datafusion/catalog/src/listing_schema.rs

@@ -22,9 +22,9 @@ use std::collections::HashSet;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 
-use crate::catalog::{SchemaProvider, TableProvider, TableProviderFactory};
-use crate::execution::context::SessionState;
+use crate::{SchemaProvider, TableProvider, TableProviderFactory};
 
+use crate::Session;
 use datafusion_common::{
     Constraints, DFSchema, DataFusionError, HashMap, TableReference,
 };
@@ -88,7 +88,7 @@ impl ListingSchemaProvider {
     }
 
     /// Reload table information from ObjectStore
-    pub async fn refresh(&self, state: &SessionState) -> datafusion_common::Result<()> {
+    pub async fn refresh(&self, state: &dyn Session) -> datafusion_common::Result<()> {
         let entries: Vec<_> = self.store.list(Some(&self.path)).try_collect().await?;
         let base = Path::new(self.path.as_ref());
         let mut tables = HashSet::new();

datafusion/core/src/execution/context/mod.rs

@@ -25,10 +25,10 @@ use std::sync::{Arc, Weak};
 
 use super::options::ReadOptions;
 use crate::{
+    catalog::listing_schema::ListingSchemaProvider,
     catalog::{
         CatalogProvider, CatalogProviderList, TableProvider, TableProviderFactory,
     },
-    catalog_common::listing_schema::ListingSchemaProvider,
     dataframe::DataFrame,
     datasource::listing::{
         ListingOptions, ListingTable, ListingTableConfig, ListingTableUrl,

datafusion/core/src/execution/session_state.rs

@@ -436,16 +436,16 @@ impl SessionState {
 
     /// Resolve all table references in the SQL statement. Does not include CTE references.
     ///
-    /// See [`datafusion_catalog::resolve_table_references`] for more information.
+    /// See [`datafusion_sql::resolve::resolve_table_references`] for more information.
     ///
-    /// [`datafusion_catalog::resolve_table_references`]: datafusion_catalog::resolve_table_references
+    /// [`datafusion_sql::resolve::resolve_table_references`]: datafusion_sql::resolve::resolve_table_references
     pub fn resolve_table_references(
         &self,
         statement: &Statement,
     ) -> datafusion_common::Result<Vec<TableReference>> {
         let enable_ident_normalization =
             self.config.options().sql_parser.enable_ident_normalization;
-        let (table_refs, _) = datafusion_catalog::resolve_table_references(
+        let (table_refs, _) = datafusion_sql::resolve::resolve_table_references(
             statement,
             enable_ident_normalization,
         )?;

datafusion/core/src/execution/session_state_defaults.rs

@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use crate::catalog::listing_schema::ListingSchemaProvider;
 use crate::catalog::{CatalogProvider, TableProviderFactory};
-use crate::catalog_common::listing_schema::ListingSchemaProvider;
 use crate::datasource::file_format::arrow::ArrowFormatFactory;
 #[cfg(feature = "avro")]
 use crate::datasource::file_format::avro::AvroFormatFactory;

datafusion/core/src/lib.rs

@@ -699,7 +699,6 @@ pub const DATAFUSION_VERSION: &str = env!("CARGO_PKG_VERSION");
 extern crate core;
 extern crate sqlparser;
 
-pub mod catalog_common;
 pub mod dataframe;
 pub mod datasource;
 pub mod error;

datafusion/datasource-csv/Cargo.toml

@@ -44,13 +44,9 @@ datafusion-physical-expr = { workspace = true }
 datafusion-physical-expr-common = { workspace = true }
 datafusion-physical-plan = { workspace = true }
 futures = { workspace = true }
-itertools = { workspace = true }
-log = { workspace = true }
 object_store = { workspace = true }
-rand = { workspace = true }
 regex = { workspace = true }
 tokio = { workspace = true }
-url = { workspace = true }
 
 [lints]
 workspace = true