From 1a32d289b8cbf0629b383d7d532f88e3019efbea Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 16 Jun 2015 08:10:16 +0200 Subject: [PATCH] HostcommenthistoryQuery: Improve JOIN performance refs #9009 --- .../Ido/Query/HostcommenthistoryQuery.php | 35 +++---------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php index 259fe1c18..60f91cb15 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php @@ -73,14 +73,8 @@ class HostcommenthistoryQuery extends IdoQuery array() )->join( array('ho' => $this->prefix . 'objects'), - 'ho.object_id = hch.object_id', + 'ho.object_id = hch.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1', array() - )->where( - 'ho.is_active = ?', - 1 - )->where( - 'ho.objecttype_id = ?', - 1 ); $this->joinedVirtualTables['commenthistory'] = true; $this->joinedVirtualTables['history'] = true; @@ -101,15 +95,8 @@ class HostcommenthistoryQuery 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->select->group(array('hch.commenthistory_id', 'ho.name1')); } @@ -142,15 +129,8 @@ class HostcommenthistoryQuery 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 ); } @@ -165,15 +145,8 @@ class HostcommenthistoryQuery extends IdoQuery array() )->join( array('so' => $this->prefix . 'objects'), - 'so.object_id = s.service_object_id', + '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->select->group(array('hch.commenthistory_id', 'ho.name1')); }