Merge pull request #405 from Icinga/query-optimization

Optimize queries
Icinga · Nov 12, 2021 · 8d6a8a5 · 8d6a8a5
2 parents 698b84b + 2405936
commit 8d6a8a5
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 27 deletions.
diff --git a/application/controllers/CommentsController.php b/application/controllers/CommentsController.php
@@ -43,11 +43,11 @@ public function indexAction()
         $sortControl = $this->createSortControl(
             $comments,
             [
-                'comment.entry_time desc'                 => t('Entry Time'),
-                'host.display_name, service.display_name' => t('Host'),
-                'service.display_name, host.display_name' => t('Service'),
-                'comment.author'                          => t('Author'),
-                'comment.expire_time desc'                => t('Expire Time')
+                'comment.entry_time desc'  => t('Entry Time'),
+                'host.display_name'        => t('Host'),
+                'service.display_name'     => t('Service'),
+                'comment.author'           => t('Author'),
+                'comment.expire_time desc' => t('Expire Time')
             ]
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);

diff --git a/application/controllers/DowntimesController.php b/application/controllers/DowntimesController.php
@@ -43,16 +43,16 @@ public function indexAction()
         $sortControl = $this->createSortControl(
             $downtimes,
             [
-                'downtime.is_in_effect, downtime.start_time desc' => t('Is In Effect'),
-                'downtime.entry_time'                             => t('Entry Time'),
-                'host.display_name, service.display_name'         => t('Host'),
-                'service.display_name, host.display_name'         => t('Service'),
-                'downtime.author'                                 => t('Author'),
-                'downtime.start_time desc'                        => t('Start Time'),
-                'downtime.end_time desc'                          => t('End Time'),
-                'downtime.scheduled_start_time desc'              => t('Scheduled Start Time'),
-                'downtime.scheduled_end_time desc'                => t('Scheduled End Time'),
-                'downtime.duration desc'                          => t('Duration')
+                'downtime.is_in_effect desc, downtime.start_time desc' => t('Is In Effect'),
+                'downtime.entry_time'                                  => t('Entry Time'),
+                'host.display_name'                                    => t('Host'),
+                'service.display_name'                                 => t('Service'),
+                'downtime.author'                                      => t('Author'),
+                'downtime.start_time desc'                             => t('Start Time'),
+                'downtime.end_time desc'                               => t('End Time'),
+                'downtime.scheduled_start_time desc'                   => t('Scheduled Start Time'),
+                'downtime.scheduled_end_time desc'                     => t('Scheduled End Time'),
+                'downtime.duration desc'                               => t('Duration')
             ]
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);
@@ -68,6 +68,7 @@ public function indexAction()
             } else {
                 $this->addControl($searchBar);
                 $this->sendMultipartUpdate();
+
                 return;
             }
         } else {

diff --git a/application/controllers/HistoryController.php b/application/controllers/HistoryController.php
@@ -78,9 +78,11 @@ public function indexAction()
 
         $history->filter(Filter::lessThanOrEqual('event_time', $before));
         $this->filter($history, $filter);
+
+        $history->getWith()['history.host']->setJoinType('LEFT');
         $history->getSelectBase()
-            // Make sure we'll fetch service history entries only for services which still exist
-            ->where(['history.service_id IS NULL', 'history_service.id IS NOT NULL'], Sql::ANY);
+            // Because of LEFT JOINs, make sure we'll fetch history entries only for items which still exist:
+            ->where(['history_host.id IS NOT NULL', 'history_service.id IS NOT NULL'], Sql::ANY);
 
         yield $this->export($history);
 

diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
@@ -126,8 +126,8 @@ public function historyAction()
         $history
             ->getSelectBase()
             ->where([
-                'history_host.id = ?' => $this->host->id,
-                'history.object_type = ?' => 'host'
+                'history.host_id = ?' => $this->host->id,
+                'history.service_id IS NULL'
             ]);
 
         $before = $this->params->shift('before', time());

diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -38,6 +38,7 @@ public function indexAction()
         $db = $this->getDb();
 
         $hosts = Host::on($db)->with(['state', 'icon_image', 'state.last_comment']);
+        $hosts->getWith()['host.state']->setJoinType('INNER');
         $hosts->setResultSetClass(VolatileStateResults::class);
 
         $this->handleSearchRequest($hosts);

diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
@@ -127,8 +127,8 @@ public function historyAction()
         $history
             ->getSelectBase()
             ->where([
-                'history_host_service.id = ?' => $this->service->id,
-                'history_service.id = ?' => $this->service->id
+                'history.host_id = ?'    => $this->service->host_id,
+                'history.service_id = ?' => $this->service->id
             ]);
 
         $before = $this->params->shift('before', time());

diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
@@ -47,6 +47,7 @@ public function indexAction()
             'host.state',
             'icon_image'
         ]);
+        $services->getWith()['service.state']->setJoinType('INNER');
         $services->setResultSetClass(VolatileStateResults::class);
 
         $this->handleSearchRequest($services);
@@ -61,11 +62,11 @@ public function indexAction()
         $sortControl = $this->createSortControl(
             $services,
             [
-                'service.display_name, host.display_name' => t('Name'),
-                'service.state.severity desc'             => t('Severity'),
-                'service.state.soft_state'                => t('Current State'),
-                'service.state.last_state_change desc'    => t('Last State Change'),
-                'host.display_name, service.display_name' => t('Host')
+                'service.display_name'                 => t('Name'),
+                'service.state.severity desc'          => t('Severity'),
+                'service.state.soft_state'             => t('Current State'),
+                'service.state.last_state_change desc' => t('Last State Change'),
+                'host.display_name'                    => t('Host')
             ]
         );
         $viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);

diff --git a/library/Icingadb/Model/Downtime.php b/library/Icingadb/Model/Downtime.php
@@ -89,7 +89,7 @@ public function getSearchColumns()
 
     public function getDefaultSort()
     {
-        return ['downtime.is_in_effect', 'downtime.start_time desc'];
+        return ['downtime.is_in_effect desc', 'downtime.start_time desc'];
     }
 
     public function createBehaviors(Behaviors $behaviors)