asimsedhain commented on code in PR #9015:
URL: https://github.com/apache/arrow-datafusion/pull/9015#discussion_r1487229689
##########
datafusion/execution/src/memory_pool/pool.rs:
##########
@@ -63,38 +72,89 @@ impl GreedyMemoryPool {
debug!("Created new GreedyMemoryPool(pool_size={pool_size})");
Self {
pool_size,
- used: AtomicUsize::new(0),
+ state: Mutex::new(GreedyMemoryPoolState {
+ pool_members: HashMap::new(),
+ }),
}
}
}
impl MemoryPool for GreedyMemoryPool {
- fn grow(&self, _reservation: &MemoryReservation, additional: usize) {
- self.used.fetch_add(additional, Ordering::Relaxed);
+ fn grow(&self, reservation: &MemoryReservation, additional: usize) {
+ let mut state = self.state.lock();
+ let used = state
+ .pool_members
+ .entry(reservation.consumer().name().into())
+ .or_insert(0);
+ *used = used.saturating_add(additional);
}
- fn shrink(&self, _reservation: &MemoryReservation, shrink: usize) {
- self.used.fetch_sub(shrink, Ordering::Relaxed);
+ fn shrink(&self, reservation: &MemoryReservation, shrink: usize) {
+ let mut state = self.state.lock();
+ let used = state
+ .pool_members
+ .entry(reservation.consumer().name().into())
+ .or_insert(0);
+ *used = used.saturating_sub(shrink);
}
fn try_grow(&self, reservation: &MemoryReservation, additional: usize) ->
Result<()> {
- self.used
- .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |used| {
- let new_used = used + additional;
- (new_used <= self.pool_size).then_some(new_used)
- })
- .map_err(|used| {
- insufficient_capacity_err(
- reservation,
- additional,
- self.pool_size.saturating_sub(used),
- )
- })?;
+ let mut state = self.state.lock();
+ let used: usize = state.pool_members.values().sum();
Review Comment:
✅
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
