From edc568fcd8b7dd3b7457dc8426d30051706af12b Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 28 Feb 2013 03:58:06 +0000 Subject: Remove duplicate options(joinedload) from aggregates db code _aggregate_get_query already does option joinedload. So when use it don't need to use additional options(joinedload). Change-Id: I11a080c262122bf1b59984e5e80f6095527bf507 --- nova/db/sqlalchemy/api.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index f26d67cac..b888d2628 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4228,7 +4228,7 @@ def aggregate_create(context, values, metadata=None): values['name'], session=session, read_deleted='no') - aggregate = query.options(joinedload('_metadata')).first() + aggregate = query.first() if not aggregate: aggregate = models.Aggregate() aggregate.update(values) @@ -4250,7 +4250,7 @@ def aggregate_get(context, aggregate_id): models.Aggregate, models.Aggregate.id, aggregate_id) - aggregate = query.options(joinedload('_metadata')).first() + aggregate = query.first() if not aggregate: raise exception.AggregateNotFound(aggregate_id=aggregate_id) @@ -4304,8 +4304,7 @@ def aggregate_update(context, aggregate_id, values): models.Aggregate, models.Aggregate.id, aggregate_id, - session=session). - options(joinedload('_metadata')).first()) + session=session).first()) if aggregate: if "availability_zone" in values: -- cgit