Skip to content

chore: make all CatalogInfo methods async #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2025
Merged

chore: make all CatalogInfo methods async #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions datafusion-postgres/src/pg_catalog/catalog_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ use datafusion::{
/// Define the interface for retrieve catalog data for pg_catalog tables
#[async_trait]
pub trait CatalogInfo: Clone + Send + Sync + Debug + 'static {
fn catalog_names(&self) -> Result<Vec<String>, DataFusionError>;
async fn catalog_names(&self) -> Result<Vec<String>, DataFusionError>;

fn schema_names(&self, catalog_name: &str) -> Result<Option<Vec<String>>, DataFusionError>;
async fn schema_names(
&self,
catalog_name: &str,
) -> Result<Option<Vec<String>>, DataFusionError>;

fn table_names(
async fn table_names(
&self,
catalog_name: &str,
schema_name: &str,
Expand All @@ -37,15 +40,18 @@ pub trait CatalogInfo: Clone + Send + Sync + Debug + 'static {

#[async_trait]
impl CatalogInfo for Arc<dyn CatalogProviderList> {
fn catalog_names(&self) -> Result<Vec<String>, DataFusionError> {
async fn catalog_names(&self) -> Result<Vec<String>, DataFusionError> {
Ok(CatalogProviderList::catalog_names(self.as_ref()))
}

fn schema_names(&self, catalog_name: &str) -> Result<Option<Vec<String>>, DataFusionError> {
async fn schema_names(
&self,
catalog_name: &str,
) -> Result<Option<Vec<String>>, DataFusionError> {
Ok(self.catalog(catalog_name).map(|c| c.schema_names()))
}

fn table_names(
async fn table_names(
&self,
catalog_name: &str,
schema_name: &str,
Expand Down
10 changes: 6 additions & 4 deletions datafusion-postgres/src/pg_catalog/pg_attribute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,13 @@ impl<C: CatalogInfo> PgAttributeTable<C> {
// original one in case that schemas or tables were dropped.
let mut swap_cache = HashMap::new();

for catalog_name in this.catalog_list.catalog_names()? {
if let Some(schema_names) = this.catalog_list.schema_names(&catalog_name)? {
for catalog_name in this.catalog_list.catalog_names().await? {
if let Some(schema_names) = this.catalog_list.schema_names(&catalog_name).await? {
for schema_name in schema_names {
if let Some(table_names) =
this.catalog_list.table_names(&catalog_name, &schema_name)?
if let Some(table_names) = this
.catalog_list
.table_names(&catalog_name, &schema_name)
.await?
{
// Process all tables in this schema
for table_name in table_names {
Expand Down
10 changes: 6 additions & 4 deletions datafusion-postgres/src/pg_catalog/pg_class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl<C: CatalogInfo> PgClassTable<C> {
let mut swap_cache = HashMap::new();

// Iterate through all catalogs and schemas
for catalog_name in this.catalog_list.catalog_names()? {
for catalog_name in this.catalog_list.catalog_names().await? {
let cache_key = OidCacheKey::Catalog(catalog_name.clone());
let catalog_oid = if let Some(oid) = oid_cache.get(&cache_key) {
*oid
Expand All @@ -126,7 +126,7 @@ impl<C: CatalogInfo> PgClassTable<C> {
};
swap_cache.insert(cache_key, catalog_oid);

if let Some(schema_names) = this.catalog_list.schema_names(&catalog_name)? {
if let Some(schema_names) = this.catalog_list.schema_names(&catalog_name).await? {
for schema_name in schema_names {
let cache_key = OidCacheKey::Schema(catalog_name.clone(), schema_name.clone());
let schema_oid = if let Some(oid) = oid_cache.get(&cache_key) {
Expand All @@ -140,8 +140,10 @@ impl<C: CatalogInfo> PgClassTable<C> {
// (In a full implementation, this would go in pg_namespace)

// Now process all tables in this schema
if let Some(table_names) =
this.catalog_list.table_names(&catalog_name, &schema_name)?
if let Some(table_names) = this
.catalog_list
.table_names(&catalog_name, &schema_name)
.await?
{
for table_name in table_names {
let cache_key = OidCacheKey::Table(
Expand Down
2 changes: 1 addition & 1 deletion datafusion-postgres/src/pg_catalog/pg_database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ impl<C: CatalogInfo> PgDatabaseTable<C> {
let mut oid_cache = this.oid_cache.write().await;

// Add a record for each catalog (treating catalogs as "databases")
for catalog_name in this.catalog_list.catalog_names()? {
for catalog_name in this.catalog_list.catalog_names().await? {
let cache_key = OidCacheKey::Catalog(catalog_name.clone());
let catalog_oid = if let Some(oid) = oid_cache.get(&cache_key) {
*oid
Expand Down
4 changes: 2 additions & 2 deletions datafusion-postgres/src/pg_catalog/pg_namespace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ impl<C: CatalogInfo> PgNamespaceTable<C> {
let mut oid_cache = this.oid_cache.write().await;

// Now add all schemas from DataFusion catalogs
for catalog_name in this.catalog_list.catalog_names()? {
if let Some(schema_names) = this.catalog_list.schema_names(&catalog_name)? {
for catalog_name in this.catalog_list.catalog_names().await? {
if let Some(schema_names) = this.catalog_list.schema_names(&catalog_name).await? {
for schema_name in schema_names {
let cache_key = OidCacheKey::Schema(catalog_name.clone(), schema_name.clone());
let schema_oid = if let Some(oid) = oid_cache.get(&cache_key) {
Expand Down
12 changes: 8 additions & 4 deletions datafusion-postgres/src/pg_catalog/pg_tables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,15 @@ impl<C: CatalogInfo> PgTablesTable<C> {
let mut row_security = Vec::new();

// Iterate through all catalogs and schemas
for catalog_name in this.catalog_list.catalog_names()? {
if let Some(catalog_schema_names) = this.catalog_list.schema_names(&catalog_name)? {
for catalog_name in this.catalog_list.catalog_names().await? {
if let Some(catalog_schema_names) =
this.catalog_list.schema_names(&catalog_name).await?
{
for schema_name in catalog_schema_names {
if let Some(catalog_table_names) =
this.catalog_list.table_names(&catalog_name, &schema_name)?
if let Some(catalog_table_names) = this
.catalog_list
.table_names(&catalog_name, &schema_name)
.await?
{
// Now process all tables in this schema
for table_name in catalog_table_names {
Expand Down
Loading