Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
- main
merge_group:

# Cancel obsolete runs for the same pull request or branch. The three jobs below
# Cancel obsolete runs for the same pull request or branch. The four jobs below
# keep this workflow well below ASF's 15-job recommended concurrency limit.
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
Expand Down Expand Up @@ -82,3 +82,18 @@ jobs:
with:
cache: "true"
- run: cargo test --workspace --locked

rat:
name: RAT
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
# Audit a source archive so the check covers exactly what a release
# tarball contains, including the hidden directories that RAT skips
# when given a directory.
- name: Audit license headers
run: |
git archive --prefix=source/ HEAD | gzip > "$RUNNER_TEMP/source.tar.gz"
./dev/release/run-rat.sh "$RUNNER_TEMP/source.tar.gz"
25 changes: 24 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,25 @@
# 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.

.idea/
target/
target/

# Release artifacts (see dev/release/README.md)
dev/dist
apache-rat-*.jar
rat.txt
filtered_rat.txt
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ anyhow = "1.0.72"
async-trait = "0.1.89"
datafusion = "55.0.0"
datafusion-cli = "55.0.0"
datafusion-iceberg = { path = "crates/datafusion" }
iceberg-datafusion = { path = "crates/datafusion" }
datafusion-sqllogictest = "55.0.0"
iceberg = { git = "https://github.com/apache/iceberg-rust", rev = "8cb2adeddb4f8da1ca7bd86ca303337f011c12e2" }
iceberg-catalog-rest = { git = "https://github.com/apache/iceberg-rust", rev = "8cb2adeddb4f8da1ca7bd86ca303337f011c12e2" }
Expand Down
2 changes: 1 addition & 1 deletion crates/datafusion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
edition = { workspace = true }
homepage = { workspace = true }
name = "datafusion-iceberg"
name = "iceberg-datafusion"
publish = true
version = { workspace = true }

Expand Down
1 change: 1 addition & 0 deletions crates/datafusion/LICENSE
1 change: 1 addition & 0 deletions crates/datafusion/NOTICE
2 changes: 1 addition & 1 deletion crates/datafusion/src/physical_plan/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ impl PartitionExpr {
/// ```
/// use std::sync::Arc;
///
/// use datafusion_iceberg::physical_plan::PartitionExpr;
/// use iceberg_datafusion::physical_plan::PartitionExpr;
/// use iceberg::spec::{NestedField, PartitionSpec, PrimitiveType, Schema, Transform, Type};
///
/// let schema = Arc::new(
Expand Down
2 changes: 1 addition & 1 deletion crates/datafusion/src/physical_plan/repartition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ use iceberg::spec::{TableMetadata, TableMetadataRef, Transform};
///
/// ```ignore
/// use std::num::NonZeroUsize;
/// use datafusion_iceberg::physical_plan::project_with_partition;
/// use iceberg_datafusion::physical_plan::project_with_partition;
///
/// let plan_with_partition = project_with_partition(input_plan, &table)?;
///
Expand Down
2 changes: 1 addition & 1 deletion crates/datafusion/src/table/table_provider_factory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ use crate::to_datafusion_error;
/// use datafusion::common::TableReference;
/// use datafusion::execution::session_state::SessionStateBuilder;
/// use datafusion::prelude::*;
/// use datafusion_iceberg::IcebergTableProviderFactory;
/// use iceberg_datafusion::IcebergTableProviderFactory;
///
/// #[tokio::main]
/// async fn main() {
Expand Down
8 changes: 4 additions & 4 deletions crates/datafusion/src/task_writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use crate::to_datafusion_error;
/// ```rust,ignore
/// use iceberg::spec::{PartitionSpec, Schema};
/// use iceberg::writer::base_writer::data_file_writer::DataFileWriterBuilder;
/// use datafusion_iceberg::writer::task_writer::TaskWriter;
/// use iceberg_datafusion::writer::task_writer::TaskWriter;
///
/// // Create a TaskWriter for an unpartitioned table
/// let task_writer = TaskWriter::new(
Expand Down Expand Up @@ -110,7 +110,7 @@ impl<B: IcebergWriterBuilder> TaskWriter<B> {
/// ```rust,ignore
/// use iceberg::spec::{PartitionSpec, Schema};
/// use iceberg::writer::base_writer::data_file_writer::DataFileWriterBuilder;
/// use datafusion_iceberg::writer::task_writer::TaskWriter;
/// use iceberg_datafusion::writer::task_writer::TaskWriter;
///
/// // Create a TaskWriter for an unpartitioned table
/// let task_writer = TaskWriter::new(
Expand Down Expand Up @@ -177,7 +177,7 @@ impl<B: IcebergWriterBuilder> TaskWriter<B> {
///
/// ```rust,ignore
/// use arrow_array::RecordBatch;
/// use datafusion_iceberg::writer::task_writer::TaskWriter;
/// use iceberg_datafusion::writer::task_writer::TaskWriter;
///
/// // Write a RecordBatch
/// task_writer.write(record_batch).await?;
Expand Down Expand Up @@ -253,7 +253,7 @@ impl<B: IcebergWriterBuilder> TaskWriter<B> {
/// # Example
///
/// ```rust,ignore
/// use datafusion_iceberg::writer::task_writer::TaskWriter;
/// use iceberg_datafusion::writer::task_writer::TaskWriter;
///
/// // Close the writer and get all data files
/// let data_files = task_writer.close().await?;
Expand Down
2 changes: 1 addition & 1 deletion crates/datafusion/tests/integration_datafusion_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ use datafusion::arrow::array::{Array, StringArray, UInt64Array};
use datafusion::arrow::datatypes::{DataType, Field, Schema as ArrowSchema};
use datafusion::execution::context::SessionContext;
use datafusion::parquet::arrow::PARQUET_FIELD_ID_META_KEY;
use datafusion_iceberg::IcebergCatalogProvider;
use expect_test::expect;
use iceberg::io::LocalFsStorageFactory;
use iceberg::memory::{MEMORY_CATALOG_WAREHOUSE, MemoryCatalogBuilder};
Expand All @@ -38,6 +37,7 @@ use iceberg::{
Catalog, CatalogBuilder, MemoryCatalog, NamespaceIdent, Result as IcebergResult,
TableCreation, TableIdent,
};
use iceberg_datafusion::IcebergCatalogProvider;
use tempfile::TempDir;

fn temp_path() -> String {
Expand Down
2 changes: 1 addition & 1 deletion crates/playground/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fs-err = "3.1.0"
home = "0.5.12"
iceberg = { workspace = true }
iceberg-catalog-rest = { workspace = true }
datafusion-iceberg = { workspace = true }
iceberg-datafusion = { workspace = true }
mimalloc = "0.1.46"
stacker = "0.1.20"
tokio = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/playground/src/catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ use std::sync::Arc;

use anyhow::anyhow;
use datafusion::catalog::{CatalogProvider, CatalogProviderList};
use datafusion_iceberg::IcebergCatalogProvider;
use fs_err::read_to_string;
use iceberg::CatalogBuilder;
use iceberg::memory::MemoryCatalogBuilder;
use iceberg_catalog_rest::RestCatalogBuilder;
use iceberg_datafusion::IcebergCatalogProvider;
use toml::{Table as TomlTable, Value};

const CONFIG_NAME_CATALOGS: &str = "catalogs";
Expand Down
2 changes: 1 addition & 1 deletion crates/sqllogictest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ datafusion-sqllogictest = { workspace = true }
enum-ordinalize = "4.3.0"
env_logger = "0.11.8"
iceberg = { workspace = true }
datafusion-iceberg = { workspace = true }
iceberg-datafusion = { workspace = true }
indicatif = "0.18"
log = "0.4.28"
serde = { version = "1.0.219", features = ["rc"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/sqllogictest/src/engine/datafusion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use std::sync::Arc;

use datafusion::catalog::CatalogProvider;
use datafusion::prelude::{SessionConfig, SessionContext};
use datafusion_iceberg::IcebergCatalogProvider;
use datafusion_sqllogictest::DataFusion;
use iceberg::encryption::kms::MemoryKmsClientFactory;
use iceberg::memory::{MEMORY_CATALOG_WAREHOUSE, MemoryCatalogBuilder};
Expand All @@ -30,6 +29,7 @@ use iceberg::spec::{
UnboundPartitionSpec,
};
use iceberg::{Catalog, CatalogBuilder, NamespaceIdent, TableCreation};
use iceberg_datafusion::IcebergCatalogProvider;
use indicatif::ProgressBar;

use crate::engine::{DatafusionCatalogConfig, EngineRunner, run_slt_with_runner};
Expand Down
Loading
Loading