Resolve conflicts

Author: DerGut

crates/iceberg/src/arrow/reader.rs

@@ -39,7 +39,9 @@ use parquet::arrow::arrow_reader::{
 };
 use parquet::arrow::async_reader::AsyncFileReader;
 use parquet::arrow::{PARQUET_FIELD_ID_META_KEY, ParquetRecordBatchStreamBuilder, ProjectionMask};
-use parquet::file::metadata::{ParquetMetaData, ParquetMetaDataReader, RowGroupMetaData};
+use parquet::file::metadata::{
+    PageIndexPolicy, ParquetMetaData, ParquetMetaDataReader, RowGroupMetaData,
+};
 use parquet::schema::types::{SchemaDescriptor, Type as ParquetType};
 
 use crate::arrow::caching_delete_file_loader::CachingDeleteFileLoader;
@@ -1390,9 +1392,9 @@ impl<R: FileRead> AsyncFileReader for ArrowFileReader<R> {
         async move {
             let reader = ParquetMetaDataReader::new()
                 .with_prefetch_hint(self.metadata_size_hint)
-                .with_column_indexes(self.preload_column_index)
-                .with_page_indexes(self.preload_page_index)
-                .with_offset_indexes(self.preload_offset_index);
+                .with_column_index_policy(PageIndexPolicy::from(self.preload_column_index))
+                .with_page_index_policy(PageIndexPolicy::from(self.preload_page_index))
+                .with_offset_index_policy(PageIndexPolicy::from(self.preload_offset_index));
             let size = self.meta.size;
             let meta = reader.load_and_finish(self, size).await?;
 

crates/integrations/datafusion/src/physical_plan/commit.rs

@@ -84,7 +84,10 @@ impl IcebergCommitExec {
         let count_array = Arc::new(UInt64Array::from(vec![count])) as ArrayRef;
 
         RecordBatch::try_from_iter_with_nullable(vec![("count", count_array, false)]).map_err(|e| {
-            DataFusionError::ArrowError(e, Some("Failed to make count batch!".to_string()))
+            DataFusionError::ArrowError(
+                Box::new(e),
+                Some("Failed to make count batch!".to_string()),
+            )
         })
     }
 

crates/integrations/datafusion/src/physical_plan/write.rs

@@ -100,7 +100,10 @@ impl IcebergWriteExec {
         let files_array = Arc::new(StringArray::from(data_files)) as ArrayRef;
 
         RecordBatch::try_new(Self::make_result_schema(), vec![files_array]).map_err(|e| {
-            DataFusionError::ArrowError(e, Some("Failed to make result batch".to_string()))
+            DataFusionError::ArrowError(
+                Box::new(e),
+                Some("Failed to make result batch".to_string()),
+            )
         })
     }
 

crates/integrations/datafusion/src/table/table_provider_factory.rs

@@ -241,7 +241,7 @@ mod tests {
             options: Default::default(),
             table_partition_cols: Default::default(),
             order_exprs: Default::default(),
-            constraints: Constraints::empty(),
+            constraints: Constraints::default(),
             column_defaults: Default::default(),
             if_not_exists: Default::default(),
             temporary: false,