openstack/zaqar
Code Issues Proposed changes

Merge "Simplify SQL run() method"

Browse Source
This commit is contained in:
Jenkins 2017-06-12 08:40:28 +00:00 committed by Gerrit Code Review
commit 154cfa390b
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zaqar/storage/sqlalchemy/driver.py
View File

@ -16,8 +16,6 @@
from osprofiler import profiler from osprofiler import profiler
from osprofiler import sqlalchemy as sa_tracer from osprofiler import sqlalchemy as sa_tracer
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy.orm import scoped_session
from sqlalchemy.orm import sessionmaker
from zaqar.common import decorators from zaqar.common import decorators
from zaqar import storage from zaqar import storage
@ -70,18 +68,11 @@ class ControlDriver(storage.ControlDriverBase):
# that acquires the connection to the DB for the desired scope and # that acquires the connection to the DB for the desired scope and
# closes it once the operations are completed # closes it once the operations are completed
# TODO(wangxiyuan): we should migrate to oslo.db asap. # TODO(wangxiyuan): we should migrate to oslo.db asap.
@decorators.lazy_property(write=False)
def connection(self):
# use scoped_session to avoid multi-threading problem.
session = scoped_session(sessionmaker(bind=self.engine,
autocommit=True))
return session()
def run(self, *args, **kwargs): def run(self, *args, **kwargs):
return self.connection.execute(*args, **kwargs) return self.engine.execute(*args, **kwargs)
def close(self): def close(self):
self.connection.close() pass
@property @property
def pools_controller(self): def pools_controller(self):