Commit c3871900 authored by Jim Fulton's avatar Jim Fulton

Bug fixed:

- When using multi-databases, cache-management operations on a
  connection, cacheMinimize and cacheGC, weren't applied to
  subconnections.
parent e415c5f0
...@@ -39,6 +39,10 @@ Bugs fixed ...@@ -39,6 +39,10 @@ Bugs fixed
there aren't any transactions. Now a string of 8 nulls (aka "z64") there aren't any transactions. Now a string of 8 nulls (aka "z64")
is specified. is specified.
- When using multi-databases, cache-management operations on a
connection, cacheMinimize and cacheGC, weren't applied to
subconnections.
- Setting _p_changed on a blob wo actually writing anything caused an - Setting _p_changed on a blob wo actually writing anything caused an
error. (https://bugs.launchpad.net/zodb/+bug/440234) error. (https://bugs.launchpad.net/zodb/+bug/440234)
......
...@@ -259,13 +259,17 @@ class Connection(ExportImport, object): ...@@ -259,13 +259,17 @@ class Connection(ExportImport, object):
return obj return obj
def cacheMinimize(self): def cacheMinimize(self):
"""Deactivate all unmodified objects in the cache.""" """Deactivate all unmodified objects in the cache.
self._cache.minimize() """
for connection in self.connections.itervalues():
connection._cache.minimize()
# TODO: we should test what happens when cacheGC is called mid-transaction. # TODO: we should test what happens when cacheGC is called mid-transaction.
def cacheGC(self): def cacheGC(self):
"""Reduce cache size to target size.""" """Reduce cache size to target size.
self._cache.incrgc() """
for connection in self.connections.itervalues():
connection._cache.incrgc()
__onCloseCallbacks = None __onCloseCallbacks = None
def onCloseCallback(self, f): def onCloseCallback(self, f):
......
...@@ -759,6 +759,72 @@ Read checks to work accross savepoints. ...@@ -759,6 +759,72 @@ Read checks to work accross savepoints.
""" """
def cache_management_of_subconnections():
"""Make that cache management works for subconnections.
When we use multi-databases, we open a connection in one database and
access connections to other databases through it. This test verifies
thatcache management is applied to all of the connections.
Set up a multi-database:
>>> db1 = ZODB.DB(None)
>>> db2 = ZODB.DB(None, databases=db1.databases, database_name='2',
... cache_size=10)
>>> conn1 = db1.open()
>>> conn2 = conn1.get_connection('2')
Populate it with some data, more than will fit in the cache:
>>> for i in range(100):
... conn2.root()[i] = conn2.root().__class__()
Upon commit, the cache is reduced to the cache size:
>>> transaction.commit()
>>> conn2._cache.cache_non_ghost_count
10
Fill it back up:
>>> for i in range(100):
... _ = str(conn2.root()[i])
>>> conn2._cache.cache_non_ghost_count
101
Doing cache GC on the primary also does it on the secondary:
>>> conn1.cacheGC()
>>> conn2._cache.cache_non_ghost_count
10
Ditto for cache minimize:
>>> conn1.cacheMinimize()
>>> conn2._cache.cache_non_ghost_count
0
Fill it back up:
>>> for i in range(100):
... _ = str(conn2.root()[i])
>>> conn2._cache.cache_non_ghost_count
101
GC is done on reopen:
>>> conn1.close()
>>> db1.open() is conn1
True
>>> conn2 is conn1.get_connection('2')
True
>>> conn2._cache.cache_non_ghost_count
10
"""
class C_invalidations_of_new_objects_work_after_savepoint(Persistent): class C_invalidations_of_new_objects_work_after_savepoint(Persistent):
def __init__(self): def __init__(self):
self.settings = 1 self.settings = 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment