From: Zane Bitter <zbitter@redhat.com>
Date: Mon, 2 Sep 2013 14:02:14 +0000 (+0200)
Subject: Don't use a query for watch_rule_get()
X-Git-Tag: 2014.1~83^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fc0361a897b4683740b75feca82c022b0b1465e0;p=openstack-build%2Fheat-build.git

Don't use a query for watch_rule_get()

When getting a database record by ID, it is much more efficient to get() it
directly than to perform a query or the database to obtain the ID (again)
and then get it.

Change-Id: I89b46d698c033e54ee9a50172ccad3eb3833cb1e
---

diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index dd1716f2..4c1ac228 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -315,8 +315,7 @@ def event_create(context, values):
 
 
 def watch_rule_get(context, watch_rule_id):
-    result = model_query(context, models.WatchRule).\
-        filter_by(id=watch_rule_id).first()
+    result = model_query(context, models.WatchRule).get(watch_rule_id)
     return result