Commit af229d37 authored by Jim Fulton's avatar Jim Fulton

Factored out a blob-stoprage mixin.

parent 2dcb463c
...@@ -572,49 +572,21 @@ class LawnLayout(BushyLayout): ...@@ -572,49 +572,21 @@ class LawnLayout(BushyLayout):
LAYOUTS['lawn'] = LawnLayout() LAYOUTS['lawn'] = LawnLayout()
class BlobStorage(SpecificationDecoratorBase): class BlobStorageMixin(object):
"""A storage to support blobs.""" """A mix-in to help storages support blobssupport blobs."""
zope.interface.implements(ZODB.interfaces.IBlobStorage) zope.interface.implements(ZODB.interfaces.IBlobStorage)
# Proxies can't have a __dict__ so specifying __slots__ here allows def __init__(self, blob_dir, layout='automatic'):
# us to have instance attributes explicitly on the proxy.
__slots__ = ('fshelper', 'dirty_oids', '_BlobStorage__supportsUndo',
'_blobs_pack_is_in_progress', )
def __new__(self, base_directory, storage, layout='automatic'):
return SpecificationDecoratorBase.__new__(self, storage)
def __init__(self, base_directory, storage, layout='automatic'):
# XXX Log warning if storage is ClientStorage # XXX Log warning if storage is ClientStorage
SpecificationDecoratorBase.__init__(self, storage) self.fshelper = FilesystemHelper(blob_dir, layout)
self.fshelper = FilesystemHelper(base_directory, layout)
self.fshelper.create() self.fshelper.create()
self.fshelper.checkSecure() self.fshelper.checkSecure()
self.dirty_oids = [] self.dirty_oids = []
try:
supportsUndo = storage.supportsUndo
except AttributeError:
supportsUndo = False
else:
supportsUndo = supportsUndo()
self.__supportsUndo = supportsUndo
self._blobs_pack_is_in_progress = False
if ZODB.interfaces.IStorageRestoreable.providedBy(storage):
zope.interface.alsoProvides(self,
ZODB.interfaces.IBlobStorageRestoreable)
@non_overridable
def temporaryDirectory(self): def temporaryDirectory(self):
return self.fshelper.temp_dir return self.fshelper.temp_dir
@non_overridable
def __repr__(self):
normal_storage = getProxiedObject(self)
return '<BlobStorage proxy for %r at %s>' % (normal_storage,
hex(id(self)))
@non_overridable @non_overridable
def _storeblob(self, oid, serial, blobfilename): def _storeblob(self, oid, serial, blobfilename):
self._lock_acquire() self._lock_acquire()
...@@ -675,19 +647,15 @@ class BlobStorage(SpecificationDecoratorBase): ...@@ -675,19 +647,15 @@ class BlobStorage(SpecificationDecoratorBase):
self.tpc_finish(trans) self.tpc_finish(trans)
@non_overridable @non_overridable
def tpc_finish(self, *arg, **kw): def blob_tpc_finish(self):
# We need to override the base storage's tpc_finish instead of """Blob cleanup to be called from subclass tpc_finish
# providing a _finish method because methods found on the proxied """
# object aren't rebound to the proxy
getProxiedObject(self).tpc_finish(*arg, **kw)
self.dirty_oids = [] self.dirty_oids = []
@non_overridable @non_overridable
def tpc_abort(self, *arg, **kw): def blob_tpc_abort(self):
# We need to override the base storage's abort instead of """Blob cleanup to be called from subclass tpc_abort
# providing an _abort method because methods found on the proxied object """
# aren't rebound to the proxy
getProxiedObject(self).tpc_abort(*arg, **kw)
while self.dirty_oids: while self.dirty_oids:
oid, serial = self.dirty_oids.pop() oid, serial = self.dirty_oids.pop()
clean = self.fshelper.getBlobFilename(oid, serial) clean = self.fshelper.getBlobFilename(oid, serial)
...@@ -711,6 +679,59 @@ class BlobStorage(SpecificationDecoratorBase): ...@@ -711,6 +679,59 @@ class BlobStorage(SpecificationDecoratorBase):
else: else:
return BlobFile(blob_filename, 'r', blob) return BlobFile(blob_filename, 'r', blob)
class BlobStorage(SpecificationDecoratorBase, BlobStorageMixin):
"""A storage to support blobs."""
zope.interface.implements(ZODB.interfaces.IBlobStorage)
# Proxies can't have a __dict__ so specifying __slots__ here allows
# us to have instance attributes explicitly on the proxy.
__slots__ = ('fshelper', 'dirty_oids', '_BlobStorage__supportsUndo',
'_blobs_pack_is_in_progress', )
def __new__(self, base_directory, storage, layout='automatic'):
return SpecificationDecoratorBase.__new__(self, storage)
def __init__(self, base_directory, storage, layout='automatic'):
# XXX Log warning if storage is ClientStorage
SpecificationDecoratorBase.__init__(self, storage)
BlobStorageMixin.__init__(self, base_directory, layout)
try:
supportsUndo = storage.supportsUndo
except AttributeError:
supportsUndo = False
else:
supportsUndo = supportsUndo()
self.__supportsUndo = supportsUndo
self._blobs_pack_is_in_progress = False
if ZODB.interfaces.IStorageRestoreable.providedBy(storage):
zope.interface.alsoProvides(self,
ZODB.interfaces.IBlobStorageRestoreable)
@non_overridable
def __repr__(self):
normal_storage = getProxiedObject(self)
return '<BlobStorage proxy for %r at %s>' % (normal_storage,
hex(id(self)))
@non_overridable
def tpc_finish(self, *arg, **kw):
# We need to override the base storage's tpc_finish instead of
# providing a _finish method because methods found on the proxied
# object aren't rebound to the proxy
getProxiedObject(self).tpc_finish(*arg, **kw)
self.blob_tpc_finish()
@non_overridable
def tpc_abort(self, *arg, **kw):
# We need to override the base storage's abort instead of
# providing an _abort method because methods found on the proxied object
# aren't rebound to the proxy
getProxiedObject(self).tpc_abort(*arg, **kw)
self.blob_tpc_abort()
@non_overridable @non_overridable
def _packUndoing(self, packtime, referencesf): def _packUndoing(self, packtime, referencesf):
# Walk over all existing revisions of all blob files and check # Walk over all existing revisions of all blob files and check
......
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