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

Optimization: don't try to cache the structure of all the tables in the database. Focus on the ones used by the data model !

Browse Source 
SVN:code[39]
This commit is contained in:
Denis Flaven
2009-04-14 17:00:24 +00:00
parent 0539b58e06
commit 5df462514a
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/cmdbsource.class.inc.php
View File

@@ -363,20 +363,20 @@ class CMDBSource
{
self::$m_aTablesInfo = array();
}
private static function _TablesInfoCacheInit()
private static function _TableInfoCacheInit($sTableName)
{
if (!empty(self::$m_aTablesInfo)) return;
if (isset(self::$m_aTablesInfo[strtolower($sTableName)])
&& (self::$m_aTablesInfo[strtolower($sTableName)] != null)) return;
$aTables = self::QueryToArray("SHOW TABLES FROM `".self::$m_sDBName."`", 0);
foreach ($aTables as $aTableData)
try
{
$sTableName = $aTableData[0];
// Check if the table exists
$aFields = self::QueryToArray("SHOW COLUMNS FROM `$sTableName`");
// Note: without backticks, you get an error with some table names (e.g. "group")
foreach ($aFields as $aFieldData)
{
$sFieldName = $aFieldData["Field"];
self::$m_aTablesInfo[$sTableName]["Fields"][$sFieldName] =
self::$m_aTablesInfo[strtolower($sTableName)]["Fields"][$sFieldName] =
array
(
"Name"=>$aFieldData["Field"],
@@ -388,25 +388,31 @@ class CMDBSource
);
}
}
catch(MySQLException $e)
{
// Table does not exist
self::$m_aTablesInfo[strtolower($sTableName)] = null;
}
}
public static function EnumTables()
{
self::_TablesInfoCacheInit();
return array_keys(self::$m_aTablesInfo);
}
//public static function EnumTables()
//{
// self::_TablesInfoCacheInit();
// return array_keys(self::$m_aTablesInfo);
//}
public static function GetTableInfo($sTable)
{
self::_TablesInfoCacheInit();
self::_TableInfoCacheInit($sTable);
// perform a case insensitive match because on Windows the table names become lowercase :-(
foreach(self::$m_aTablesInfo as $sTableName => $aInfo)
{
if (strtolower($sTableName) == strtolower($sTable))
{
return $aInfo;
}
}
return null;
//foreach(self::$m_aTablesInfo as $sTableName => $aInfo)
//{
// if (strtolower($sTableName) == strtolower($sTable))
// {
// return $aInfo;
// }
//}
return self::$m_aTablesInfo[strtolower($sTable)];
//return null;
}
}

11
core/metamodel.class.php
View File

@@ -1808,12 +1808,11 @@ abstract class MetaModel
return false;
}
CMDBSource::SelectDB(self::$m_sDBName);
foreach (CMDBSource::EnumTables() as $sTable)
{
// perform a case insensitive test because on Windows the table names become lowercase :-(
if (strtolower(substr($sTable, 0, strlen(self::$m_sTablePrefix))) == strtolower(self::$m_sTablePrefix)) return true;
}
return false;
// If a table matches the prefix, then consider that the database already exists
$sSQL = "SHOW TABLES LIKE '".strtolower(self::$m_sTablePrefix)."%' ";
$result = CMDBSource::Query($sSQL);
return (CMDBSource::NbRows($result) > 0);
}
public static function DBDrop()