@@ -890,29 +890,29 @@ cdef class BlockValuesRefs:
890
890
"""
891
891
cdef:
892
892
public list referenced_blocks
893
- public int clear_counter
893
+ public int dead_counter
894
+ object __weakref__
895
+ object _weakref_cb
894
896
895
897
def __cinit__(self , blk: Block | None = None ) -> None:
898
+ def _weakref_cb(item: weakref.ref , selfref: weakref.ref = weakref.ref(self )) -> None:
899
+ self = selfref()
900
+ if self is not None:
901
+ self.dead_counter += 1
902
+ if self.dead_counter > 256 and self.dead_counter > len(self.referenced_blocks ) // 2:
903
+ self._clear_dead_references()
904
+ self._weakref_cb = _weakref_cb
896
905
if blk is not None:
897
- self.referenced_blocks = [weakref.ref(blk)]
906
+ self.referenced_blocks = [weakref.ref(blk, self ._weakref_cb )]
898
907
else:
899
908
self.referenced_blocks = []
900
- self.clear_counter = 500 # set reasonably high
901
-
902
- def _clear_dead_references(self , force = False ) -> None:
903
- # Use exponential backoff to decide when we want to clear references
904
- # if force = False . Clearing for every insertion causes slowdowns if
905
- # all these objects stay alive , e.g. df.items() for wide DataFrames
906
- # see GH#55245 and GH#55008
907
- if force or len(self.referenced_blocks ) > self.clear_counter:
908
- self.referenced_blocks = [
909
- ref for ref in self .referenced_blocks if ref() is not None
910
- ]
911
- nr_of_refs = len (self .referenced_blocks)
912
- if nr_of_refs < self.clear_counter // 2:
913
- self.clear_counter = max (self .clear_counter // 2 , 500 )
914
- elif nr_of_refs > self.clear_counter:
915
- self.clear_counter = max (self .clear_counter * 2 , nr_of_refs)
909
+
910
+ def _clear_dead_references(self ) -> None:
911
+ old_len = len (self .referenced_blocks)
912
+ self.referenced_blocks = [
913
+ ref for ref in self .referenced_blocks if ref() is not None
914
+ ]
915
+ self.dead_counter = self .dead_counter - (old_len - len (self .referenced_blocks))
916
916
917
917
def add_reference(self , blk: Block ) -> None:
918
918
"""Adds a new reference to our reference collection.
@@ -922,8 +922,7 @@ cdef class BlockValuesRefs:
922
922
blk : Block
923
923
The block that the new references should point to.
924
924
"""
925
- self._clear_dead_references()
926
- self.referenced_blocks.append(weakref.ref(blk ))
925
+ self.referenced_blocks.append(weakref.ref(blk , self._weakref_cb ))
927
926
928
927
def add_index_reference(self , index: object ) -> None:
929
928
"""Adds a new reference to our reference collection when creating an index.
@@ -933,8 +932,7 @@ cdef class BlockValuesRefs:
933
932
index : Index
934
933
The index that the new reference should point to.
935
934
"""
936
- self._clear_dead_references()
937
- self.referenced_blocks.append(weakref.ref(index ))
935
+ self.referenced_blocks.append(weakref.ref(index , self._weakref_cb ))
938
936
939
937
def has_reference(self ) -> bool:
940
938
"""Checks if block has foreign references.
@@ -946,6 +944,5 @@ cdef class BlockValuesRefs:
946
944
-------
947
945
bool
948
946
"""
949
- self._clear_dead_references(force = True )
950
947
# Checking for more references than block pointing to itself
951
- return len(self.referenced_blocks ) > 1
948
+ return len(self.referenced_blocks ) - self.dead_counter > 1
0 commit comments