resolve conflicts

xudong963 · xudong963 · commit 787eafe99fa1 · 2025-04-07T15:24:49.000+08:00
diff --git a/datafusion/datasource/src/statistics.rs b/datafusion/datasource/src/statistics.rs
@@ -498,7 +498,7 @@ pub fn compute_file_group_statistics(
     });
 
     if let Some(stats) = statistics {
-        file_group = file_group.with_statistics(stats);
+        file_group = file_group.with_statistics(Arc::new(stats));
     }
 
     file_group

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ pub fn compute_file_group_statistics(`
`498`	`498`	`});`
`499`	`499`
`500`	`500`	`if let Some(stats) = statistics {`
`501`		`- file_group = file_group.with_statistics(stats);`
	`501`	`+ file_group = file_group.with_statistics(Arc::new(stats));`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`file_group`