openstack
/
heat
Code Issues Proposed changes

Merge "Simplify event count by stack"

This commit is contained in:
Jenkins 2016-02-24 15:06:08 +00:00 committed by Gerrit Code Review
parent 8b1ee77fd2 165ce0b272
commit bd88cddd43
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/db/sqlalchemy/api.py
View File

@ -25,6 +25,7 @@ from oslo_utils import timeutils
import osprofiler.sqlalchemy import osprofiler.sqlalchemy
import six import six
import sqlalchemy import sqlalchemy
from sqlalchemy import func
from sqlalchemy import orm from sqlalchemy import orm
from sqlalchemy.orm import aliased as orm_aliased from sqlalchemy.orm import aliased as orm_aliased
from sqlalchemy.orm import session as orm_session from sqlalchemy.orm import session as orm_session
@ -768,7 +769,8 @@ def _events_filter_and_page_query(context, query,
def event_count_all_by_stack(context, stack_id): def event_count_all_by_stack(context, stack_id):
return _query_all_by_stack(context, stack_id).count() query = model_query(context, func.count(models.Event.id))
return query.filter_by(stack_id=stack_id).scalar()
def _delete_event_rows(context, stack_id, limit): def _delete_event_rows(context, stack_id, limit):