EmilyMatt commented on code in PR #15613:
URL: https://github.com/apache/datafusion/pull/15613#discussion_r2035959521
##########
datafusion/execution/src/memory_pool/mod.rs:
##########
@@ -149,21 +150,65 @@ pub trait MemoryPool: Send + Sync + std::fmt::Debug {
/// For help with allocation accounting, see the [`proxy`] module.
///
/// [proxy]: datafusion_common::utils::proxy
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+#[derive(Debug)]
pub struct MemoryConsumer {
name: String,
can_spill: bool,
+ id: usize,
+}
+
+impl PartialEq for MemoryConsumer {
+ fn eq(&self, other: &Self) -> bool {
+ let is_same_id = self.id == other.id;
+
+ #[cfg(debug_assertions)]
+ if is_same_id {
+ assert_eq!(self.name, other.name);
+ assert_eq!(self.can_spill, other.can_spill);
+ }
+
+ is_same_id
+ }
+}
+
+impl Eq for MemoryConsumer {}
+
+impl Hash for MemoryConsumer {
+ fn hash<H: Hasher>(&self, state: &mut H) {
+ self.id.hash(state);
+ self.name.hash(state);
+ self.can_spill.hash(state);
+ }
}
impl MemoryConsumer {
+ fn new_unique_id() -> usize {
+ static ID: atomic::AtomicUsize = atomic::AtomicUsize::new(0);
+ ID.fetch_add(1, atomic::Ordering::Relaxed)
+ }
+
/// Create a new empty [`MemoryConsumer`] that can be grown using
[`MemoryReservation`]
pub fn new(name: impl Into<String>) -> Self {
Self {
name: name.into(),
can_spill: false,
+ id: Self::new_unique_id(),
+ }
+ }
+
+ pub fn clone_with_new_id(&self) -> Self {
Review Comment:
No problem, added some more documentation in general
##########
datafusion/execution/src/memory_pool/mod.rs:
##########
@@ -149,21 +150,65 @@ pub trait MemoryPool: Send + Sync + std::fmt::Debug {
/// For help with allocation accounting, see the [`proxy`] module.
///
/// [proxy]: datafusion_common::utils::proxy
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+#[derive(Debug)]
Review Comment:
Addressed^
--
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: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
