Skip to content

20067: fix: race condition in SpillPool caused by buffered stream #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martin-augment wants to merge 2 commits into
base: main
Choose a base branch
from
Open

20067: fix: race condition in SpillPool caused by buffered stream #219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccde430
fix: race condition in SpillPool caused by buffered stream
dekuu5 Jan 29, 2026
1b8ef43
Merge branch 'main' into test_SpillPool
dekuu5 Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions datafusion/physical-plan/src/spill/spill_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use std::sync::Arc;

use super::{SpillReaderStream, in_progress_spill_file::InProgressSpillFile};
use crate::coop::cooperative;
use crate::{common::spawn_buffered, metrics::SpillMetrics};
use crate::metrics::SpillMetrics;

/// The `SpillManager` is responsible for the following tasks:
/// - Reading and writing `RecordBatch`es to raw files based on the provided configurations.
Expand Down Expand Up @@ -186,7 +186,7 @@ impl SpillManager {
max_record_batch_memory,
)));

Ok(spawn_buffered(stream, self.batch_read_buffer_capacity))
Ok(stream)
Copy link

@augmentcode augmentcode bot Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

read_spill_as_stream no longer uses self.batch_read_buffer_capacity, so with_batch_read_buffer_capacity is now a no-op (e.g. datafusion/physical-plan/src/sorts/multi_level_merge.rs:276) and the struct field/doc comment is now misleading.

Other Locations
  • datafusion/physical-plan/src/sorts/multi_level_merge.rs:276

Fix This in Augment

🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.

Copy link
Owner Author

@martin-augment martin-augment Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

value:useful; category:bug; feedback: The Augment AI reviewer is correct! The batch_read_buffer_capacity field is no more read and it could be either removed or at least marked as deprecated. Prevents maintaining dead code.

}
}

Expand Down