Commit d7067b8b authored by Vincent Pelletier's avatar Vincent Pelletier

Remove transaction and query locks. Since DB instances are stored in a...

Remove transaction and query locks. Since DB instances are stored in a volatile attributes on ZMySQLDA instances, they are bound to one thread at most, so it's not needed to handle concurent accesses, and removing them should induce a performance increase.
Remove a tabulation caracter.
Delete volatile attribute at transaction end (_finish and _abort) to avoid multiple threads from using the same connection - because of ZODB connection pooling.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13629 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e9821d76
......@@ -155,11 +155,7 @@ def int_or_long(s):
try: return int(s)
except: return long(s)
"""Locking strategy:
The minimum that must be done is a mutex around a query, store_result
sequence. When using transactions, the mutex must go around the
entire transaction."""
FINISH_OR_ABORT_CALLED_ID = '_v_finish_or_abort_called'
class DB(TM):
......@@ -188,12 +184,9 @@ class DB(TM):
_p_oid=_p_changed=_registered=None
def __init__(self,connection):
from thread import allocate_lock
self.connection=connection
self.kwargs = kwargs = self._parse_connection_string(connection)
self.db=apply(self.Database_Connection, (), kwargs)
LOG("ZMySQLDA", INFO, "Opened new connection %s: %s" \
% (self.db, connection))
transactional = self.db.server_capabilities & CLIENT.TRANSACTIONS
if self._try_transactions == '-':
transactional = 0
......@@ -202,14 +195,9 @@ class DB(TM):
self._use_TM = self._transactions = transactional
if self._mysql_lock:
self._use_TM = 1
if self._use_TM:
self._tlock = allocate_lock()
self._tthread = None
self._lock = allocate_lock()
def __del__(self):
LOG("ZMySQLDA", INFO, "Closing connection %s: %s" \
% (self.db, self.connection))
def close(self):
if self.db is not None:
self.db.close()
self.db = None
......@@ -254,12 +242,9 @@ class DB(TM):
_care=('TABLE', 'VIEW')):
r=[]
a=r.append
self._lock.acquire()
try:
if 1:
self.db.query("SHOW TABLES")
result = self.db.store_result()
finally:
self._lock.release()
row = result.fetch_row(1)
while row:
a({'TABLE_NAME': row[0][0], 'TABLE_TYPE': 'TABLE'})
......@@ -269,13 +254,10 @@ class DB(TM):
def columns(self, table_name):
from string import join
try:
try:
self._lock.acquire()
# Field, Type, Null, Key, Default, Extra
if 1:
self.db.query('SHOW COLUMNS FROM %s' % table_name)
c=self.db.store_result()
finally:
self._lock.release()
except:
return ()
r=[]
......@@ -321,8 +303,7 @@ class DB(TM):
result=()
db=self.db
try:
try:
self._lock.acquire()
if 1:
for qs in filter(None, map(strip,split(query_string, '\0'))):
qtype = upper(split(qs, None, 1)[0])
if qtype == "SELECT" and max_rows:
......@@ -340,8 +321,6 @@ class DB(TM):
result=c.fetch_row(max_rows)
else:
desc=None
finally:
self._lock.release()
except OperationalError, m:
if m[0] not in hosed_connection: raise
......@@ -366,9 +345,6 @@ class DB(TM):
def string_literal(self, s): return self.db.string_literal(s)
def _begin(self, *ignored):
from thread import get_ident
self._tlock.acquire()
self._tthread = get_ident()
try:
if self._transactions:
self.db.query("BEGIN")
......@@ -379,13 +355,10 @@ class DB(TM):
except:
LOG('ZMySQLDA', ERROR, "exception during _begin",
error=sys.exc_info())
self._tlock.release()
raise
def _finish(self, *ignored):
from thread import get_ident
if not self._tlock.locked() or self._tthread != get_ident():
LOG('ZMySQLDA', INFO, "ignoring _finish")
if getattr(self, FINISH_OR_ABORT_CALLED_ID, False):
return
try:
try:
......@@ -400,12 +373,11 @@ class DB(TM):
error=sys.exc_info())
raise
finally:
self._tlock.release()
self._v_database_connection = None
setattr(self, FINISH_OR_ABORT_CALLED_ID, True)
def _abort(self, *ignored):
from thread import get_ident
if not self._tlock.locked() or self._tthread != get_ident():
LOG('ZMySQLDA', INFO, "ignoring _abort")
if getattr(self, FINISH_OR_ABORT_CALLED_ID, False):
return
try:
if self._mysql_lock:
......@@ -417,4 +389,5 @@ class DB(TM):
else:
LOG('ZMySQLDA', ERROR, "aborting when non-transactional")
finally:
self._tlock.release()
setattr(self, FINISH_OR_ABORT_CALLED_ID, True)
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