Merge remote-tracking branch 'origin/dev0' into dev0

comphead · comphead · commit 06760ca1cc34 · 2024-05-13T16:57:31.000-07:00
diff --git a/datafusion/physical-plan/src/joins/sort_merge_join.rs b/datafusion/physical-plan/src/joins/sort_merge_join.rs
@@ -1380,7 +1380,7 @@ fn get_filter_column(
     filter_columns
 }
 
-// Get buffered data sliece by specific batch index and for specified column indices only
+/// Get `buffered_indices` rows for `buffered_data[buffered_batch_idx]`
 #[inline(always)]
 fn get_buffered_columns(
     buffered_data: &BufferedData,

Original file line number	Diff line number	Diff line change
`@@ -1380,7 +1380,7 @@ fn get_filter_column(`
`1380`	`1380`	`filter_columns`
`1381`	`1381`	`}`
`1382`	`1382`
`1383`		`-// Get buffered data sliece by specific batch index and for specified column indices only`
	`1383`	+/// Get `buffered_indices` rows for `buffered_data[buffered_batch_idx]`
`1384`	`1384`	`#[inline(always)]`
`1385`	`1385`	`fn get_buffered_columns(`
`1386`	`1386`	`buffered_data: &BufferedData,`