Resolve conflicts

Author: DerGut

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()),
+            )
         })
     }