Skip to content

feat(encryption) [6/N] support ArrowReaderOptions in get_metadata #2402

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

Open
xanderbailey wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(encryption) [6/N] support ArrowReaderOptions in get_metadata #2402

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/iceberg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ moka = { version = "0.12.10", features = ["future"] }
murmur3 = { workspace = true }
once_cell = { workspace = true }
ordered-float = { workspace = true }
parquet = { workspace = true, features = ["async"] }
parquet = { workspace = true, features = ["async", "encryption"] }
rand = { workspace = true }
reqwest = { workspace = true }
roaring = { workspace = true }
Expand Down
14 changes: 10 additions & 4 deletions crates/iceberg/src/arrow/reader/file_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,16 @@ impl AsyncFileReader for ArrowFileReader {
.boxed()
}

// TODO: currently we don't respect `ArrowReaderOptions` cause it don't expose any method to access the option field
// we will fix it after `v55.1.0` is released in https://github.com/apache/arrow-rs/issues/7393
fn get_metadata(
&mut self,
_options: Option<&'_ ArrowReaderOptions>,
options: Option<&'_ ArrowReaderOptions>,
) -> BoxFuture<'_, parquet::errors::Result<Arc<ParquetMetaData>>> {
let decryption_properties = options
.and_then(|opts| opts.file_decryption_properties())
.cloned();

let metadata_options = options.map(|opts| opts.metadata_options().clone());

async move {
let reader = ParquetMetaDataReader::new()
.with_prefetch_hint(self.parquet_read_options.metadata_size_hint())
Expand All @@ -124,7 +128,9 @@ impl AsyncFileReader for ArrowFileReader {
))
.with_offset_index_policy(PageIndexPolicy::from(
self.parquet_read_options.preload_offset_index(),
));
))
.with_metadata_options(metadata_options)
.with_decryption_properties(decryption_properties);
let size = self.meta.size;
let meta = reader.load_and_finish(self, size).await?;

Expand Down
Loading