Skip to content

Apache DataFusion SQL Query Engine

[Minor] Fix error messages for `shrink` and `try_shrink` (#20422)

Haresh Khanna234730694392
diff --git a/datafusion/execution/src/memory_pool/mod.rs b/datafusion/execution/src/memory_pool/mod.rs
index 6dee87fee0..0b4eb3786f 100644
--- a/datafusion/execution/src/memory_pool/mod.rs
+++ b/datafusion/execution/src/memory_pool/mod.rs
@@ -391,7 +391,9 @@ impl MemoryReservation {
atomic::Ordering::Relaxed,
|prev| prev.checked_sub(capacity),
)
- .expect("capacity exceeds reservation size");
+ .unwrap_or_else(|prev| {
+ panic!("Cannot free the capacity {capacity} out of allocated size {prev}")
+ });
self.registration.pool.shrink(self, capacity);
}
@@ -407,8 +409,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}"
)