cubicweb: comparison server/sources/native.py

equal deleted inserted replaced

-:46ed25d38fe2
+:e337a9f658e0
-# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
 #
 # CubicWeb is free software: you can redistribute it and/or modify it under the
 OR EXISTS(SELECT 1 FROM tx_relation_actions as TRA
 WHERE TRA.tx_uuid=T.tx_uuid AND (
 TRA.eid_from=%(eid)s OR TRA.eid_to=%(eid)s))
 )''' % {'txuuid': session.transaction_data['undoing_uuid'],
 'eid': eid}).fetchone()
+class DefaultEidGenerator(object):
+__slots__ = ('source', 'cnx', 'lock')
+def __init__(self, source):
+self.source = source
+self.cnx = None
+self.lock = Lock()
+def close(self):
+if self.cnx:
+self.cnx.close()
+self.cnx = None
+def create_eid(self, _session):
+# lock needed to prevent 'Connection is busy with results for another
+# command (0)' errors with SQLServer
+with self.lock:
+return self._create_eid() # pylint: disable=E1102
+def _create_eid(self): # pylint: disable=E0202
+# internal function doing the eid creation without locking.
+# needed for the recursive handling of disconnections (otherwise we
+# deadlock on self._eid_cnx_lock
+source = self.source
+if self.cnx is None:
+self.cnx = source.get_connection()
+cnx = self.cnx
+try:
+cursor = cnx.cursor()
+for sql in source.dbhelper.sqls_increment_sequence('entities_id_seq'):
+cursor.execute(sql)
+eid = cursor.fetchone()[0]
+except (source.OperationalError, source.InterfaceError):
+# FIXME: better detection of deconnection pb
+source.warning("trying to reconnect create eid connection")
+self.cnx = None
+return self._create_eid() # pylint: disable=E1102
+except source.DbapiError as exc:
+# We get this one with pyodbc and SQL Server when connection was reset
+if exc.args[0] == '08S01':
+source.warning("trying to reconnect create eid connection")
+self.cnx = None
+return self._create_eid() # pylint: disable=E1102
+else:
+raise
+except Exception: # WTF?
+cnx.rollback()
+self.cnx = None
+source.exception('create eid failed in an unforeseen way on SQL statement %s', sql)
+raise
+else:
+cnx.commit()
+return eid
+class SQLITEEidGenerator(object):
+__slots__ = ('source', 'lock')
+def __init__(self, source):
+self.source = source
+self.lock = Lock()
+def close(self):
+pass
+def create_eid(self, session):
+source = self.source
+with self.lock:
+for sql in source.dbhelper.sqls_increment_sequence('entities_id_seq'):
+cursor = source.doexec(session, sql)
+return cursor.fetchone()[0]
 class NativeSQLSource(SQLAdapterMixIn, AbstractSource):
 """adapter for source using the native cubicweb schema (see below)
 """
 ATTR_MAP.copy())
 # full text index helper
 self.do_fti = not repo.config['delay-full-text-indexation']
 # sql queries cache
 self._cache = QueryCache(repo.config['rql-cache-size'])
-# we need a lock to protect eid attribution function (XXX, really?
-# explain)
-self._eid_cnx_lock = Lock()
-self._eid_creation_cnx = None
 # (etype, attr) / storage mapping
 self._storages = {}
+self.binary_to_str = self.dbhelper.dbapi_module.binary_to_str
 if self.dbdriver == 'sqlite':
-self._create_eid = None
+self.eid_generator = SQLITEEidGenerator(self)
-self.create_eid = self._create_eid_sqlite
+else:
-self.binary_to_str = self.dbhelper.dbapi_module.binary_to_str
+self.eid_generator = DefaultEidGenerator(self)
+self.create_eid = self.eid_generator.create_eid
 def check_config(self, source_entity):
 """check configuration of source entity"""
 if source_entity.host_config:
 msg = source_entity._cw._('the system source has its configuration '
 self.eid_type_source = self.eid_type_source_pre_131
 super(NativeSQLSource, self).init(activated, source_entity)
 self.init_creating(source_entity._cw.cnxset)
 def shutdown(self):
-if self._eid_creation_cnx:
+self.eid_generator.close()
-self._eid_creation_cnx.close()
-self._eid_creation_cnx = None
 # XXX deprecates [un]map_attribute?
 def map_attribute(self, etype, attr, cb, sourcedb=True):
 self._rql_sqlgen.attr_map['%s.%s' % (etype, attr)] = (cb, sourcedb)
 if result:
 return result[0]
 except Exception:
 pass
 return None
-def _create_eid_sqlite(self, session):
-with self._eid_cnx_lock:
-for sql in self.dbhelper.sqls_increment_sequence('entities_id_seq'):
-cursor = self.doexec(session, sql)
-return cursor.fetchone()[0]
-def create_eid(self, session): # pylint: disable=E0202
-# lock needed to prevent 'Connection is busy with results for another
-# command (0)' errors with SQLServer
-with self._eid_cnx_lock:
-return self._create_eid() # pylint: disable=E1102
-def _create_eid(self): # pylint: disable=E0202
-# internal function doing the eid creation without locking.
-# needed for the recursive handling of disconnections (otherwise we
-# deadlock on self._eid_cnx_lock
-if self._eid_creation_cnx is None:
-self._eid_creation_cnx = self.get_connection()
-cnx = self._eid_creation_cnx
-try:
-cursor = cnx.cursor()
-for sql in self.dbhelper.sqls_increment_sequence('entities_id_seq'):
-cursor.execute(sql)
-eid = cursor.fetchone()[0]
-except (self.OperationalError, self.InterfaceError):
-# FIXME: better detection of deconnection pb
-self.warning("trying to reconnect create eid connection")
-self._eid_creation_cnx = None
-return self._create_eid() # pylint: disable=E1102
-except self.DbapiError as exc:
-# We get this one with pyodbc and SQL Server when connection was reset
-if exc.args[0] == '08S01':
-self.warning("trying to reconnect create eid connection")
-self._eid_creation_cnx = None
-return self._create_eid() # pylint: disable=E1102
-else:
-raise
-except Exception: # WTF?
-cnx.rollback()
-self._eid_creation_cnx = None
-self.exception('create eid failed in an unforeseen way on SQL statement %s', sql)
-raise
-else:
-cnx.commit()
-return eid
 def _handle_is_relation_sql(self, session, sql, attrs):
 """ Handler for specific is_relation sql that may be
 overwritten in some stores"""
 self.doexec(session, sql % attrs)

changeset 9583	e337a9f658e0
parent 9574	2d4c4842bd04
child 9585	3f5b59527d31