From 0fd155ba84e3ba451e5361fa732fc12aebf98ff5 Mon Sep 17 00:00:00 2001
From: Boris Pavlovic <boris@pavlovic.me>
Date: Mon, 17 Dec 2012 13:49:18 +0400
Subject: db.network_delete_safe() method performance optimization

Using query.count() instead of query.all() to count FixedIp.

blueprint db-session-cleanup

Change-Id: Ibe88765b52518112f9f16727082fd6db97ba9411
---
 nova/db/sqlalchemy/api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 9cc3b64a1..5195a4028 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2109,8 +2109,8 @@ def network_delete_safe(context, network_id):
                          filter_by(network_id=network_id).\
                          filter_by(deleted=False).\
                          filter_by(allocated=True).\
-                         all()
-        if result:
+                         count()
+        if result != 0:
             raise exception.NetworkInUse(network_id=network_id)
         network_ref = network_get(context, network_id=network_id,
                                   session=session)
-- 
cgit