-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: implement IcebergTableProviderFactory for datafusion (#600)
* feat: implement IcebergTableProviderFactory for datafusion * fix comments * add doc&ut * remove print * fix comments
- Loading branch information
Showing
4 changed files
with
427 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
300 changes: 300 additions & 0 deletions
300
crates/integrations/datafusion/src/table/table_provider_factory.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,300 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
use std::borrow::Cow; | ||
use std::collections::HashMap; | ||
use std::sync::Arc; | ||
|
||
use async_trait::async_trait; | ||
use datafusion::catalog::{Session, TableProvider, TableProviderFactory}; | ||
use datafusion::error::Result as DFResult; | ||
use datafusion::logical_expr::CreateExternalTable; | ||
use datafusion::sql::TableReference; | ||
use iceberg::arrow::schema_to_arrow_schema; | ||
use iceberg::io::FileIO; | ||
use iceberg::table::StaticTable; | ||
use iceberg::{Error, ErrorKind, Result, TableIdent}; | ||
|
||
use super::IcebergTableProvider; | ||
use crate::to_datafusion_error; | ||
|
||
/// A factory that implements DataFusion's `TableProviderFactory` to create `IcebergTableProvider` instances. | ||
/// | ||
/// # Example | ||
/// | ||
/// The following example demonstrates how to create an Iceberg external table using SQL in | ||
/// a DataFusion session with `IcebergTableProviderFactory`: | ||
/// | ||
/// ``` | ||
/// use std::sync::Arc; | ||
/// | ||
/// use datafusion::execution::session_state::SessionStateBuilder; | ||
/// use datafusion::prelude::*; | ||
/// use datafusion::sql::TableReference; | ||
/// use iceberg_datafusion::IcebergTableProviderFactory; | ||
/// | ||
/// #[tokio::main] | ||
/// async fn main() { | ||
/// // Create a new session context | ||
/// let mut state = SessionStateBuilder::new().with_default_features().build(); | ||
/// | ||
/// // Register the IcebergTableProviderFactory in the session | ||
/// state.table_factories_mut().insert( | ||
/// "ICEBERG".to_string(), | ||
/// Arc::new(IcebergTableProviderFactory::new()), | ||
/// ); | ||
/// | ||
/// let ctx = SessionContext::new_with_state(state); | ||
/// | ||
/// // Define the table reference and the location of the Iceberg metadata file | ||
/// let table_ref = TableReference::bare("my_iceberg_table"); | ||
/// // /path/to/iceberg/metadata | ||
/// let metadata_file_path = format!( | ||
/// "{}/testdata/table_metadata/{}", | ||
/// env!("CARGO_MANIFEST_DIR"), | ||
/// "TableMetadataV2.json" | ||
/// ); | ||
/// | ||
/// // SQL command to create the Iceberg external table | ||
/// let sql = format!( | ||
/// "CREATE EXTERNAL TABLE {} STORED AS ICEBERG LOCATION '{}'", | ||
/// table_ref, metadata_file_path | ||
/// ); | ||
/// | ||
/// // Execute the SQL to create the external table | ||
/// ctx.sql(&sql).await.expect("Failed to create table"); | ||
/// | ||
/// // Verify the table was created by retrieving the table provider | ||
/// let table_provider = ctx | ||
/// .table_provider(table_ref) | ||
/// .await | ||
/// .expect("Table not found"); | ||
/// | ||
/// println!("Iceberg external table created successfully."); | ||
/// } | ||
/// ``` | ||
/// | ||
/// # Note | ||
/// This factory is designed to work with the DataFusion query engine, | ||
/// specifically for handling Iceberg tables in external table commands. | ||
/// Currently, this implementation supports only reading Iceberg tables, with | ||
/// the creation of new tables not yet available. | ||
/// | ||
/// # Errors | ||
/// An error will be returned if any unsupported feature, such as partition columns, | ||
/// order expressions, constraints, or column defaults, is detected in the table creation command. | ||
#[derive(Default)] | ||
pub struct IcebergTableProviderFactory {} | ||
|
||
impl IcebergTableProviderFactory { | ||
pub fn new() -> Self { | ||
Self {} | ||
} | ||
} | ||
|
||
#[async_trait] | ||
impl TableProviderFactory for IcebergTableProviderFactory { | ||
async fn create( | ||
&self, | ||
_state: &dyn Session, | ||
cmd: &CreateExternalTable, | ||
) -> DFResult<Arc<dyn TableProvider>> { | ||
check_cmd(cmd).map_err(to_datafusion_error)?; | ||
|
||
let table_name = &cmd.name; | ||
let metadata_file_path = &cmd.location; | ||
let options = &cmd.options; | ||
|
||
let table_name_with_ns = complement_namespace_if_necessary(table_name); | ||
|
||
let table = create_static_table(table_name_with_ns, metadata_file_path, options) | ||
.await | ||
.map_err(to_datafusion_error)? | ||
.into_table(); | ||
|
||
let schema = schema_to_arrow_schema(table.metadata().current_schema()) | ||
.map_err(to_datafusion_error)?; | ||
|
||
Ok(Arc::new(IcebergTableProvider::new(table, Arc::new(schema)))) | ||
} | ||
} | ||
|
||
fn check_cmd(cmd: &CreateExternalTable) -> Result<()> { | ||
let CreateExternalTable { | ||
schema, | ||
table_partition_cols, | ||
order_exprs, | ||
constraints, | ||
column_defaults, | ||
.. | ||
} = cmd; | ||
|
||
// Check if any of the fields violate the constraints in a single condition | ||
let is_invalid = !schema.fields().is_empty() | ||
|| !table_partition_cols.is_empty() | ||
|| !order_exprs.is_empty() | ||
|| !constraints.is_empty() | ||
|| !column_defaults.is_empty(); | ||
|
||
if is_invalid { | ||
return Err(Error::new(ErrorKind::FeatureUnsupported, "Currently we only support reading existing icebergs tables in external table command. To create new table, please use catalog provider.")); | ||
} | ||
|
||
Ok(()) | ||
} | ||
|
||
/// Complements the namespace of a table name if necessary. | ||
/// | ||
/// # Note | ||
/// If the table name is a bare name, it will be complemented with the 'default' namespace. | ||
/// Otherwise, it will be returned as is. Because Iceberg tables are always namespaced, but DataFusion | ||
/// external table commands maybe not include the namespace, this function ensures that the namespace is always present. | ||
/// | ||
/// # See also | ||
/// - [`iceberg::NamespaceIdent`] | ||
/// - [`datafusion::sql::planner::SqlToRel::external_table_to_plan`] | ||
fn complement_namespace_if_necessary(table_name: &TableReference) -> Cow<'_, TableReference> { | ||
match table_name { | ||
TableReference::Bare { table } => { | ||
Cow::Owned(TableReference::partial("default", table.as_ref())) | ||
} | ||
other => Cow::Borrowed(other), | ||
} | ||
} | ||
|
||
async fn create_static_table( | ||
table_name: Cow<'_, TableReference>, | ||
metadata_file_path: &str, | ||
props: &HashMap<String, String>, | ||
) -> Result<StaticTable> { | ||
let table_ident = TableIdent::from_strs(table_name.to_vec())?; | ||
let file_io = FileIO::from_path(metadata_file_path)? | ||
.with_props(props) | ||
.build()?; | ||
StaticTable::from_metadata_file(metadata_file_path, table_ident, file_io).await | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
|
||
use datafusion::arrow::datatypes::{DataType, Field, Schema}; | ||
use datafusion::catalog::TableProviderFactory; | ||
use datafusion::common::{Constraints, DFSchema}; | ||
use datafusion::execution::session_state::SessionStateBuilder; | ||
use datafusion::logical_expr::CreateExternalTable; | ||
use datafusion::parquet::arrow::PARQUET_FIELD_ID_META_KEY; | ||
use datafusion::prelude::SessionContext; | ||
use datafusion::sql::TableReference; | ||
|
||
use super::*; | ||
|
||
fn table_metadata_v2_schema() -> Schema { | ||
Schema::new(vec![ | ||
Field::new("x", DataType::Int64, false).with_metadata(HashMap::from([( | ||
PARQUET_FIELD_ID_META_KEY.to_string(), | ||
"1".to_string(), | ||
)])), | ||
Field::new("y", DataType::Int64, false).with_metadata(HashMap::from([( | ||
PARQUET_FIELD_ID_META_KEY.to_string(), | ||
"2".to_string(), | ||
)])), | ||
Field::new("z", DataType::Int64, false).with_metadata(HashMap::from([( | ||
PARQUET_FIELD_ID_META_KEY.to_string(), | ||
"3".to_string(), | ||
)])), | ||
]) | ||
} | ||
|
||
fn table_metadata_location() -> String { | ||
format!( | ||
"{}/testdata/table_metadata/{}", | ||
env!("CARGO_MANIFEST_DIR"), | ||
"TableMetadataV2.json" | ||
) | ||
} | ||
|
||
fn create_external_table_cmd() -> CreateExternalTable { | ||
let metadata_file_path = table_metadata_location(); | ||
|
||
CreateExternalTable { | ||
name: TableReference::partial("static_ns", "static_table"), | ||
location: metadata_file_path, | ||
schema: Arc::new(DFSchema::empty()), | ||
file_type: "iceberg".to_string(), | ||
options: Default::default(), | ||
table_partition_cols: Default::default(), | ||
order_exprs: Default::default(), | ||
constraints: Constraints::empty(), | ||
column_defaults: Default::default(), | ||
if_not_exists: Default::default(), | ||
definition: Default::default(), | ||
unbounded: Default::default(), | ||
} | ||
} | ||
|
||
#[tokio::test] | ||
async fn test_schema_of_created_table() { | ||
let factory = IcebergTableProviderFactory::new(); | ||
|
||
let state = SessionStateBuilder::new().build(); | ||
let cmd = create_external_table_cmd(); | ||
|
||
let table_provider = factory | ||
.create(&state, &cmd) | ||
.await | ||
.expect("create table failed"); | ||
|
||
let expected_schema = table_metadata_v2_schema(); | ||
let actual_schema = table_provider.schema(); | ||
|
||
assert_eq!(actual_schema.as_ref(), &expected_schema); | ||
} | ||
|
||
#[tokio::test] | ||
async fn test_schema_of_created_external_table_sql() { | ||
let mut state = SessionStateBuilder::new().with_default_features().build(); | ||
state.table_factories_mut().insert( | ||
"ICEBERG".to_string(), | ||
Arc::new(IcebergTableProviderFactory::new()), | ||
); | ||
let ctx = SessionContext::new_with_state(state); | ||
|
||
// All external tables in DataFusion use bare names. | ||
// See https://github.com/apache/datafusion/blob/main/datafusion/sql/src/statement.rs#L1038-#L1039 | ||
let table_ref = TableReference::bare("static_table"); | ||
|
||
// Create the external table | ||
let sql = format!( | ||
"CREATE EXTERNAL TABLE {} STORED AS ICEBERG LOCATION '{}'", | ||
table_ref, | ||
table_metadata_location() | ||
); | ||
let _df = ctx.sql(&sql).await.expect("create table failed"); | ||
|
||
// Get the created external table | ||
let table_provider = ctx | ||
.table_provider(table_ref) | ||
.await | ||
.expect("table not found"); | ||
|
||
// Check the schema of the created table | ||
let expected_schema = table_metadata_v2_schema(); | ||
let actual_schema = table_provider.schema(); | ||
|
||
assert_eq!(actual_schema.as_ref(), &expected_schema); | ||
} | ||
} |
Oops, something went wrong.