Merge Branches & Trunk

/trunk:r2680,2692,2707-2736
/branches/3.1:r2682-2686,2694-2702,2705,2738-2762

4 files changed, 103 insertions, 24 deletions

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
index d85148eb..540a3acd 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
@@ -97,7 +97,7 @@ class TSqlMapCacheModel extends TComponent
 	public function initialize($cache=null)

 	{

 		if($cache===null)

-			$this->_cache= Prado::createComponent($this->getImplementationClass());

+			$this->_cache= Prado::createComponent($this->getImplementationClass(), $this);

 		else

 			$this->_cache=$cache;

 	}

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
index f6e0acd5..c49a4219 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
@@ -710,7 +710,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 			if(in_array(strtolower($name), $properties))

 				$cacheModel->{'set'.$name}((string)$value);

 		}

-		$cache = Prado::createComponent($cacheModel->getImplementationClass());

+		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);

 		$this->setObjectPropFromNode($cache,$node,$properties);

 

 		foreach($node->xpath('property') as $propertyNode)

diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
index 05b72e08..5262bdf8 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap

@@ -25,16 +25,17 @@ abstract class TSqlMapCache implements ICache
 	protected $_keyList;

 	protected $_cache;

 	protected $_cacheSize = 100;

+	protected $_cacheModel = null;

 

 	/**

 	 * Create a new cache with limited cache size.

-	 * @param integer maxium number of items to cache.

+	 * @param TSqlMapCacheModel $cacheModel.

 	 */

-	public function __construct($cacheSize=100)

+	public function __construct($cacheModel=null)

 	{

 		$this->_cache = new TMap;

-		$this->_cacheSize = intval($cacheSize);

 		$this->_keyList = new TList;

+		$this->_cacheModel=$cacheModel;

 	}

 

 	/**

@@ -173,20 +174,71 @@ class TSqlMapLruCache extends TSqlMapCache
  */

 class TSqlMapApplicationCache implements ICache

 {

+	protected $_cacheModel=null;

+

+	/**

+	 * Create a new cache with limited cache size.

+	 * @param TSqlMapCacheModel $cacheModel.

+	 */

+	public function __construct($cacheModel=null)

+	{

+		$this->_cacheModel=$cacheModel;

+	}

+

+	/**

+	 *

+	 * @return string a KeyListID for the cache model.

+	 */

+	protected function getKeyListId()

+	{

+		$id='keyList';

+		if ($this->_cacheModel instanceof TSqlMapCacheModel)

+				$id.='_'.$this->_cacheModel->getId();

+		return $id;

+	}

+	/**

+	 * Retreive keylist from cache or create it if it doesn't exists

+	 * @return TList

+	 */

+	protected function getKeyList()

+	{

+		if (($keyList=$this->getCache()->get($this->getKeyListId()))===false)

+		{

+			$keyList=new TList();

+			$this->getCache()->set($this->getKeyListId(), $keyList);

+		}

+		return $keyList;

+	}

+

+	protected function setKeyList($keyList)

+	{

+		$this->getCache()->set($this->getKeyListId(), $keyList);

+	}

+

 	/**

 	 * @param string item to be deleted.

 	 */

 	public function delete($key)

 	{

+		$keyList=$this->getKeyList();

+		$keyList->remove($key);

 		$this->getCache()->delete($key);

+		$this->setKeyList($keyList);

 	}

 

 	/**

-	 * Deletes all items in the cache.

+	 * Deletes all items in the cache, only for data cached by sqlmap cachemodel

 	 */

 	public function flush()

 	{

-		$this->getCache()->flush();

+		$keyList=$this->getKeyList();

+		$cache=$this->getCache();

+		foreach ($keyList as $key)

+		{

+			$cache->delete($key);

+		}

+		// Remove the old keylist

+		$cache->delete($this->getKeyListId());

 	}

 

 	/**

@@ -195,6 +247,16 @@ class TSqlMapApplicationCache implements ICache
 	public function get($key)

 	{

 		$result = $this->getCache()->get($key);

+		if ($result === false)

+		{

+			// if the key has not been found in cache (e.g expired), remove from keylist

+			$keyList=$this->getKeyList();

+			if ($keyList->contains($key))

+			{

+				$keyList->remove($key);

+				$this->setKeyList($keyList);

+			}

+		}

 		return $result === false ? null : $result;

 	}

 

@@ -206,6 +268,12 @@ class TSqlMapApplicationCache implements ICache
 	public function set($key, $value,$expire=0,$dependency=null)

 	{

 		$this->getCache()->set($key, $value, $expire,$dependency);

+		$keyList=$this->getKeyList();

+		if (!$keyList->contains($key))

+		{

+			$keyList->add($key);

+			$this->setKeyList($keyList);

+		}

 	}

 

 	/**

diff --git a/framework/Data/SqlMap/TSqlMapConfig.php b/framework/Data/SqlMap/TSqlMapConfig.php
index c57ab40e..c5f06ab8 100644
--- a/framework/Data/SqlMap/TSqlMapConfig.php
+++ b/framework/Data/SqlMap/TSqlMapConfig.php
@@ -53,6 +53,31 @@ class TSqlMapConfig extends TDataSourceConfig
 	}

 

 	/**

+	 * Create and configure the data mapper using sqlmap configuration file.

+	 * Or if cache is enabled and manager already cached load from cache.

+	 * If cache is enabled, the data mapper instance is cached.

+	 *

+	 * @return TSqlMapManager SqlMap manager instance

+	 * @since 3.1.7

+	 */

+	public function getSqlMapManager() {

+		Prado::using('System.Data.SqlMap.TSqlMapManager');

+		if(($manager = $this->loadCachedSqlMapManager())===null)

+		{

+			$manager = new TSqlMapManager($this->getDbConnection());

+			if(strlen($file=$this->getConfigFile()) > 0)

+			{

+				$manager->configureXml($file);

+				$this->cacheSqlMapManager($manager);

+			}

+		}

+		elseif($this->getConnectionID() !== '') {

+			$manager->setDbConnection($this->getDbConnection());

+		}

+		return $manager;

+	}

+

+	/**

 	 * Saves the current SqlMap manager to cache.

 	 * @return boolean true if SqlMap manager was cached, false otherwise.

 	 */

@@ -87,6 +112,7 @@ class TSqlMapConfig extends TDataSourceConfig
 					return $manager;

 			}

 		}

+		return null;

 	}

 

 	/**

@@ -134,26 +160,11 @@ class TSqlMapConfig extends TDataSourceConfig
 	}

 

 	/**

-	 * Configure the data mapper using sqlmap configuration file.

-	 * If cache is enabled, the data mapper instance is cached.

 	 * @return TSqlMapGateway SqlMap gateway instance.

 	 */

 	protected function createSqlMapGateway()

 	{

-		Prado::using('System.Data.SqlMap.TSqlMapManager');

-		if(($manager = $this->loadCachedSqlMapManager())===null)

-		{

-			$manager = new TSqlMapManager($this->getDbConnection());

-			if(strlen($file=$this->getConfigFile()) > 0)

-			{

-				$manager->configureXml($file);

-				$this->cacheSqlMapManager($manager);

-			}

-		}

-		else {

-			$manager->setDbConnection($this->getDbConnection());

-		}

-		return $manager->getSqlmapGateway();

+		return $this->getSqlMapManager()->getSqlmapGateway();

 	}

 

 	/**