From c855621e17187c4e63a9390915d1fbf43b2b976b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 9 Jan 2013 14:16:22 +0100
Subject: [PATCH] // performances improvement

---
 classes/Group.php       |  2 +-
 classes/ObjectModel.php | 93 +++++++++++++++++++++++------------------
 2 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/classes/Group.php b/classes/Group.php
index 464112be8..8415db03a 100644
--- a/classes/Group.php
+++ b/classes/Group.php
@@ -301,7 +301,7 @@ class GroupCore extends ObjectModel
 		if (Validate::isLoadedObject($customer))
 			$id_group = (int)$customer->id_default_group;
 
-		return new self($id_group);
+		return new Group($id_group);
 	}
 }
 
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 105c7cdff..29e48fe79 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -169,8 +169,8 @@ abstract class ObjectModelCore
 	{
 		if (!ObjectModel::$db)
 			ObjectModel::$db = Db::getInstance();
-	
-		$this->def = self::getDefinition($this);
+
+		$this->def = ObjectModel::getDefinition($this);
 		$this->setDefinitionRetrocompatibility();
 
 		if ($id_lang !== null)
@@ -209,36 +209,37 @@ abstract class ObjectModelCore
 				// Get shop informations
 				if (Shop::isTableAssociated($this->def['table']))
 					$sql->leftJoin($this->def['table'].'_shop', 'c', 'a.'.$this->def['primary'].' = c.'.$this->def['primary'].' AND c.id_shop = '.(int)$this->id_shop);
-				if ($row = ObjectModel::$db->getRow($sql))
-					Cache::store($cache_id, $row);
+				if ($object_datas = ObjectModel::$db->getRow($sql))
+				{
+					if (!$id_lang && isset($this->def['multilang']) && $this->def['multilang'])
+					{
+						$sql = 'SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->def['table']).'_lang`
+								WHERE `'.$this->def['primary'].'` = '.(int)$id
+								.(($this->id_shop && $this->isLangMultishop()) ? ' AND `id_shop` = '.$this->id_shop : '');
+						if ($object_datas_lang = ObjectModel::$db->executeS($sql))
+							foreach ($object_datas_lang as $row)
+								foreach ($row as $key => $value)
+								{
+									if (array_key_exists($key, $this) && $key != $this->def['primary'])
+									{
+										if (!isset($object_datas[$key]) || !is_array($object_datas[$key]))
+											$object_datas[$key] = array();
+										$object_datas[$key][$row['id_lang']] = $value;
+									}
+								}
+					}
+					Cache::store($cache_id, $object_datas);
+				}
 			}
+			else
+				$object_datas = Cache::retrieve($cache_id);
 
-			$result = Cache::retrieve($cache_id);
-			if ($result)
+			if ($object_datas)
 			{
 				$this->id = (int)$id;
-				foreach ($result as $key => $value)
+				foreach ($object_datas as $key => $value)
 					if (array_key_exists($key, $this))
-						$this->{$key} = $value;
-
-				if (!$id_lang && isset($this->def['multilang']) && $this->def['multilang'])
-				{
-					$sql = 'SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->def['table']).'_lang`
-							WHERE `'.$this->def['primary'].'` = '.(int)$id
-							.(($this->id_shop && $this->isLangMultishop()) ? ' AND `id_shop` = '.$this->id_shop : '');
-					$result = ObjectModel::$db->executeS($sql);
-					if ($result)
-						foreach ($result as $row)
-							foreach ($row as $key => $value)
-							{
-								if (array_key_exists($key, $this) && $key != $this->def['primary'])
-								{
-									if (!is_array($this->{$key}))
-										$this->{$key} = array();
-									$this->{$key}[$row['id_lang']] = $value;
-								}
-							}
-				}
+						$this->{$key} = $value;	
 			}
 		}
 
@@ -1459,24 +1460,34 @@ abstract class ObjectModelCore
 	 */
 	public static function getDefinition($class, $field = null)
 	{
-		$reflection = new ReflectionClass($class);
-		$definition = $reflection->getStaticPropertyValue('definition');
-
 		if (is_object($class))
-			$definition['classname'] = get_class($class);
-		else
+			$class = get_class($class);
+
+		if ($field === null)
+			$cache_id = 'objectmodel_def_'.$class;
+
+		if ($field !== null || !Cache::isStored($cache_id))
+		{
+			$reflection = new ReflectionClass($class);
+			$definition = $reflection->getStaticPropertyValue('definition');
+
 			$definition['classname'] = $class;
 
-		if (!empty($definition['multilang']))
-			$definition['associations'][Collection::LANG_ALIAS] = array(
-				'type' => self::HAS_MANY,
-				'field' => $definition['primary'],
-				'foreign_field' => $definition['primary'],
-			);
+			if (!empty($definition['multilang']))
+				$definition['associations'][Collection::LANG_ALIAS] = array(
+					'type' => self::HAS_MANY,
+					'field' => $definition['primary'],
+					'foreign_field' => $definition['primary'],
+				);
+		
+			if ($field)
+				return isset($definition['fields'][$field]) ? $definition['fields'][$field] : null;
 
-		if ($field)
-			return isset($definition['fields'][$field]) ? $definition['fields'][$field] : null;
-		return $definition;
+			Cache::store($cache_id, $definition);
+			return $definition;
+		}
+
+		return Cache::retrieve($cache_id);
 	}
 
 	/**