From 55a6b79ee57bb9dbe76c382b89c34a3802e2a479 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 16 Jun 2015 08:10:49 +0200 Subject: [PATCH] HostgroupQuery: Improve JOIN performance refs #9009 --- .../Backend/Ido/Query/HostgroupQuery.php | 36 +++---------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php index a9b8ec815..45f6a8ae1 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php @@ -53,15 +53,8 @@ class HostgroupQuery 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->joinedVirtualTables['hostgroups'] = true; } @@ -77,15 +70,8 @@ class HostgroupQuery extends IdoQuery array() )->join( array('ho' => $this->prefix . 'objects'), - 'hgm.host_object_id = ho.object_id', + 'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1', array() - )->where( - 'ho.is_active = ?', - 1 - ) - ->where( - 'ho.objecttype_id = ?', - 1 ); $this->group('hgo.name1'); } @@ -119,15 +105,8 @@ class HostgroupQuery 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 ); } @@ -143,15 +122,8 @@ class HostgroupQuery extends IdoQuery array() )->join( array('so' => $this->prefix . 'objects'), - 'so.object_id = s.service_object_id AND so.is_active = 1', + 'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2', array() - )->where( - 'so.is_active = ?', - 1 - ) - ->where( - 'so.objecttype_id = ?', - 2 ); $this->group('hgo.name1'); }