From 10a65f1e27e3dbce691032a489db96d8e5bbba83 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 16 Jun 2015 08:12:16 +0200 Subject: [PATCH] ServicestatehistoryQuery: Improve JOIN performance refs #9009 --- .../Ido/Query/ServicestatehistoryQuery.php | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php index b00ac1653..81e03646d 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php @@ -90,14 +90,8 @@ class ServicestatehistoryQuery extends IdoQuery array() )->join( array('so' => $this->prefix . 'objects'), - 'so.object_id = sh.object_id', + 'so.object_id = sh.object_id AND so.is_active = 1 AND so.objecttype_id = 2', array() - )->where( - 'so.is_active = ?', - 1 - )->where( - 'so.objecttype_id = ?', - 2 ); $this->joinedVirtualTables['statehistory'] = true; $this->joinedVirtualTables['history'] = true; @@ -119,15 +113,8 @@ class ServicestatehistoryQuery 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('sh.statehistory_id', 'so.name1', 'so.name2')); } @@ -160,15 +147,8 @@ class ServicestatehistoryQuery 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->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2')); }