Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions datafusion/execution/src/disk_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl DiskManagerBuilder {
used_disk_space: Arc::new(AtomicU64::new(0)),
}),
DiskManagerMode::Directories(conf_dirs) => {
let local_dirs = create_local_dirs(conf_dirs)?;
let local_dirs = create_local_dirs(&conf_dirs)?;
debug!(
"Created local dirs {local_dirs:?} as DataFusion working directory"
);
Expand Down Expand Up @@ -188,7 +188,7 @@ impl DiskManager {
used_disk_space: Arc::new(AtomicU64::new(0)),
})),
DiskManagerConfig::NewSpecified(conf_dirs) => {
let local_dirs = create_local_dirs(conf_dirs)?;
let local_dirs = create_local_dirs(&conf_dirs)?;
debug!(
"Created local dirs {local_dirs:?} as DataFusion working directory"
);
Expand Down Expand Up @@ -408,7 +408,7 @@ impl Drop for RefCountedTempFile {
}

/// Setup local dirs by creating one new dir in each of the given dirs
fn create_local_dirs(local_dirs: Vec<PathBuf>) -> Result<Vec<Arc<TempDir>>> {
fn create_local_dirs(local_dirs: &[PathBuf]) -> Result<Vec<Arc<TempDir>>> {
local_dirs
.iter()
.map(|root| {
Expand Down
3 changes: 3 additions & 0 deletions datafusion/execution/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
// Make sure fast / cheap clones on Arc are explicit:
// https://github.com/apache/datafusion/issues/11143
#![deny(clippy::clone_on_ref_ptr)]
// https://github.com/apache/datafusion/issues/18503
#![deny(clippy::needless_pass_by_value)]
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]

//! DataFusion execution configuration and runtime structures

Expand Down
8 changes: 4 additions & 4 deletions datafusion/execution/src/memory_pool/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,8 @@ impl<I: MemoryPool> MemoryPool for TrackConsumersPool<I> {
DataFusionError::ResourcesExhausted(
provide_top_memory_consumers_to_error_msg(
&reservation.consumer().name,
e,
self.report_top(self.top.into()),
&e,
&self.report_top(self.top.into()),
),
)
}
Expand All @@ -494,8 +494,8 @@ impl<I: MemoryPool> MemoryPool for TrackConsumersPool<I> {

fn provide_top_memory_consumers_to_error_msg(
consumer_name: &str,
error_msg: String,
top_consumers: String,
error_msg: &str,
top_consumers: &str,
) -> String {
format!("Additional allocation failed for {consumer_name} with top memory consumers (across reservations) as:\n{top_consumers}\nError: {error_msg}")
}
Expand Down