tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "HostgroupQuery: Use left joins instead of inner joins" 

This reverts commit 4ef085bdcd.
This commit is contained in:
Johannes Meyer 2019-09-25 14:57:58 +02:00
parent 25e1942a9b
commit 94b0689b95
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
View File

@ -59,7 +59,7 @@ class HostgroupQuery extends IdoQuery
END END
END END
END', END',
'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR (hs.has_been_checked IS NULL AND hs.hoststatus_id IS NOT NULL) THEN 99 ELSE hs.current_state END' 'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
), ),
'instances' => array( 'instances' => array(
'instance_name' => 'i.instance_name' 'instance_name' => 'i.instance_name'
@ -112,7 +112,7 @@ class HostgroupQuery extends IdoQuery
END END
END END
END', END',
'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR (ss.has_been_checked IS NULL AND ss.servicestatus_id IS NOT NULL) THEN 99 ELSE ss.current_state END' 'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
) )
); );
@ -171,7 +171,7 @@ class HostgroupQuery extends IdoQuery
protected function joinHosts() protected function joinHosts()
{ {
$this->requireVirtualTable('members'); $this->requireVirtualTable('members');
$this->select->joinLeft( $this->select->join(
array('h' => $this->prefix . 'hosts'), array('h' => $this->prefix . 'hosts'),
'h.host_object_id = ho.object_id', 'h.host_object_id = ho.object_id',
array() array()
@ -184,7 +184,7 @@ class HostgroupQuery extends IdoQuery
protected function joinHoststatus() protected function joinHoststatus()
{ {
$this->requireVirtualTable('members'); $this->requireVirtualTable('members');
$this->select->joinLeft( $this->select->join(
array('hs' => $this->prefix . 'hoststatus'), array('hs' => $this->prefix . 'hoststatus'),
'hs.host_object_id = ho.object_id', 'hs.host_object_id = ho.object_id',
array() array()
@ -196,7 +196,7 @@ class HostgroupQuery extends IdoQuery
*/ */
protected function joinInstances() protected function joinInstances()
{ {
$this->select->joinLeft( $this->select->join(
array('i' => $this->prefix . 'instances'), array('i' => $this->prefix . 'instances'),
'i.instance_id = hg.instance_id', 'i.instance_id = hg.instance_id',
array() array()
@ -208,11 +208,11 @@ class HostgroupQuery extends IdoQuery
*/ */
protected function joinMembers() protected function joinMembers()
{ {
$this->select->joinLeft( $this->select->join(
array('hgm' => $this->prefix . 'hostgroup_members'), array('hgm' => $this->prefix . 'hostgroup_members'),
'hgm.hostgroup_id = hg.hostgroup_id', 'hgm.hostgroup_id = hg.hostgroup_id',
array() array()
)->joinLeft( )->join(
array('ho' => $this->prefix . 'objects'), array('ho' => $this->prefix . 'objects'),
'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1', 'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
array() array()
@ -225,15 +225,15 @@ class HostgroupQuery extends IdoQuery
protected function joinServicegroups() protected function joinServicegroups()
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->select->joinLeft( $this->select->join(
array('sgm' => $this->prefix . 'servicegroup_members'), array('sgm' => $this->prefix . 'servicegroup_members'),
'sgm.service_object_id = s.service_object_id', 'sgm.service_object_id = s.service_object_id',
array() array()
)->joinLeft( )->join(
array('sg' => $this->prefix . 'servicegroups'), array('sg' => $this->prefix . 'servicegroups'),
'sgm.servicegroup_id = sg.servicegroup_id', 'sgm.servicegroup_id = sg.servicegroup_id',
array() array()
)->joinLeft( )->join(
array('sgo' => $this->prefix . 'objects'), array('sgo' => $this->prefix . 'objects'),
'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4', 'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
array() array()
@ -246,11 +246,11 @@ class HostgroupQuery extends IdoQuery
protected function joinServices() protected function joinServices()
{ {
$this->requireVirtualTable('hosts'); $this->requireVirtualTable('hosts');
$this->select->joinLeft( $this->select->join(
array('s' => $this->prefix . 'services'), array('s' => $this->prefix . 'services'),
's.host_object_id = h.host_object_id', 's.host_object_id = h.host_object_id',
array() array()
)->joinLeft( )->join(
array('so' => $this->prefix . 'objects'), array('so' => $this->prefix . 'objects'),
'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2', 'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
array() array()
@ -264,7 +264,7 @@ class HostgroupQuery extends IdoQuery
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->requireVirtualTable('hoststatus'); $this->requireVirtualTable('hoststatus');
$this->select->joinLeft( $this->select->join(
array('ss' => $this->prefix . 'servicestatus'), array('ss' => $this->prefix . 'servicestatus'),
'ss.service_object_id = so.object_id', 'ss.service_object_id = so.object_id',
array() array()