From 3ca98a20fb03412e933c427a32356d5e523bfb83 Mon Sep 17 00:00:00 2001 From: Haresh Khanna Date: Wed, 18 Feb 2026 13:15:55 +0000 Subject: [PATCH 1/2] [Minor] Fix error messages --- datafusion/execution/src/memory_pool/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/datafusion/execution/src/memory_pool/mod.rs b/datafusion/execution/src/memory_pool/mod.rs index 30ad658d0d390..dbd30497d8162 100644 --- a/datafusion/execution/src/memory_pool/mod.rs +++ b/datafusion/execution/src/memory_pool/mod.rs @@ -387,7 +387,9 @@ impl MemoryReservation { atomic::Ordering::Relaxed, |prev| prev.checked_sub(capacity), ) - .expect("capacity exceeds reservation size"); + .unwrap_or_else(|prev| { + panic!("capacity {capacity} exceeds reservation size {prev}") + }); self.registration.pool.shrink(self, capacity); } @@ -403,8 +405,7 @@ impl MemoryReservation { atomic::Ordering::Relaxed, |prev| prev.checked_sub(capacity), ) - .map_err(|_| { - let prev = self.size.load(atomic::Ordering::Relaxed); + .map_err(|prev| { internal_datafusion_err!( "Cannot free the capacity {capacity} out of allocated size {prev}" ) From df7e88570432c4a270e95db44bfabd081a0bb23a Mon Sep 17 00:00:00 2001 From: Haresh Khanna Date: Wed, 18 Feb 2026 16:40:01 +0000 Subject: [PATCH 2/2] Consistent error messages --- datafusion/execution/src/memory_pool/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datafusion/execution/src/memory_pool/mod.rs b/datafusion/execution/src/memory_pool/mod.rs index dbd30497d8162..5a51bb12bf6ef 100644 --- a/datafusion/execution/src/memory_pool/mod.rs +++ b/datafusion/execution/src/memory_pool/mod.rs @@ -388,7 +388,7 @@ impl MemoryReservation { |prev| prev.checked_sub(capacity), ) .unwrap_or_else(|prev| { - panic!("capacity {capacity} exceeds reservation size {prev}") + panic!("Cannot free the capacity {capacity} out of allocated size {prev}") }); self.registration.pool.shrink(self, capacity); }