Make it possible to configure cacheMethodHashAlgo in DboSource

This commit is contained in:
Mischa ter Smitten 2016-11-12 00:18:13 +01:00
parent f46f042001
commit 15ccf057f4

View file

@ -51,22 +51,35 @@ class DboSource extends DataSource {
public $alias = 'AS '; public $alias = 'AS ';
/** /**
* Caches result from query parsing operations. Cached results for both DboSource::name() and * Caches result from query parsing operations. Cached results for both DboSource::name(), DboSource::fields() and
* DboSource::conditions() will be stored here. Method caching uses `md5()`. If you have * DboSource::conditions() will be stored here.
* problems with collisions, set DboSource::$cacheMethods to false. *
* Method caching uses `md5` (by default) to construct cache keys.
* If you have problems with collisions, try a different hashing algorithm in DboSource::$cacheMethodHashAlgo or
* set DboSource::$cacheMethods to false.
* *
* @var array * @var array
*/ */
public static $methodCache = array(); public static $methodCache = array();
/** /**
* Whether or not to cache the results of DboSource::name() and DboSource::conditions() * Whether or not to cache the results of DboSource::name(), DboSource::fields() and DboSource::conditions()
* into the memory cache. Set to false to disable the use of the memory cache. * into the memory cache. Set to false to disable the use of the memory cache.
* *
* @var bool * @var bool
*/ */
public $cacheMethods = true; public $cacheMethods = true;
/**
* Method caching uses `md5` (by default) to construct cache keys. If you have problems with collisions,
* try a different hashing algorithm or set DboSource::$cacheMethods to false.
*
* @var string
* @see http://php.net/manual/en/function.hash-algos.php
* @see http://softwareengineering.stackexchange.com/questions/49550/which-hashing-algorithm-is-best-for-uniqueness-and-speed
*/
public $cacheMethodHashAlgo = 'md5';
/** /**
* Flag to support nested transactions. If it is set to false, you will be able to use * Flag to support nested transactions. If it is set to false, you will be able to use
* the transaction methods (begin/commit/rollback), but just the global transaction will * the transaction methods (begin/commit/rollback), but just the global transaction will
@ -815,7 +828,7 @@ class DboSource extends DataSource {
} }
return $data; return $data;
} }
$cacheKey = md5($this->startQuote . $data . $this->endQuote); $cacheKey = hash($this->cacheMethodHashAlgo, $this->startQuote . $data . $this->endQuote);
if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) { if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
return $return; return $return;
} }
@ -2533,7 +2546,7 @@ class DboSource extends DataSource {
$Model->schemaName, $Model->schemaName,
$Model->table $Model->table
); );
$cacheKey = md5(serialize($cacheKey)); $cacheKey = hash($this->cacheMethodHashAlgo, serialize($cacheKey));
if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) { if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
return $return; return $return;
} }