Fokko commented on code in PR #176: URL: https://github.com/apache/iceberg-rust/pull/176#discussion_r1508929875
########## crates/iceberg/src/writer/file_writer/parquet_writer.rs: ########## @@ -0,0 +1,594 @@ +// 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. + +//! The module contains the file writer for parquet file format. + +use std::{ + cmp::max, + collections::HashMap, + sync::{atomic::AtomicI64, Arc}, +}; + +use crate::{io::FileIO, Result}; +use crate::{ + io::OutputFile, + spec::{DataFileBuilder, DataFileFormat}, + writer::CurrentFileStatus, + Error, +}; +use arrow_schema::SchemaRef as ArrowSchemaRef; +use parquet::{arrow::AsyncArrowWriter, format::FileMetaData}; +use parquet::{arrow::PARQUET_FIELD_ID_META_KEY, file::properties::WriterProperties}; + +use super::{ + location_generator::{FileNameGenerator, LocationGenerator}, + track_writer::TrackWriter, + FileWriter, FileWriterBuilder, +}; + +/// ParquetWriterBuilder is used to builder a [`ParquetWriter`] +#[derive(Clone)] +pub struct ParquetWriterBuilder<T: LocationGenerator, F: FileNameGenerator> { + /// `buffer_size` determines the initial size of the intermediate buffer. + /// The intermediate buffer will automatically be resized if necessary + init_buffer_size: usize, + props: WriterProperties, + schema: ArrowSchemaRef, + + file_io: FileIO, + location_generator: T, + file_name_generator: F, +} + +impl<T: LocationGenerator, F: FileNameGenerator> ParquetWriterBuilder<T, F> { + /// To avoid EntiryTooSmall error, we set the minimum buffer size to 8MB if the given buffer size is smaller than it. + const MIN_BUFFER_SIZE: usize = 8 * 1024 * 1024; + + /// Create a new `ParquetWriterBuilder` + /// To construct the write result, the schema should contain the `PARQUET_FIELD_ID_META_KEY` metadata for each field. + pub fn new( + init_buffer_size: usize, + props: WriterProperties, + schema: ArrowSchemaRef, + file_io: FileIO, + location_generator: T, + file_name_generator: F, + ) -> Self { + Self { + init_buffer_size, + props, + schema, + file_io, + location_generator, + file_name_generator, + } + } +} + +impl<T: LocationGenerator, F: FileNameGenerator> FileWriterBuilder for ParquetWriterBuilder<T, F> { + type R = ParquetWriter; + + async fn build(self) -> crate::Result<Self::R> { + // Fetch field id from schema + let field_ids = self + .schema + .fields() + .iter() + .map(|field| { + field + .metadata() + .get(PARQUET_FIELD_ID_META_KEY) + .ok_or_else(|| { + Error::new( + crate::ErrorKind::Unexpected, + "Field id not found in arrow schema metadata.", + ) + })? + .parse::<i32>() + .map_err(|err| { + Error::new(crate::ErrorKind::Unexpected, "Failed to parse field id.") + .with_source(err) + }) + }) + .collect::<crate::Result<Vec<_>>>()?; + + let written_size = Arc::new(AtomicI64::new(0)); + let out_file = self.file_io.new_output( + self.location_generator + .generate_location(&self.file_name_generator.generate_file_name()), + )?; + let inner_writer = TrackWriter::new(out_file.writer().await?, written_size.clone()); + let init_buffer_size = max(Self::MIN_BUFFER_SIZE, self.init_buffer_size); + let writer = AsyncArrowWriter::try_new( + inner_writer, + self.schema.clone(), + init_buffer_size, + Some(self.props), + ) + .map_err(|err| { + Error::new( + crate::ErrorKind::Unexpected, + "Failed to build parquet writer.", + ) + .with_source(err) + })?; + + Ok(ParquetWriter { + writer, + written_size, + current_row_num: 0, + out_file, + field_ids, + }) + } +} + +/// `ParquetWriter`` is used to write arrow data into parquet file on storage. +pub struct ParquetWriter { + out_file: OutputFile, + writer: AsyncArrowWriter<TrackWriter>, + written_size: Arc<AtomicI64>, + current_row_num: usize, + field_ids: Vec<i32>, +} + +impl ParquetWriter { + fn to_data_file_builder( + field_ids: &[i32], + metadata: FileMetaData, + written_size: usize, + file_path: String, + ) -> Result<DataFileBuilder> { + // Only enter here when the file is not empty. + assert!(!metadata.row_groups.is_empty()); + if field_ids.len() != metadata.row_groups[0].columns.len() { + return Err(Error::new( + crate::ErrorKind::Unexpected, + "Len of field id is not match with len of columns in parquet metadata.", + )); + } + + let (column_sizes, value_counts, null_value_counts) = + { + let mut per_col_size: HashMap<i32, u64> = HashMap::new(); + let mut per_col_val_num: HashMap<i32, u64> = HashMap::new(); + let mut per_col_null_val_num: HashMap<i32, u64> = HashMap::new(); + metadata.row_groups.iter().for_each(|group| { + group.columns.iter().zip(field_ids.iter()).for_each( + |(column_chunk, &field_id)| { + if let Some(column_chunk_metadata) = &column_chunk.meta_data { + *per_col_size.entry(field_id).or_insert(0) += + column_chunk_metadata.total_compressed_size as u64; + *per_col_val_num.entry(field_id).or_insert(0) += + column_chunk_metadata.num_values as u64; + *per_col_null_val_num.entry(field_id).or_insert(0_u64) += + column_chunk_metadata + .statistics + .as_ref() + .map(|s| s.null_count) + .unwrap_or(None) + .unwrap_or(0) as u64; + } + }, + ) + }); + (per_col_size, per_col_val_num, per_col_null_val_num) + }; + + let mut builder = DataFileBuilder::default(); + builder + .file_path(file_path) + .file_format(DataFileFormat::Parquet) + .record_count(metadata.num_rows as u64) + .file_size_in_bytes(written_size as u64) + .column_sizes(column_sizes) + .value_counts(value_counts) + .null_value_counts(null_value_counts) + // # TODO + // - nan_value_counts + // - lower_bounds + // - upper_bounds + .key_metadata(metadata.footer_signing_key_metadata.unwrap_or_default()) + .split_offsets( + metadata + .row_groups + .iter() + .filter_map(|group| group.file_offset) + .collect(), + ); + Ok(builder) + } +} + +impl FileWriter for ParquetWriter { + async fn write(&mut self, batch: &arrow_array::RecordBatch) -> crate::Result<()> { + self.current_row_num += batch.num_rows(); + self.writer.write(batch).await.map_err(|err| { + Error::new( + crate::ErrorKind::Unexpected, + "Failed to write using parquet writer.", + ) + .with_source(err) + })?; + Ok(()) + } + + async fn close(self) -> crate::Result<Vec<crate::spec::DataFileBuilder>> { + let metadata = self.writer.close().await.map_err(|err| { + Error::new( + crate::ErrorKind::Unexpected, + "Failed to close parquet writer.", + ) + .with_source(err) + })?; + + let written_size = self.written_size.load(std::sync::atomic::Ordering::Relaxed); + + Ok(vec![Self::to_data_file_builder( + &self.field_ids, + metadata, + written_size as usize, + self.out_file.location().to_string(), + )?]) + } +} + +impl CurrentFileStatus for ParquetWriter { + fn current_file_path(&self) -> String { + self.out_file.location().to_string() + } + + fn current_row_num(&self) -> usize { + self.current_row_num + } + + fn current_written_size(&self) -> usize { + self.written_size.load(std::sync::atomic::Ordering::Relaxed) as usize + } +} + +#[cfg(test)] +mod tests { + use std::sync::Arc; + + use anyhow::Result; + use arrow_array::types::Int64Type; + use arrow_array::ArrayRef; + use arrow_array::Int64Array; + use arrow_array::RecordBatch; + use arrow_array::StructArray; + use bytes::Bytes; + use futures::AsyncReadExt; + use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder; + use parquet::arrow::PARQUET_FIELD_ID_META_KEY; + use tempfile::TempDir; + + use super::*; + use crate::io::FileIOBuilder; + use crate::spec::Struct; + use crate::writer::file_writer::location_generator::test::MockLocationGenerator; + use crate::writer::file_writer::location_generator::DefaultFileNameGenerator; + + #[derive(Clone)] + struct TestLocationGen; + + #[tokio::test] + async fn test_parquet_writer() -> Result<()> { + let temp_dir = TempDir::new().unwrap(); + let file_io = FileIOBuilder::new_fs_io().build().unwrap(); + let loccation_gen = + MockLocationGenerator::new(temp_dir.path().to_str().unwrap().to_string()); + let file_name_gen = + DefaultFileNameGenerator::new("test".to_string(), None, DataFileFormat::Parquet); + + // prepare data + let schema = { + let fields = vec![ + arrow_schema::Field::new("col", arrow_schema::DataType::Int64, true).with_metadata( + HashMap::from([(PARQUET_FIELD_ID_META_KEY.to_string(), "0".to_string())]), + ), + ]; + Arc::new(arrow_schema::Schema::new(fields)) + }; + let col = Arc::new(Int64Array::from_iter_values(vec![1; 1024])) as ArrayRef; + let null_col = Arc::new(Int64Array::new_null(1024)) as ArrayRef; + let to_write = RecordBatch::try_new(schema.clone(), vec![col]).unwrap(); + let to_write_null = RecordBatch::try_new(schema.clone(), vec![null_col]).unwrap(); + + // write data + let mut pw = ParquetWriterBuilder::new( + 0, + WriterProperties::builder().build(), + to_write.schema(), + file_io.clone(), + loccation_gen, + file_name_gen, + ) + .build() + .await?; + pw.write(&to_write).await?; + pw.write(&to_write_null).await?; + let res = pw.close().await?; + assert_eq!(res.len(), 1); + let data_file = res + .into_iter() + .next() + .unwrap() + // Put dummy field for build successfully. + .content(crate::spec::DataContentType::Data) + .partition(Struct::empty()) + .build() + .unwrap(); + + // read the written file + let mut input_file = file_io + .new_input(data_file.file_path.clone()) + .unwrap() + .reader() + .await + .unwrap(); + let mut res = vec![]; + let file_size = input_file.read_to_end(&mut res).await.unwrap(); + let reader_builder = ParquetRecordBatchReaderBuilder::try_new(Bytes::from(res)).unwrap(); + let metadata = reader_builder.metadata().clone(); + + // check data + let mut reader = reader_builder.build().unwrap(); + let res = reader.next().unwrap().unwrap(); + assert_eq!(to_write, res); + let res = reader.next().unwrap().unwrap(); + assert_eq!(to_write_null, res); + + // check metadata + assert_eq!(metadata.num_row_groups(), 1); + assert_eq!(metadata.row_group(0).num_columns(), 1); + assert_eq!(data_file.file_format, DataFileFormat::Parquet); + assert_eq!( + data_file.record_count, + metadata + .row_groups() + .iter() + .map(|group| group.num_rows()) + .sum::<i64>() as u64 + ); + assert_eq!(data_file.file_size_in_bytes, file_size as u64); + assert_eq!(data_file.column_sizes.len(), 1); + assert_eq!( + *data_file.column_sizes.get(&0).unwrap(), + metadata.row_group(0).column(0).compressed_size() as u64 + ); + assert_eq!(data_file.value_counts.len(), 1); + assert_eq!(*data_file.value_counts.get(&0).unwrap(), 2048); + assert_eq!(data_file.null_value_counts.len(), 1); + assert_eq!(*data_file.null_value_counts.get(&0).unwrap(), 1024); + assert_eq!(data_file.key_metadata.len(), 0); + assert_eq!(data_file.split_offsets.len(), 1); + assert_eq!( + *data_file.split_offsets.first().unwrap(), + metadata.row_group(0).file_offset().unwrap() + ); + + Ok(()) + } + + #[tokio::test] + async fn test_parquet_writer_with_complex_schema() -> Result<()> { + let temp_dir = TempDir::new().unwrap(); + let file_io = FileIOBuilder::new_fs_io().build().unwrap(); + let loccation_gen = Review Comment: nit: typo: `location_gen` ########## crates/iceberg/src/writer/file_writer/parquet_writer.rs: ########## @@ -0,0 +1,594 @@ +// 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. + +//! The module contains the file writer for parquet file format. + +use std::{ + cmp::max, + collections::HashMap, + sync::{atomic::AtomicI64, Arc}, +}; + +use crate::{io::FileIO, Result}; +use crate::{ + io::OutputFile, + spec::{DataFileBuilder, DataFileFormat}, + writer::CurrentFileStatus, + Error, +}; +use arrow_schema::SchemaRef as ArrowSchemaRef; +use parquet::{arrow::AsyncArrowWriter, format::FileMetaData}; +use parquet::{arrow::PARQUET_FIELD_ID_META_KEY, file::properties::WriterProperties}; + +use super::{ + location_generator::{FileNameGenerator, LocationGenerator}, + track_writer::TrackWriter, + FileWriter, FileWriterBuilder, +}; + +/// ParquetWriterBuilder is used to builder a [`ParquetWriter`] +#[derive(Clone)] +pub struct ParquetWriterBuilder<T: LocationGenerator, F: FileNameGenerator> { + /// `buffer_size` determines the initial size of the intermediate buffer. + /// The intermediate buffer will automatically be resized if necessary + init_buffer_size: usize, + props: WriterProperties, + schema: ArrowSchemaRef, + + file_io: FileIO, + location_generator: T, + file_name_generator: F, +} + +impl<T: LocationGenerator, F: FileNameGenerator> ParquetWriterBuilder<T, F> { + /// To avoid EntiryTooSmall error, we set the minimum buffer size to 8MB if the given buffer size is smaller than it. + const MIN_BUFFER_SIZE: usize = 8 * 1024 * 1024; + + /// Create a new `ParquetWriterBuilder` + /// To construct the write result, the schema should contain the `PARQUET_FIELD_ID_META_KEY` metadata for each field. + pub fn new( + init_buffer_size: usize, + props: WriterProperties, + schema: ArrowSchemaRef, + file_io: FileIO, + location_generator: T, + file_name_generator: F, + ) -> Self { + Self { + init_buffer_size, + props, + schema, + file_io, + location_generator, + file_name_generator, + } + } +} + +impl<T: LocationGenerator, F: FileNameGenerator> FileWriterBuilder for ParquetWriterBuilder<T, F> { + type R = ParquetWriter; + + async fn build(self) -> crate::Result<Self::R> { + // Fetch field id from schema + let field_ids = self + .schema + .fields() + .iter() + .map(|field| { + field + .metadata() + .get(PARQUET_FIELD_ID_META_KEY) + .ok_or_else(|| { + Error::new( + crate::ErrorKind::Unexpected, + "Field id not found in arrow schema metadata.", + ) + })? + .parse::<i32>() + .map_err(|err| { + Error::new(crate::ErrorKind::Unexpected, "Failed to parse field id.") + .with_source(err) + }) + }) + .collect::<crate::Result<Vec<_>>>()?; + + let written_size = Arc::new(AtomicI64::new(0)); + let out_file = self.file_io.new_output( + self.location_generator + .generate_location(&self.file_name_generator.generate_file_name()), + )?; + let inner_writer = TrackWriter::new(out_file.writer().await?, written_size.clone()); + let init_buffer_size = max(Self::MIN_BUFFER_SIZE, self.init_buffer_size); + let writer = AsyncArrowWriter::try_new( + inner_writer, + self.schema.clone(), + init_buffer_size, + Some(self.props), + ) + .map_err(|err| { + Error::new( + crate::ErrorKind::Unexpected, + "Failed to build parquet writer.", + ) + .with_source(err) + })?; + + Ok(ParquetWriter { + writer, + written_size, + current_row_num: 0, + out_file, + field_ids, + }) + } +} + +/// `ParquetWriter`` is used to write arrow data into parquet file on storage. +pub struct ParquetWriter { + out_file: OutputFile, + writer: AsyncArrowWriter<TrackWriter>, + written_size: Arc<AtomicI64>, + current_row_num: usize, + field_ids: Vec<i32>, +} + +impl ParquetWriter { + fn to_data_file_builder( + field_ids: &[i32], + metadata: FileMetaData, + written_size: usize, + file_path: String, + ) -> Result<DataFileBuilder> { + // Only enter here when the file is not empty. + assert!(!metadata.row_groups.is_empty()); + if field_ids.len() != metadata.row_groups[0].columns.len() { + return Err(Error::new( + crate::ErrorKind::Unexpected, + "Len of field id is not match with len of columns in parquet metadata.", + )); + } + + let (column_sizes, value_counts, null_value_counts) = + { + let mut per_col_size: HashMap<i32, u64> = HashMap::new(); + let mut per_col_val_num: HashMap<i32, u64> = HashMap::new(); + let mut per_col_null_val_num: HashMap<i32, u64> = HashMap::new(); + metadata.row_groups.iter().for_each(|group| { + group.columns.iter().zip(field_ids.iter()).for_each( + |(column_chunk, &field_id)| { + if let Some(column_chunk_metadata) = &column_chunk.meta_data { + *per_col_size.entry(field_id).or_insert(0) += + column_chunk_metadata.total_compressed_size as u64; + *per_col_val_num.entry(field_id).or_insert(0) += + column_chunk_metadata.num_values as u64; + *per_col_null_val_num.entry(field_id).or_insert(0_u64) += + column_chunk_metadata + .statistics + .as_ref() + .map(|s| s.null_count) + .unwrap_or(None) + .unwrap_or(0) as u64; + } + }, + ) + }); + (per_col_size, per_col_val_num, per_col_null_val_num) + }; + + let mut builder = DataFileBuilder::default(); + builder + .file_path(file_path) + .file_format(DataFileFormat::Parquet) + .record_count(metadata.num_rows as u64) + .file_size_in_bytes(written_size as u64) + .column_sizes(column_sizes) + .value_counts(value_counts) + .null_value_counts(null_value_counts) + // # TODO + // - nan_value_counts + // - lower_bounds + // - upper_bounds + .key_metadata(metadata.footer_signing_key_metadata.unwrap_or_default()) + .split_offsets( + metadata + .row_groups + .iter() + .filter_map(|group| group.file_offset) + .collect(), + ); + Ok(builder) + } +} + +impl FileWriter for ParquetWriter { + async fn write(&mut self, batch: &arrow_array::RecordBatch) -> crate::Result<()> { + self.current_row_num += batch.num_rows(); + self.writer.write(batch).await.map_err(|err| { + Error::new( + crate::ErrorKind::Unexpected, + "Failed to write using parquet writer.", + ) + .with_source(err) + })?; + Ok(()) + } + + async fn close(self) -> crate::Result<Vec<crate::spec::DataFileBuilder>> { + let metadata = self.writer.close().await.map_err(|err| { + Error::new( + crate::ErrorKind::Unexpected, + "Failed to close parquet writer.", + ) + .with_source(err) + })?; + + let written_size = self.written_size.load(std::sync::atomic::Ordering::Relaxed); + + Ok(vec![Self::to_data_file_builder( + &self.field_ids, + metadata, + written_size as usize, + self.out_file.location().to_string(), + )?]) + } +} + +impl CurrentFileStatus for ParquetWriter { + fn current_file_path(&self) -> String { + self.out_file.location().to_string() + } + + fn current_row_num(&self) -> usize { + self.current_row_num + } + + fn current_written_size(&self) -> usize { + self.written_size.load(std::sync::atomic::Ordering::Relaxed) as usize + } +} + +#[cfg(test)] +mod tests { + use std::sync::Arc; + + use anyhow::Result; + use arrow_array::types::Int64Type; + use arrow_array::ArrayRef; + use arrow_array::Int64Array; + use arrow_array::RecordBatch; + use arrow_array::StructArray; + use bytes::Bytes; + use futures::AsyncReadExt; + use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder; + use parquet::arrow::PARQUET_FIELD_ID_META_KEY; + use tempfile::TempDir; + + use super::*; + use crate::io::FileIOBuilder; + use crate::spec::Struct; + use crate::writer::file_writer::location_generator::test::MockLocationGenerator; + use crate::writer::file_writer::location_generator::DefaultFileNameGenerator; + + #[derive(Clone)] + struct TestLocationGen; + + #[tokio::test] + async fn test_parquet_writer() -> Result<()> { + let temp_dir = TempDir::new().unwrap(); + let file_io = FileIOBuilder::new_fs_io().build().unwrap(); + let loccation_gen = + MockLocationGenerator::new(temp_dir.path().to_str().unwrap().to_string()); + let file_name_gen = + DefaultFileNameGenerator::new("test".to_string(), None, DataFileFormat::Parquet); + + // prepare data + let schema = { + let fields = vec![ + arrow_schema::Field::new("col", arrow_schema::DataType::Int64, true).with_metadata( + HashMap::from([(PARQUET_FIELD_ID_META_KEY.to_string(), "0".to_string())]), + ), + ]; + Arc::new(arrow_schema::Schema::new(fields)) + }; + let col = Arc::new(Int64Array::from_iter_values(vec![1; 1024])) as ArrayRef; + let null_col = Arc::new(Int64Array::new_null(1024)) as ArrayRef; + let to_write = RecordBatch::try_new(schema.clone(), vec![col]).unwrap(); + let to_write_null = RecordBatch::try_new(schema.clone(), vec![null_col]).unwrap(); + + // write data + let mut pw = ParquetWriterBuilder::new( + 0, + WriterProperties::builder().build(), + to_write.schema(), + file_io.clone(), + loccation_gen, + file_name_gen, + ) + .build() + .await?; + pw.write(&to_write).await?; + pw.write(&to_write_null).await?; + let res = pw.close().await?; + assert_eq!(res.len(), 1); + let data_file = res + .into_iter() + .next() + .unwrap() + // Put dummy field for build successfully. + .content(crate::spec::DataContentType::Data) + .partition(Struct::empty()) + .build() + .unwrap(); + + // read the written file + let mut input_file = file_io + .new_input(data_file.file_path.clone()) + .unwrap() + .reader() + .await + .unwrap(); + let mut res = vec![]; + let file_size = input_file.read_to_end(&mut res).await.unwrap(); + let reader_builder = ParquetRecordBatchReaderBuilder::try_new(Bytes::from(res)).unwrap(); + let metadata = reader_builder.metadata().clone(); + + // check data + let mut reader = reader_builder.build().unwrap(); + let res = reader.next().unwrap().unwrap(); + assert_eq!(to_write, res); + let res = reader.next().unwrap().unwrap(); + assert_eq!(to_write_null, res); + + // check metadata + assert_eq!(metadata.num_row_groups(), 1); + assert_eq!(metadata.row_group(0).num_columns(), 1); + assert_eq!(data_file.file_format, DataFileFormat::Parquet); + assert_eq!( + data_file.record_count, + metadata + .row_groups() + .iter() + .map(|group| group.num_rows()) + .sum::<i64>() as u64 + ); + assert_eq!(data_file.file_size_in_bytes, file_size as u64); + assert_eq!(data_file.column_sizes.len(), 1); + assert_eq!( + *data_file.column_sizes.get(&0).unwrap(), + metadata.row_group(0).column(0).compressed_size() as u64 + ); + assert_eq!(data_file.value_counts.len(), 1); + assert_eq!(*data_file.value_counts.get(&0).unwrap(), 2048); + assert_eq!(data_file.null_value_counts.len(), 1); + assert_eq!(*data_file.null_value_counts.get(&0).unwrap(), 1024); + assert_eq!(data_file.key_metadata.len(), 0); + assert_eq!(data_file.split_offsets.len(), 1); + assert_eq!( + *data_file.split_offsets.first().unwrap(), + metadata.row_group(0).file_offset().unwrap() + ); + + Ok(()) + } + + #[tokio::test] + async fn test_parquet_writer_with_complex_schema() -> Result<()> { Review Comment: Thanks for adding this test! Can you make sure that you also assign the field-ids for the sub-fields? ``` parq /var/folders/22/yb9h2zd55ql37h4_50xkmg7r0000gn/T/.tmpAMDXHW/test-00000.parquet --schema # Schema <pyarrow._parquet.ParquetSchema object at 0x124b8f940> required group field_id=-1 arrow_schema { optional int64 field_id=0 col0; optional group field_id=1 col1 { optional int64 field_id=-1 sub_col; } optional binary field_id=2 col2 (String); optional group field_id=3 col3 (List) { repeated group field_id=-1 list { optional int64 field_id=-1 item; } } optional group field_id=4 col4 { optional group field_id=-1 sub_col { optional int64 field_id=-1 sub_sub_col; } } } ``` It would also be good to assert if they are there. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
