composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk

Browse Source 
N.1065 Fix performance issues.
* Does not cache requests containing "id IN ..." and "id NOT IN ..." (too specific) [from revisions 5012, 5019]

SVN:2.4[5020]
This commit is contained in:
Eric Espié
2017-10-12 15:33:23 +00:00
parent e896f8af3d
commit 3d89ef9076
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/dbobjectsearch.class.php
View File

@@ -1467,6 +1467,7 @@ class DBObjectSearch extends DBSearch
// Create a unique cache id
//
$aContextData = array();
$bCanCache = true;
if (self::$m_bQueryCacheEnabled || self::$m_bTraceQueries)
{
if (isset($_SERVER['REQUEST_URI']))
@@ -1484,6 +1485,12 @@ class DBObjectSearch extends DBSearch
// Need to identify the query
$sOqlQuery = $oSearch->ToOql(false, null, true);
if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false))
{
// Requests containing "id IN" are not worth caching
$bCanCache = false;
}
$aContextData['sOqlQuery'] = $sOqlQuery;
if (count($aModifierProperties))
@@ -1578,7 +1585,7 @@ class DBObjectSearch extends DBSearch
if (self::$m_bQueryCacheEnabled)
{
if (self::$m_bUseAPCCache)
if ($bCanCache && self::$m_bUseAPCCache)
{
$oSQLQuery->m_aContextData = $aContextData;
$oKPI = new ExecutionKPI();