openstack
/
heat
Code Issues Proposed changes

db: Remove unnecessary helper functions 

This will make our life easier as we attempt to remove autocommit by
allowing us to maintain a pattern of only opening transactions inside
public methods.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Change-Id: I74069645babc4200ffd4087503277282b4c12792
This commit is contained in:
Stephen Finucane 2023-09-14 11:03:57 +01:00 committed by Takashi Kajinami
parent a9634d3f45
commit ea321003eb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/db/api.py
View File

@ -1024,13 +1024,9 @@ def event_get_all_by_tenant(context, limit=None, marker=None,
sort_keys, sort_dir, filters).all()
def _query_all_events_by_stack(context, stack_id):
return context.session.query(models.Event).filter_by(stack_id=stack_id)
def event_get_all_by_stack(context, stack_id, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None):
query = _query_all_events_by_stack(context, stack_id)
query = context.session.query(models.Event).filter_by(stack_id=stack_id)
if filters and 'uuid' in filters:
# retrieving a single event, so eager load its rsrc_prop_data detail
query = query.options(orm.joinedload(models.Event.rsrc_prop_data))
@ -1089,8 +1085,12 @@ def event_count_all_by_stack(context, stack_id):
def _find_rpd_references(context, stack_id):
ev_ref_ids = set(e.rsrc_prop_data_id for e
in _query_all_events_by_stack(context, stack_id).all())
ev_ref_ids = set(
e.rsrc_prop_data_id for e
in context.session.query(models.Event).filter_by(
stack_id=stack_id,
).all()
)
rsrc_ref_ids = set(r.rsrc_prop_data_id for r
in context.session.query(models.Resource).filter_by(
stack_id=stack_id).all())
@ -1138,7 +1138,9 @@ def _delete_event_rows(context, stack_id, limit):
# pgsql SHOULD work with the pure DELETE/JOIN below but that must be
# confirmed via integration tests.
with context.session.begin():
query = _query_all_events_by_stack(context, stack_id)
query = context.session.query(models.Event).filter_by(
stack_id=stack_id,
)
query = query.order_by(models.Event.id).limit(limit)
id_pairs = [(e.id, e.rsrc_prop_data_id) for e in query.all()]
if not id_pairs: