backport fix for spilling batches with different nullability

gruuya · gruuya · commit 2e8de8a95c65 · 2026-03-31T21:10:42.000+02:00
diff --git a/datafusion/physical-plan/src/spill/in_progress_spill_file.rs b/datafusion/physical-plan/src/spill/in_progress_spill_file.rs
@@ -62,7 +62,7 @@ impl InProgressSpillFile {
             ));
         }
         if self.writer.is_none() {
-            let schema = batch.schema();
+            let schema = Arc::clone(self.spill_writer.schema());
             if let Some(ref in_progress_file) = self.in_progress_file {
                 self.writer = Some(IPCStreamWriter::new(
                     in_progress_file.path(),

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ impl InProgressSpillFile {`
`62`	`62`	`));`
`63`	`63`	`}`
`64`	`64`	`if self.writer.is_none() {`
`65`		`- let schema = batch.schema();`
	`65`	`+ let schema = Arc::clone(self.spill_writer.schema());`
`66`	`66`	`if let Some(ref in_progress_file) = self.in_progress_file {`
`67`	`67`	`self.writer = Some(IPCStreamWriter::new(`
`68`	`68`	`in_progress_file.path(),`