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

IdoQuery: Fix incorrect GROUP BY for MySQL SELECTs with joined columns 

refs #10316
This commit is contained in:
Johannes Meyer 2015-11-12 16:02:41 +01:00
parent 89d8126226
commit 140e288c0b
2 changed files with 104 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -3,8 +3,6 @@
namespace Icinga\Module\Monitoring\Backend\Ido\Query; namespace Icinga\Module\Monitoring\Backend\Ido\Query;
use AppendIterator;
use ArrayIterator;
use Zend_Db_Expr; use Zend_Db_Expr;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;
@ -14,8 +12,8 @@ use Icinga\Data\Filter\FilterExpression;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Exception\QueryException; use Icinga\Exception\QueryException;
use Icinga\Module\Monitoring\Data\ColumnFilterIterator;
use Icinga\Web\Session; use Icinga\Web\Session;
use Icinga\Module\Monitoring\Data\ColumnFilterIterator;
/** /**
* Base class for Ido Queries * Base class for Ido Queries
@ -122,7 +120,7 @@ abstract class IdoQuery extends DbQuery
protected $joinedVirtualTables = array(); protected $joinedVirtualTables = array();
/** /**
* Unresolved order columns * List of column aliases used for sorting the result
* *
* @var array * @var array
*/ */
@ -445,7 +443,7 @@ abstract class IdoQuery extends DbQuery
return $this; return $this;
} }
$this->orderColumns[$alias] = $alias; $this->orderColumns[] = $alias;
return parent::order($column, $dir); return parent::order($column, $dir);
} }
@ -993,16 +991,65 @@ abstract class IdoQuery extends DbQuery
} }
/** /**
* Handle grouping for special columns, e.g. when the column sources more than one table * Register the GROUP BY columns required for the given alias
* *
* @param string $column Column * @param string $alias The alias to register columns for
* @param array $groupColumns GROUP BY list * @param string $table The table the given alias is associated with
* @param array $groupedTables Already grouped tables * @param array $groupedColumns The grouping columns registered so far
* * @param array $groupedTables The tables for which columns were registered so far
* @return bool Whether the column was handled
*/ */
protected function handleGroupColumn($column, &$groupColumns, &$groupedTables) { protected function registerGroupColumns($alias, $table, array &$groupedColumns, array &$groupedTables)
return false; {
switch ($table) {
case 'checktimeperiods':
$groupedColumns[] = 'ctp.timeperiod_id';
break;
case 'contacts':
$groupedColumns[] = 'co.object_id';
$groupedColumns[] = 'c.contact_id';
break;
case 'hostobjects':
$groupedColumns[] = 'ho.object_id';
break;
case 'hosts':
$groupedColumns[] = 'h.host_id';
break;
case 'hostgroups':
$groupedColumns[] = 'hgo.object_id';
$groupedColumns[] = 'hg.hostgroup_id';
break;
case 'hoststatus':
$groupedColumns[] = 'hs.hoststatus_id';
break;
case 'instances':
$groupedColumns[] = 'i.instance_id';
break;
case 'servicegroups':
$groupedColumns[] = 'sgo.object_id';
$groupedColumns[] = 'sg.servicegroup_id';
break;
case 'serviceobjects':
$groupedColumns[] = 'so.object_id';
break;
case 'serviceproblemsummary':
$groupedColumns[] = 'sps.unhandled_services_count';
break;
case 'services':
$groupedColumns[] = 'so.object_id';
$groupedColumns[] = 's.service_id';
break;
case 'servicestatus':
$groupedColumns[] = 'ss.servicestatus_id';
break;
case 'timeperiods':
$groupedColumns[] = 'ht.timeperiod_id';
$groupedColumns[] = 'st.timeperiod_id';
break;
default:
return;
}
$groupedTables[$table] = true;
} }
/** /**
@ -1014,82 +1061,38 @@ abstract class IdoQuery extends DbQuery
if (! is_array($group)) { if (! is_array($group)) {
$group = array($group); $group = array($group);
} }
foreach ($this->groupOrigin as $table) {
if ($this->hasJoinedVirtualTable($table)) {
$groupedTables = array();
foreach ($this->groupBase as $table => $columns) {
foreach ($columns as $column) {
$group[] = $column;
}
$groupedTables[$table] = true;
}
if ($this->getDatasource()->getDbType() !== 'pgsql') {
return $group;
}
$columnIterator = new AppendIterator();
$columnIterator->append(new ColumnFilterIterator($this->columns));
$columnIterator->append(new ArrayIterator($this->orderColumns));
foreach ($columnIterator as $alias => $column) {
$alias = $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias);
if ($this->handleGroupColumn($alias, $group, $groupedTables) === true) {
continue;
}
$tableName = $this->aliasToTableName($alias);
if (isset($groupedTables[$tableName])) {
continue;
}
switch ($tableName) {
case 'checktimeperiods':
$group[] = 'ctp.timeperiod_id';
break;
case 'contacts':
$group[] = 'co.object_id';
$group[] = 'c.contact_id';
break;
case 'hostobjects':
$group[] = 'ho.object_id';
break;
case 'hosts':
$group[] = 'h.host_id';
break;
case 'hostgroups':
$group[] = 'hgo.object_id';
$group[] = 'hg.hostgroup_id';
break;
case 'hoststatus':
$group[] = 'hs.hoststatus_id';
break;
case 'instances':
$group[] = 'i.instance_id';
break;
case 'servicegroups':
$group[] = 'sgo.object_id';
$group[] = 'sg.servicegroup_id';
break;
case 'serviceobjects':
$group[] = 'so.object_id';
break;
case 'serviceproblemsummary':
$group[] = 'sps.unhandled_services_count';
break;
case 'services':
$group[] = 'so.object_id';
$group[] = 's.service_id';
break;
case 'servicestatus':
$group[] = 'ss.servicestatus_id';
break;
case 'timeperiods':
$group[] = 'ht.timeperiod_id';
$group[] = 'st.timeperiod_id';
break;
default:
continue 2;
}
$groupedTables[$tableName] = true;
}
break; $joinedOrigins = array_filter($this->groupOrigin, array($this, 'hasJoinedVirtualTable'));
if (empty($joinedOrigins)) {
return $group;
}
$groupedTables = array();
foreach ($this->groupBase as $baseTable => $aliasedPks) {
$groupedTables[$baseTable] = true;
foreach ($aliasedPks as $aliasedPk) {
$group[] = $aliasedPk;
}
}
foreach (new ColumnFilterIterator($this->columns) as $desiredAlias => $desiredColumn) {
$alias = is_string($desiredAlias) ? $this->customAliasToAlias($desiredAlias) : $desiredColumn;
$table = $this->aliasToTableName($alias);
if ($table && !isset($groupedTables[$table]) && (
in_array($table, $joinedOrigins, true) || $this->getDatasource()->getDbType() === 'pgsql')
) {
$this->registerGroupColumns($alias, $table, $group, $groupedTables);
}
}
if (! empty($group) && $this->getDatasource()->getDbType() === 'pgsql') {
foreach (new ColumnFilterIterator($this->orderColumns) as $alias) {
$table = $this->aliasToTableName($alias);
if ($table && !isset($groupedTables[$table])
&& !in_array($this->getMappedField($alias), $this->columns, true)
) {
$this->registerGroupColumns($alias, $table, $group, $groupedTables);
}
} }
} }

28
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
View File

@ -413,22 +413,20 @@ class ServicestatusQuery extends IdoQuery
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function handleGroupColumn($column, &$groupColumns, &$groupedTables) protected function registerGroupColumns($alias, $table, array &$groupedColumns, array &$groupedTables)
{ {
switch ($column) { if ($alias === 'service_handled' || $alias === 'service_severity' || $alias === 'service_unhandled') {
case 'service_handled': if (! isset($groupedTables['hoststatus'])) {
case 'service_severity': $groupedColumns[] = 'hs.hoststatus_id';
case 'service_unhandled': $groupedTables['hoststatus'] = true;
if (! isset($groupedTables['hoststatus'])) { }
$groupColumns[] = 'hs.hoststatus_id';
$groupedTables['hoststatus'] = true; if (! isset($groupedTables['servicestatus'])) {
} $groupedColumns[] = 'ss.servicestatus_id';
if (! isset($groupedTables['servicestatus'])) { $groupedTables['servicestatus'] = true;
$groupColumns[] = 'ss.servicestatus_id'; }
$groupedTables['servicestatus'] = true; } else {
} parent::registerGroupColumns($alias, $table, $groupedColumns, $groupedTables);
return true;
} }
return false;
} }
} }