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

Performance enhancement. Avoid multiple count requests.

Browse Source 
SVN:trunk[5373]
This commit is contained in:
Eric Espié
2018-02-27 15:54:30 +00:00
parent 79381d7fd2
commit cae4526b3b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/dbobjectset.class.php
View File

@@ -634,7 +634,6 @@ class DBObjectSet implements iDBObjectSetIterator
$this->m_oSQLResult->free();
$this->m_oSQLResult = null;
}
$this->m_iNumTotalDBRows = null;
try
{
@@ -666,11 +665,12 @@ class DBObjectSet implements iDBObjectSetIterator
}
if ($this->m_oSQLResult === false) return;
if (($this->m_iLimitCount == 0) && ($this->m_iLimitStart == 0))
if ((($this->m_iLimitCount == 0) || ($this->m_iLimitCount > $this->m_oSQLResult->num_rows)) && ($this->m_iLimitStart == 0))
{
$this->m_iNumTotalDBRows = $this->m_oSQLResult->num_rows;
}
$this->m_iNumLoadedDBRows = $this->m_oSQLResult->num_rows;
}
@@ -714,7 +714,7 @@ class DBObjectSet implements iDBObjectSetIterator
$aRow = CMDBSource::FetchArray($resQuery);
CMDBSource::FreeResult($resQuery);
$this->m_iNumTotalDBRows = $aRow['COUNT'];
$this->m_iNumTotalDBRows = intval($aRow['COUNT']);
}
return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??