Commit 2f881b06 authored by Julien Muchembled's avatar Julien Muchembled

Sync ZODB patch with NEO

parent 9cd33ca4
...@@ -43,6 +43,12 @@ if 1: # keep indentation. Also good for quick disabling. ...@@ -43,6 +43,12 @@ if 1: # keep indentation. Also good for quick disabling.
# See also neo/client/__init__.py from NEOPPOD project # See also neo/client/__init__.py from NEOPPOD project
if FORCE_STORAGE_SYNC_ON_CONNECTION_OPENING: if FORCE_STORAGE_SYNC_ON_CONNECTION_OPENING:
try:
if Connection._nexedi_fix != 4:
raise Exception("A different ZODB fix is already applied")
except AttributeError:
Connection._nexedi_fix = 4
# Whenever an connection is opened (and there's usually an existing one # Whenever an connection is opened (and there's usually an existing one
# in DB pool that can be reused) whereas the transaction is already # in DB pool that can be reused) whereas the transaction is already
# started, we must make sure that proper storage setup is done by # started, we must make sure that proper storage setup is done by
...@@ -50,6 +56,8 @@ if 1: # keep indentation. Also good for quick disabling. ...@@ -50,6 +56,8 @@ if 1: # keep indentation. Also good for quick disabling.
# For example, there's no open transaction when a ZPublisher/Publish # For example, there's no open transaction when a ZPublisher/Publish
# transaction begins. # transaction begins.
import thread
def open(self, *args, **kw): def open(self, *args, **kw):
def _flush_invalidations(): def _flush_invalidations():
acquire = self._db._a acquire = self._db._a
...@@ -68,9 +76,6 @@ if 1: # keep indentation. Also good for quick disabling. ...@@ -68,9 +76,6 @@ if 1: # keep indentation. Also good for quick disabling.
Connection_open(self, *args, **kw) Connection_open(self, *args, **kw)
finally: finally:
del self._flush_invalidations del self._flush_invalidations
try:
Connection_open = Connection._setDB Connection_open = Connection.open
Connection._setDB = open Connection.open = open
except AttributeError: # recent ZODB
Connection_open = Connection.open
Connection.open = open
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