From 401d61aa76a8bc97ca82b47672d69370d8476c9a Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Wed, 16 Oct 2013 15:21:20 +0000
Subject: [PATCH] Creation of indexes on several columns (exploited for a few
 classes when it was obvious)

SVN:trunk[2924]
---
 core/cmdbchangeop.class.inc.php               |  5 +-
 core/cmdbsource.class.inc.php                 | 32 +++++++--
 core/event.class.inc.php                      |  7 +-
 core/metamodel.class.php                      | 68 +++++++++++++++++--
 .../datamodel.itop-attachments.xml            | 13 ++++
 .../datamodel.itop-attachments.xml            | 13 ++++
 setup/compiler.class.inc.php                  | 19 +++++-
 7 files changed, 140 insertions(+), 17 deletions(-)

diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php
index 6801573a3..de8306080 100644
--- a/core/cmdbchangeop.class.inc.php
+++ b/core/cmdbchangeop.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2013 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -45,6 +45,9 @@ class CMDBChangeOp extends DBObject
 			"db_table" => "priv_changeop",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "optype",
+			'indexes' => array(
+				array('objclass', 'objkey'),
+			)
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index e831c50ad..c25dfb6bc 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2013 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -480,14 +480,23 @@ class CMDBSource
 		return ($aFieldData["Type"]);
 	}
 
-	public static function HasIndex($sTable, $sField)
+	public static function HasIndex($sTable, $sIndexId, $aFields = null)
 	{
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
-		$aFieldData = $aTableInfo["Fields"][$sField];
-		// $aFieldData could be 'PRI' for the primary key, or 'MUL', or ?
-		return (strlen($aFieldData["Key"]) > 0);
+		if (!array_key_exists($sIndexId, $aTableInfo['Indexes'])) return false;
+
+		if ($aFields == null)
+		{
+			// Just searching for the name
+			return true;
+		}
+
+		// Compare the columns
+		$sSearchedIndex = implode(',', $aFields);
+		$sExistingIndex = implode(',', $aTableInfo['Indexes'][$sIndexId]);
+
+		return ($sSearchedIndex == $sExistingIndex);
 	}
 
 	// Returns an array of (fieldname => array of field info)
@@ -537,6 +546,17 @@ class CMDBSource
 			// Table does not exist
 			self::$m_aTablesInfo[strtolower($sTableName)] = null;
 		}
+
+		if (!is_null(self::$m_aTablesInfo[strtolower($sTableName)]))
+		{
+			$aIndexes = self::QueryToArray("SHOW INDEXES FROM `$sTableName`");
+			$aMyIndexes = array();
+			foreach ($aIndexes as $aIndexColumn)
+			{
+				$aMyIndexes[$aIndexColumn['Key_name']][$aIndexColumn['Seq_in_index']-1] = $aIndexColumn['Column_name'];
+			}
+			self::$m_aTablesInfo[strtolower($sTableName)]["Indexes"] = $aMyIndexes;
+		}
 	}
 	//public static function EnumTables()
 	//{
diff --git a/core/event.class.inc.php b/core/event.class.inc.php
index 887d1c4dd..2c1e4ccf8 100644
--- a/core/event.class.inc.php
+++ b/core/event.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2013 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -137,7 +137,10 @@ class EventNotification extends Event
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
 			"display_template" => "",
-			"order_by_default" => array('date' => false)
+			"order_by_default" => array('date' => false),
+			'indexes' => array(
+				array('object_id'),
+			)
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 3f2bf2418..fb4b2a29e 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2013 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -671,6 +671,19 @@ abstract class MetaModel
 		return $aTables;
 	} 
 
+	final static public function DBGetIndexes($sClass)
+	{
+		self::_check_subclass($sClass);
+		if (isset(self::$m_aClassParams[$sClass]['indexes']))
+		{
+			return self::$m_aClassParams[$sClass]['indexes'];
+		}
+		else
+		{
+			return array();
+		}
+	}
+
 	final static public function DBGetKey($sClass)
 	{
 		self::_check_subclass($sClass);	
@@ -3938,7 +3951,7 @@ abstract class MetaModel
 							$aCreateTableItems[$sTable][$sField] = $sFieldDefinition;
 							if ($bIndexNeeded)
 							{
-								$aCreateTableItems[$sTable][$sField.'_ix'] = "INDEX (`$sField`)";
+								$aCreateTableItems[$sTable][] = "INDEX (`$sField`)";
 							}
 						}
 						else
@@ -3946,7 +3959,7 @@ abstract class MetaModel
 							$aAlterTableItems[$sTable][$sField] = "ADD $sFieldDefinition";
 							if ($bIndexNeeded)
 							{
-								$aAlterTableItems[$sTable][$sField.'_ix'] = "ADD INDEX (`$sField`)";
+								$aAlterTableItems[$sTable][] = "ADD INDEX (`$sField`)";
 							}
 						}
 					}
@@ -3981,15 +3994,58 @@ abstract class MetaModel
 
 						// Create indexes (external keys only... so far)
 						//
-						if ($bIndexNeeded && !CMDBSource::HasIndex($sTable, $sField))
+						if ($bIndexNeeded && !CMDBSource::HasIndex($sTable, $sField, array($sField)))
 						{
 							$aErrors[$sClass][$sAttCode][] = "Foreign key '$sField' in table '$sTable' should have an index";
-							$aSugFix[$sClass][$sAttCode][] = "ALTER TABLE `$sTable` ADD INDEX (`$sField`)";
-							$aAlterTableItems[$sTable][$sField.'_ix'] = "ADD INDEX (`$sField`)";
+							if (CMDBSource::HasIndex($sTable, $sField))
+							{
+								$aSugFix[$sClass][$sAttCode][] = "ALTER TABLE `$sTable` DROP INDEX `$sField`, ADD INDEX (`$sField`)";
+								$aAlterTableItems[$sTable][] = "DROP INDEX `$sField`";
+								$aAlterTableItems[$sTable][] = "ADD INDEX (`$sField`)";
+							}
+							else
+							{
+								$aSugFix[$sClass][$sAttCode][] = "ALTER TABLE `$sTable` ADD INDEX (`$sField`)";
+								$aAlterTableItems[$sTable][] = "ADD INDEX (`$sField`)";
+							}
 						}
 					}
 				}
 			}
+			
+			// Check indexes
+			foreach (self::DBGetIndexes($sClass) as $aColumns)
+			{
+				$sIndexId = implode('_', $aColumns);
+
+				if(!CMDBSource::HasIndex($sTable, $sIndexId, $aColumns))
+				{
+					$sColumns = "`".implode("`, `", $aColumns)."`";
+					if (CMDBSource::HasIndex($sTable, $sIndexId))
+					{
+						$aErrors[$sClass]['*'][] = "Wrong index '$sIndexId' ($sColumns) in table '$sTable'";
+						$aSugFix[$sClass]['*'][] = "ALTER TABLE `$sTable` DROP INDEX `$sIndexId`, ADD INDEX `$sIndexId` ($sColumns)";
+					}
+					else
+					{
+						$aErrors[$sClass]['*'][] = "Missing index '$sIndexId' ($sColumns) in table '$sTable'";
+						$aSugFix[$sClass]['*'][] = "ALTER TABLE `$sTable` ADD INDEX `$sIndexId` ($sColumns)";
+					}
+					if (array_key_exists($sTable, $aCreateTable))
+					{
+						$aCreateTableItems[$sTable][] = "INDEX `$sIndexId` ($sColumns)";
+					}
+					else
+					{
+						if (CMDBSource::HasIndex($sTable, $sIndexId))
+						{
+							$aAlterTableItems[$sTable][] = "DROP INDEX `$sIndexId`";
+						}
+						$aAlterTableItems[$sTable][] = "ADD INDEX `$sIndexId` ($sColumns)";
+					}
+				}
+			}
+			
 			// Find out unused columns
 			//
 			foreach($aTableInfo['Fields'] as $sField => $aFieldData)
diff --git a/datamodels/1.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/1.x/itop-attachments/datamodel.itop-attachments.xml
index 1d9ce4740..afa70830e 100644
--- a/datamodels/1.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/1.x/itop-attachments/datamodel.itop-attachments.xml
@@ -35,6 +35,19 @@
             <attribute id=""/>
           </attributes>
         </reconciliation>
+        <indexes>
+          <index id="1">
+             <attributes>
+               <attribute id="temp_id"/>
+             </attributes>
+          </index>
+          <index id="2">
+             <attributes>
+               <attribute id="item_class"/>
+               <attribute id="item_id"/>
+             </attributes>
+          </index>
+        </indexes>
       </properties>
       <fields>
         <field id="expire" xsi:type="AttributeDateTime">
diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
index 1d9ce4740..afa70830e 100755
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -35,6 +35,19 @@
             <attribute id=""/>
           </attributes>
         </reconciliation>
+        <indexes>
+          <index id="1">
+             <attributes>
+               <attribute id="temp_id"/>
+             </attributes>
+          </index>
+          <index id="2">
+             <attributes>
+               <attribute id="item_class"/>
+               <attribute id="item_id"/>
+             </attributes>
+          </index>
+        </indexes>
       </properties>
       <fields>
         <field id="expire" xsi:type="AttributeDateTime">
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 3392ae190..52cee410e 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2011-2012 Combodo SARL
+// Copyright (C) 2011-2013 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -654,7 +654,22 @@ EOF;
 				$aClassParams['order_by_default'] = "array(".implode(", ", $aSortColumns).")";
 			}
 		}
-	
+
+		if ($oIndexes = $oProperties->GetOptionalElement('indexes'))
+		{
+			$aIndexes = array();
+			foreach($oIndexes->getElementsByTagName('index') as $oIndex)
+			{
+				$sIndexId = $oIndex->getAttribute('id');
+				$oAttributes = $oIndex->GetUniqueElement('attributes');
+				foreach($oAttributes->getElementsByTagName('attribute') as $oAttribute)
+				{
+					$aIndexes[$sIndexId][] = $oAttribute->getAttribute('id');
+				}
+			}
+			$aClassParams['indexes'] = var_export($aIndexes, true);
+		}
+
 
 		// Finalize class params declaration
 		//