From bf7e6b359139a1dd6bb9928983998d002018c7d3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:38 +0200
Subject: [PATCH] ServicecommentQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/ServicecommentQuery.php | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
index 005ef0184..e23316377 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -69,14 +69,8 @@ class ServicecommentQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = c.object_id',
+            'so.object_id = c.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = 2',
-            1
         );
         $this->joinedVirtualTables['comments'] = true;
     }
@@ -96,15 +90,8 @@ class ServicecommentQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }
@@ -150,15 +137,8 @@ class ServicecommentQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }