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
106 changes: 95 additions & 11 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ repository = "https://github.com/apache/iceberg-rust"
rust-version = "1.88"

[workspace.dependencies]
aes-gcm = "0.10"
anyhow = "1.0.72"
apache-avro = { version = "0.21", features = ["zstandard"] }
array-init = "2"
Expand Down Expand Up @@ -102,7 +103,7 @@ num-bigint = "0.4.6"
once_cell = "1.20"
opendal = "0.55.0"
ordered-float = "4"
parquet = "57.0"
parquet = { version = "57.0", features = ["encryption"] }
pilota = "0.11.10"
port_scanner = "0.1.5"
pretty_assertions = "1.4"
Expand Down Expand Up @@ -131,5 +132,6 @@ typed-builder = "0.20"
url = "2.5.7"
uuid = { version = "1.18", features = ["v7"] }
volo = "0.10.6"
zeroize = "1.7"
volo-thrift = "0.10.8"
zstd = "0.13.3"
6 changes: 5 additions & 1 deletion crates/iceberg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ repository = { workspace = true }
default = ["storage-memory", "storage-fs", "storage-s3"]
storage-all = ["storage-memory", "storage-fs", "storage-s3", "storage-gcs"]

encryption = ["parquet/encryption"]
storage-azdls = ["opendal/services-azdls"]
storage-fs = ["opendal/services-fs"]
storage-gcs = ["opendal/services-gcs"]
Expand All @@ -41,6 +42,7 @@ storage-s3 = ["opendal/services-s3", "reqsign"]


[dependencies]
aes-gcm = { workspace = true }
anyhow = { workspace = true }
apache-avro = { workspace = true }
array-init = { workspace = true }
Expand All @@ -65,13 +67,14 @@ flate2 = { workspace = true }
fnv = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
lru = "0.16.3"
moka = { version = "0.12.10", features = ["future"] }
murmur3 = { workspace = true }
num-bigint = { workspace = true }
once_cell = { workspace = true }
opendal = { workspace = true }
ordered-float = { workspace = true }
parquet = { workspace = true, features = ["async"] }
parquet = { workspace = true, features = ["async", "encryption"] }
rand = { workspace = true }
reqsign = { version = "0.16.3", optional = true, default-features = false }
reqwest = { workspace = true }
Expand All @@ -88,6 +91,7 @@ tokio = { workspace = true, optional = false, features = ["sync"] }
typed-builder = { workspace = true }
url = { workspace = true }
uuid = { workspace = true }
zeroize = { workspace = true }
zstd = { workspace = true }

[dev-dependencies]
Expand Down
1 change: 1 addition & 0 deletions crates/iceberg/src/arrow/caching_delete_file_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,7 @@ mod tests {
partition_spec: None,
name_mapping: None,
case_sensitive: false,
key_metadata: None,
};

// Load the deletes - should handle both types without error
Expand Down
1 change: 1 addition & 0 deletions crates/iceberg/src/arrow/delete_file_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ impl BasicDeleteFileLoader {
self.file_io.clone(),
false,
None,
None, // TODO: Add key_metadata support for encrypted delete files
)
.await?
.build()?
Expand Down
3 changes: 3 additions & 0 deletions crates/iceberg/src/arrow/delete_filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ pub(crate) mod tests {
partition_spec: None,
name_mapping: None,
case_sensitive: false,
key_metadata: None,
},
FileScanTask {
start: 0,
Expand All @@ -427,6 +428,7 @@ pub(crate) mod tests {
partition_spec: None,
name_mapping: None,
case_sensitive: false,
key_metadata: None,
},
];

Expand Down Expand Up @@ -482,6 +484,7 @@ pub(crate) mod tests {
partition_spec: None,
name_mapping: None,
case_sensitive: true,
key_metadata: None,
};

let filter = DeleteFilter::default();
Expand Down
Loading
Loading