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

RepositoryQuery: Optimize value conversion in fetchColumn & -Pairs

This commit is contained in:
Johannes Meyer 2015-06-26 15:11:15 +02:00
parent ae21baa41e
commit 0bcf7907d4
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Icinga/Repository/RepositoryQuery.php
View File

@ -450,10 +450,12 @@ class RepositoryQuery implements QueryInterface, Iterator
$columns = $this->getColumns(); $columns = $this->getColumns();
$aliases = array_keys($columns); $aliases = array_keys($columns);
$column = is_int($aliases[0]) ? $columns[0] : $aliases[0]; $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];
if ($this->repository->providesValueConversion($this->target, $column)) {
foreach ($results as & $value) { foreach ($results as & $value) {
$value = $this->repository->retrieveColumn($this->target, $column, $value); $value = $this->repository->retrieveColumn($this->target, $column, $value);
} }
} }
}
return $results; return $results;
} }
@ -475,16 +477,21 @@ class RepositoryQuery implements QueryInterface, Iterator
if (! empty($results) && $this->repository->providesValueConversion($this->target)) { if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
$columns = $this->getColumns(); $columns = $this->getColumns();
$aliases = array_keys($columns); $aliases = array_keys($columns);
$newResults = array();
foreach ($results as $colOneValue => $colTwoValue) {
$colOne = $aliases[0] !== 0 ? $aliases[0] : $columns[0]; $colOne = $aliases[0] !== 0 ? $aliases[0] : $columns[0];
$colTwo = count($aliases) < 2 ? $colOne : ($aliases[1] !== 1 ? $aliases[1] : $columns[1]); $colTwo = count($aliases) < 2 ? $colOne : ($aliases[1] !== 1 ? $aliases[1] : $columns[1]);
if (
$this->repository->providesValueConversion($this->target, $colOne)
|| $this->repository->providesValueConversion($this->target, $colTwo)
) {
$newResults = array();
foreach ($results as $colOneValue => $colTwoValue) {
$colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue); $colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue);
$newResults[$colOneValue] = $this->repository->retrieveColumn($this->target, $colTwo, $colTwoValue); $newResults[$colOneValue] = $this->repository->retrieveColumn($this->target, $colTwo, $colTwoValue);
} }
$results = $newResults; $results = $newResults;
} }
}
return $results; return $results;
} }