Skip to content
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

Jump to bottom

chore: Bump datafusion to 41 #548

Merged
merged 1 commit into from
Aug 14, 2024
Merged

chore: Bump datafusion to 41 #548

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
2 changes: 1 addition & 1 deletion crates/integrations/datafusion/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ keywords = ["iceberg", "integrations", "datafusion"]
[dependencies]
anyhow = { workspace = true }
async-trait = { workspace = true }
datafusion = { version = "39.0.0" }
datafusion = { version = "41.0.0" }
futures = { workspace = true }
iceberg = { workspace = true }
log = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions crates/integrations/datafusion/src/catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ use std::any::Any;
use std::collections::HashMap;
use std::sync::Arc;

use datafusion::catalog::schema::SchemaProvider;
use datafusion::catalog::CatalogProvider;
use datafusion::catalog::{CatalogProvider, SchemaProvider};
use futures::future::try_join_all;
use iceberg::{Catalog, NamespaceIdent, Result};

Expand Down
4 changes: 4 additions & 0 deletions crates/integrations/datafusion/src/physical_plan/scan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ impl IcebergTableScan {
}

impl ExecutionPlan for IcebergTableScan {
fn name(&self) -> &str {
"IcebergTableScan"
}

fn as_any(&self) -> &dyn Any {
self
}
Expand Down
2 changes: 1 addition & 1 deletion crates/integrations/datafusion/src/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use std::collections::HashMap;
use std::sync::Arc;

use async_trait::async_trait;
use datafusion::catalog::schema::SchemaProvider;
use datafusion::catalog::SchemaProvider;
use datafusion::datasource::TableProvider;
use datafusion::error::Result as DFResult;
use futures::future::try_join_all;
Expand Down
4 changes: 2 additions & 2 deletions crates/integrations/datafusion/src/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ use std::sync::Arc;

use async_trait::async_trait;
use datafusion::arrow::datatypes::SchemaRef as ArrowSchemaRef;
use datafusion::catalog::Session;
use datafusion::datasource::{TableProvider, TableType};
use datafusion::error::Result as DFResult;
use datafusion::execution::context;
use datafusion::logical_expr::Expr;
use datafusion::physical_plan::ExecutionPlan;
use iceberg::arrow::schema_to_arrow_schema;
Expand Down Expand Up @@ -74,7 +74,7 @@ impl TableProvider for IcebergTableProvider {

async fn scan(
&self,
_state: &context::SessionState,
_state: &dyn Session,
_projection: Option<&Vec<usize>>,
_filters: &[Expr],
_limit: Option<usize>,
Expand Down
Loading