Apache DataFusion SQL Query Engine
Fix panic during spill to disk in clickbench query (#19421)
Andrew Lambe6faacbf58f3
diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rsindex 6c3e9bee4b..a91dd3115d 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs@@ -457,21 +457,23 @@ impl<B: ByteViewType> ByteViewGroupValueBuilder<B> {last_take_len: usize,) -> Vec<Buffer> {let mut take_buffers = Vec::with_capacity(last_remaining_buffer_index + 1);+ debug_assert!(last_remaining_buffer_index <= self.completed.len());- // Take `0 ~ last_remaining_buffer_index - 1` buffers- if !self.completed.is_empty() || last_remaining_buffer_index == 0 {- take_buffers.extend(self.completed.drain(0..last_remaining_buffer_index));- }-- // Process the `last_remaining_buffer_index` buffers+ // Process the `last_remaining_buffer_index` buffer before draining so the index is valid.let last_buffer = if last_remaining_buffer_index < self.completed.len() {// If it is in `completed`, simply cloneself.completed[last_remaining_buffer_index].clone()} else {// If it is `in_progress`, copied `0 ~ offset` part+ debug_assert!(last_take_len <= self.in_progress.len());let taken_last_buffer = self.in_progress[0..last_take_len].to_vec();Buffer::from_vec(taken_last_buffer)};++ // Take `0 ~ last_remaining_buffer_index - 1` buffers+ if last_remaining_buffer_index > 0 {+ take_buffers.extend(self.completed.drain(0..last_remaining_buffer_index));+ }take_buffers.push(last_buffer);take_buffers@@ -948,4 +950,28 @@ mod tests {let taken_array = builder.take_n(final_ones_to_append);assert_eq!(&taken_array, &input_array);}++ #[test]+ fn test_byte_view_take_n_partial_completed_nonzero_index() {+ let mut builder =+ ByteViewGroupValueBuilder::<StringViewType>::new().with_max_block_size(30);+ let input_array = StringViewArray::from(vec![+ Some("aaaaaaaaaaaaaa"),+ Some("bbbbbbbbbbbbbb"),+ Some("cccccccccccccc"),+ Some("dddddddddddddd"),+ Some("eeeeeeeeeeeeee"),+ ]);+ let input_array: ArrayRef = Arc::new(input_array);++ for row in 0..input_array.len() {+ builder.append_val(&input_array, row).unwrap();+ }++ assert_eq!(builder.completed.len(), 2);+ assert_eq!(builder.in_progress.len(), 14);++ let taken_array = builder.take_n(3);+ assert_eq!(&taken_array, &input_array.slice(0, 3));+ }}