composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2272 - OQL performance (code refactor)

Browse Source
This commit is contained in:
Eric
2019-09-12 16:29:14 +02:00
parent 4e66c9fc23
commit f186c9e242
4 changed files with 188 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
core/dbsearch.class.php
View File

@@ -951,7 +951,7 @@ abstract class DBSearch
$e->addInfo('OQL', $this->ToOQL());
throw $e;
}
$this->AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $sRes);
$this->AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $bExcludeNullValues, $aSelectExpr, $aOrderBy, $iLimitCount, $iLimitStart, $sRes);
return $sRes;
}
@@ -1282,7 +1282,7 @@ abstract class DBSearch
if ($hLogFile !== false)
{
flock($hLogFile, LOCK_EX);
fwrite($hLogFile, serialize($aQueryData)."\n");
fwrite($hLogFile, base64_encode(serialize($aQueryData))."\n");
fflush($hLogFile);
flock($hLogFile, LOCK_UN);
fclose($hLogFile);
@@ -1291,27 +1291,53 @@ abstract class DBSearch
}
}
/**
* @internal
*
* @param $aArgs
* @param $aGroupByExpr
* @param $sSql
*
* @throws MySQLException
*/
protected function AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $sSql)
/**
* @internal
*
* @param $aArgs
* @param $aGroupByExpr
* @param $bExcludeNullValues
* @param $aSelectExpr
* @param $aOrderBy
* @param $iLimitCount
* @param $iLimitStart
* @param $sSql
*
* @throws \MySQLException
*/
protected function AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $bExcludeNullValues, $aSelectExpr, $aOrderBy, $iLimitCount, $iLimitStart, $sSql)
{
if (self::$m_bTraceQueries)
if (self::$m_bTraceQueries || (utils::GetConfig()->Get('log_kpi_record_oql') == 1))
{
$aQueryData = array(
'type' => 'group_by',
'filter' => $this,
'order_by' => $aOrderBy,
'args' => $aArgs,
'group_by_expr' => $aGroupByExpr
'group_by_expr' => $aGroupByExpr,
'exclude_null_values' => $bExcludeNullValues,
'select_expr' => $aSelectExpr,
'limit_count' => $iLimitCount,
'limit_start' => $iLimitStart,
);
$sOql = $this->ToOQL(true, $aArgs);
self::AddQueryTrace($aQueryData, $sOql, $sSql);
if (utils::GetConfig()->Get('log_kpi_record_oql') == 1)
{
$aQueryData['oql'] = $sOql;
unset($aQueryData['filter']);
$hLogFile = @fopen(APPROOT.'log/oql_group_by_records.txt', 'a');
if ($hLogFile !== false)
{
flock($hLogFile, LOCK_EX);
fwrite($hLogFile, base64_encode(serialize($aQueryData))."\n");
fflush($hLogFile);
flock($hLogFile, LOCK_UN);
fclose($hLogFile);
}
}
}
}