RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-06 09:07:09 +03:00
Code Issues Projects Releases Wiki Activity

DDC-892 - Implement separate chaining approach for result caches to prevent hash colissions.

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-01-23 20:53:20 +01:00
parent 8869678c0f
commit 3515df913f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -506,10 +506,10 @@ abstract class AbstractQuery
// Check result cache // Check result cache
if ($this->_useResultCache && $cacheDriver = $this->getResultCacheDriver()) { if ($this->_useResultCache && $cacheDriver = $this->getResultCacheDriver()) {
$id = $this->_getResultCacheId(); list($id, $hash) = $this->getResultCacheId();
$cached = $this->_expireResultCache ? false : $cacheDriver->fetch($id); $cached = $this->_expireResultCache ? false : $cacheDriver->fetch($id);
if ($cached === false) { if ($cached === false || !isset($cached[$id])) {
// Cache miss. // Cache miss.
$stmt = $this->_doExecute(); $stmt = $this->_doExecute();
@ -522,7 +522,7 @@ abstract class AbstractQuery
return $result; return $result;
} else { } else {
// Cache hit. // Cache hit.
return $cached; return $cached[$id];
} }
} }
@ -556,12 +556,12 @@ abstract class AbstractQuery
* Will return the configured id if it exists otherwise a hash will be * Will return the configured id if it exists otherwise a hash will be
* automatically generated for you. * automatically generated for you.
* *
* @return string $id * @return array ($id, $hash)
*/ */
protected function _getResultCacheId() protected function getResultCacheId()
{ {
if ($this->_resultCacheId) { if ($this->_resultCacheId) {
return $this->_resultCacheId; return array($this->_resultCacheId, $this->_resultCacheId);
} else { } else {
$params = $this->_params; $params = $this->_params;
foreach ($params AS $key => $value) { foreach ($params AS $key => $value) {
@ -573,13 +573,16 @@ abstract class AbstractQuery
$idValues = $class->getIdentifierValues($value); $idValues = $class->getIdentifierValues($value);
} }
$params[$key] = $idValues; $params[$key] = $idValues;
} else {
$params[$key] = $value;
} }
} }
$sql = $this->getSql(); $sql = $this->getSql();
ksort($this->_hints); ksort($this->_hints);
return md5(implode(";", (array)$sql) . var_export($params, true) . $key = implode(";", (array)$sql) . var_export($params, true) .
var_export($this->_hints, true)."&hydrationMode=".$this->_hydrationMode); var_export($this->_hints, true)."&hydrationMode=".$this->_hydrationMode;
return array($key, md5($key));
} }
} }