From efeac06dda5afdbe33abcf9b27c8b5b5725c8444 Mon Sep 17 00:00:00 2001 From: Heckad Date: Wed, 1 Jan 2020 20:50:41 +0300 Subject: [PATCH] Rewrite on to use `with` instead of explicit acquire --- lib/sqlalchemy/ext/automap.py | 6 ++-- lib/sqlalchemy/ext/declarative/base.py | 5 +--- lib/sqlalchemy/orm/__init__.py | 19 +++++------- lib/sqlalchemy/orm/mapper.py | 10 ++----- lib/sqlalchemy/pool/dbapi_proxy.py | 5 +--- lib/sqlalchemy/util/_collections.py | 2 +- lib/sqlalchemy/util/langhelpers.py | 10 ++----- lib/sqlalchemy/util/queue.py | 41 ++++++++++++-------------- test/engine/test_pool.py | 5 +--- 9 files changed, 37 insertions(+), 66 deletions(-) diff --git a/lib/sqlalchemy/ext/automap.py b/lib/sqlalchemy/ext/automap.py index 5fa4e88220..4102400c86 100644 --- a/lib/sqlalchemy/ext/automap.py +++ b/lib/sqlalchemy/ext/automap.py @@ -762,8 +762,7 @@ class AutomapBase(object): autoload_replace=False, ) - _CONFIGURE_MUTEX.acquire() - try: + with _CONFIGURE_MUTEX: table_to_map_config = dict( (m.local_table, m) for m in _DeferredMapperConfig.classes_for_base( @@ -818,8 +817,7 @@ class AutomapBase(object): for map_config in _DeferredMapperConfig.classes_for_base(cls): map_config.map() - finally: - _CONFIGURE_MUTEX.release() + _sa_decl_prepare = True """Indicate that the mapping of classes should be deferred. diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py index 622a837363..4247c79d71 100644 --- a/lib/sqlalchemy/ext/declarative/base.py +++ b/lib/sqlalchemy/ext/declarative/base.py @@ -179,8 +179,7 @@ class _MapperConfig(object): self._scan_attributes() - mapperlib._CONFIGURE_MUTEX.acquire() - try: + with mapperlib._CONFIGURE_MUTEX: clsregistry.add_class(self.classname, self.cls) self._extract_mappable_attributes() @@ -192,8 +191,6 @@ class _MapperConfig(object): self._setup_inheritance() self._early_mapping() - finally: - mapperlib._CONFIGURE_MUTEX.release() def _early_mapping(self): self.map() diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index e2eb934095..dc9caaf684 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -231,17 +231,14 @@ def clear_mappers(): upon a fixed set of classes. """ - mapperlib._CONFIGURE_MUTEX.acquire() - try: - while _mapper_registry: - try: - # can't even reliably call list(weakdict) in jython - mapper, b = _mapper_registry.popitem() - mapper.dispose() - except KeyError: - pass - finally: - mapperlib._CONFIGURE_MUTEX.release() + with mapperlib._CONFIGURE_MUTEX, _mapper_registry: + try: + # can't even reliably call list(weakdict) in jython + mapper, b = _mapper_registry.popitem() + mapper.dispose() + except KeyError: + pass + joinedload = strategy_options.joinedload._unbound_fn diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index c23aaf9ef6..1e4f1a2fa7 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -698,8 +698,7 @@ class Mapper(sql_base.HasCacheKey, InspectionAttr): # prevent this mapper from being constructed # while a configure_mappers() is occurring (and defer a # configure_mappers() until construction succeeds) - _CONFIGURE_MUTEX.acquire() - try: + with _CONFIGURE_MUTEX: self.dispatch._events._new_mapper_instance(class_, self) self._configure_inheritance() self._configure_class_instrumentation() @@ -709,8 +708,6 @@ class Mapper(sql_base.HasCacheKey, InspectionAttr): Mapper._new_mappers = True self._log("constructed") self._expire_memoizations() - finally: - _CONFIGURE_MUTEX.release() # major attributes initialized at the classlevel so that # they can be Sphinx-documented. @@ -3167,8 +3164,7 @@ def configure_mappers(): if not Mapper._new_mappers: return - _CONFIGURE_MUTEX.acquire() - try: + with _CONFIGURE_MUTEX: global _already_compiling if _already_compiling: return @@ -3225,8 +3221,6 @@ def configure_mappers(): Mapper._new_mappers = False finally: _already_compiling = False - finally: - _CONFIGURE_MUTEX.release() Mapper.dispatch._for_class(Mapper).after_configured() diff --git a/lib/sqlalchemy/pool/dbapi_proxy.py b/lib/sqlalchemy/pool/dbapi_proxy.py index d78d85d1fc..77f567515e 100644 --- a/lib/sqlalchemy/pool/dbapi_proxy.py +++ b/lib/sqlalchemy/pool/dbapi_proxy.py @@ -104,8 +104,7 @@ class _DBProxy(object): try: return self.pools[key] except KeyError: - self._create_pool_mutex.acquire() - try: + with self._create_pool_mutex: if key not in self.pools: kw.pop("sa_pool_key", None) pool = self.poolclass( @@ -115,8 +114,6 @@ class _DBProxy(object): return pool else: return self.pools[key] - finally: - self._create_pool_mutex.release() def connect(self, *args, **kw): """Activate a connection to the database. diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py index 7b46bc8e6f..95e819a38b 100644 --- a/lib/sqlalchemy/util/_collections.py +++ b/lib/sqlalchemy/util/_collections.py @@ -944,7 +944,7 @@ class LRUCache(dict): return self.capacity + self.capacity * self.threshold def _manage_size(self): - if not self._mutex.acquire(False): + if self._mutex.locked(): return try: size_alert = bool(self.size_alert) diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index 83f119660c..8124764be8 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -1179,11 +1179,8 @@ def counter(): # avoid the 2to3 "next" transformation... def _next(): - lock.acquire() - try: + with lock: return next(counter) - finally: - lock.release() return _next @@ -1362,14 +1359,11 @@ class symbol(object): _lock = compat.threading.Lock() def __new__(cls, name, doc=None, canonical=None): - cls._lock.acquire() - try: + with cls._lock: sym = cls.symbols.get(name) if sym is None: cls.symbols[name] = sym = _symbol(name, doc, canonical) return sym - finally: - symbol._lock.release() @classmethod def parse_user_argument( diff --git a/lib/sqlalchemy/util/queue.py b/lib/sqlalchemy/util/queue.py index 819d95684e..29a358e319 100644 --- a/lib/sqlalchemy/util/queue.py +++ b/lib/sqlalchemy/util/queue.py @@ -17,7 +17,7 @@ producing a ``put()`` inside the ``get()`` and therefore a reentrant condition. """ - +import functools from collections import deque from time import time as _time @@ -39,6 +39,15 @@ class Full(Exception): pass +def atomic(f): + @functools.wraps(f) + def decorated(self, *args, **kwargs): + with self.mutex: + return f(self, *args, **kwargs) + + return decorated + + class Queue: def __init__(self, maxsize=0, use_lifo=False): """Initialize a queue object with a given maximum size. @@ -63,31 +72,25 @@ class Queue: # If this queue uses LIFO or FIFO self.use_lifo = use_lifo + @atomic def qsize(self): """Return the approximate size of the queue (not reliable!).""" - self.mutex.acquire() - n = self._qsize() - self.mutex.release() - return n + return self._qsize() + @atomic def empty(self): """Return True if the queue is empty, False otherwise (not reliable!).""" - self.mutex.acquire() - n = self._empty() - self.mutex.release() - return n + return self._empty() + @atomic def full(self): """Return True if the queue is full, False otherwise (not reliable!).""" - self.mutex.acquire() - n = self._full() - self.mutex.release() - return n + return self._full() def put(self, item, block=True, timeout=None): """Put an item into the queue. @@ -102,8 +105,7 @@ class Queue: (`timeout` is ignored in that case). """ - self.not_full.acquire() - try: + with self.not_full: if not block: if self._full(): raise Full @@ -121,8 +123,6 @@ class Queue: self.not_full.wait(remaining) self._put(item) self.not_empty.notify() - finally: - self.not_full.release() def put_nowait(self, item): """Put an item into the queue without blocking. @@ -143,8 +143,7 @@ class Queue: return an item if one is immediately available, else raise the ``Empty`` exception (`timeout` is ignored in that case). """ - self.not_empty.acquire() - try: + with self.not_empty: if not block: if self._empty(): raise Empty @@ -163,8 +162,6 @@ class Queue: item = self._get() self.not_full.notify() return item - finally: - self.not_empty.release() def get_nowait(self): """Remove and return an item from the queue without blocking. @@ -193,7 +190,7 @@ class Queue: # Check whether the queue is full def _full(self): - return self.maxsize > 0 and len(self.queue) == self.maxsize + return 0 < self.maxsize == len(self.queue) # Put a new item in the queue def _put(self, item): diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 31b8937349..e4d6dba573 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -970,11 +970,8 @@ class QueuePoolTest(PoolTestBase): dbapi = MockDBAPI() def creator(): - mutex.acquire() - try: + with mutex: return dbapi.connect() - finally: - mutex.release() success = [] for timeout in (None, 30): -- 2.47.3