Skip to content

Commit

Permalink
Merge pull request #769 from splitgraph/bump-iceberg
Browse files Browse the repository at this point in the history
Bump Iceberg to pick up fix for plan and stream schema mismatch
  • Loading branch information
gruuya authored Dec 23, 2024
2 parents cb8605b + 5dcc7bd commit 82aabdf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ datafusion-functions-nested = "43.0.0"

futures = "0.3"

iceberg = { git = "https://github.com/splitgraph/iceberg-rust", rev = "2be7c389de17e8b5f88e202b2b696b221c9d9adb" }
iceberg-datafusion = { git = "https://github.com/splitgraph/iceberg-rust", rev = "2be7c389de17e8b5f88e202b2b696b221c9d9adb" }
iceberg = { git = "https://github.com/splitgraph/iceberg-rust", rev = "1e01b7b7b2009076941f3ec1f04340e961d4628a" }
iceberg-datafusion = { git = "https://github.com/splitgraph/iceberg-rust", rev = "1e01b7b7b2009076941f3ec1f04340e961d4628a" }

itertools = ">=0.10.0"
object_store = { version = "0.11", features = ["aws", "azure", "gcp"] }
Expand Down
11 changes: 5 additions & 6 deletions src/context/iceberg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ use futures::stream::select_all;
use futures::{pin_mut, StreamExt, TryStream, TryStreamExt};
use iceberg::io::FileIO;
use iceberg::spec::{
BoundPartitionSpec, DataContentType, DataFileFormat, FormatVersion, Manifest,
ManifestContentType, ManifestEntry, ManifestFile, ManifestListWriter,
ManifestMetadata, ManifestStatus, ManifestWriter, Operation, Snapshot,
SnapshotReference, SnapshotRetention, Struct, Summary, TableMetadata,
TableMetadataBuilder,
DataContentType, DataFileFormat, FormatVersion, Manifest, ManifestContentType,
ManifestEntry, ManifestFile, ManifestListWriter, ManifestMetadata, ManifestStatus,
ManifestWriter, Operation, PartitionSpec, Snapshot, SnapshotReference,
SnapshotRetention, Struct, Summary, TableMetadata, TableMetadataBuilder,
};
use iceberg::table::Table;
use iceberg::writer::file_writer::location_generator::{
Expand Down Expand Up @@ -279,7 +278,7 @@ pub async fn record_batches_to_iceberg(
.schema_id(DEFAULT_SCHEMA_ID)
.schema(iceberg_schema.clone())
.partition_spec(
BoundPartitionSpec::builder(iceberg_schema.clone())
PartitionSpec::builder(iceberg_schema.clone())
.with_spec_id(0)
.build()?,
)
Expand Down

0 comments on commit 82aabdf

Please sign in to comment.