php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 14:29:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #417 from votintsev/master

Browse Source 
Moved add prefix ($this->keyPrefix) to the key in function buildKey().
This commit is contained in:
Qiang Xue
2013-05-26 13:55:00 -07:00
parent 94e621f372 0ab5bbaf40
commit f17fde4acf
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
framework/yii/caching/Cache.php
View File

@@ -98,15 +98,16 @@ abstract class Cache extends Component implements \ArrayAccess
* ~~~ * ~~~
* *
* @param array|string $key the key to be normalized * @param array|string $key the key to be normalized
* @return string the generated cache key * @return string the generated cache key include $this->keyPrefix
*/ */
public function buildKey($key) public function buildKey($key)
{ {
if (is_string($key)) { if (is_string($key)) {
return ctype_alnum($key) && StringHelper::strlen($key) <= 32 ? $key : md5($key); $key = ctype_alnum($key) && StringHelper::strlen($key) <= 32 ? $key : md5($key);
} else { } else {
return md5(json_encode($key)); $key = md5(json_encode($key));
} }
return $this->keyPrefix . $key;
} }
/** /**
@@ -117,7 +118,7 @@ abstract class Cache extends Component implements \ArrayAccess
*/ */
public function get($key) public function get($key)
{ {
$key = $this->keyPrefix . $this->buildKey($key); $key = $this->buildKey($key);
$value = $this->getValue($key); $value = $this->getValue($key);
if ($value === false || $this->serializer === false) { if ($value === false || $this->serializer === false) {
return $value; return $value;
@@ -147,7 +148,7 @@ abstract class Cache extends Component implements \ArrayAccess
{ {
$keyMap = array(); $keyMap = array();
foreach ($keys as $key) { foreach ($keys as $key) {
$keyMap[$key] = $this->keyPrefix . $this->buildKey($key); $keyMap[$key] = $this->buildKey($key);
} }
$values = $this->getValues(array_values($keyMap)); $values = $this->getValues(array_values($keyMap));
$results = array(); $results = array();
@@ -192,7 +193,7 @@ abstract class Cache extends Component implements \ArrayAccess
} elseif ($this->serializer !== false) { } elseif ($this->serializer !== false) {
$value = call_user_func($this->serializer[0], array($value, $dependency)); $value = call_user_func($this->serializer[0], array($value, $dependency));
} }
$key = $this->keyPrefix . $this->buildKey($key); $key = $this->buildKey($key);
return $this->setValue($key, $value, $expire); return $this->setValue($key, $value, $expire);
} }
@@ -217,7 +218,7 @@ abstract class Cache extends Component implements \ArrayAccess
} elseif ($this->serializer !== false) { } elseif ($this->serializer !== false) {
$value = call_user_func($this->serializer[0], array($value, $dependency)); $value = call_user_func($this->serializer[0], array($value, $dependency));
} }
$key = $this->keyPrefix . $this->buildKey($key); $key = $this->buildKey($key);
return $this->addValue($key, $value, $expire); return $this->addValue($key, $value, $expire);
} }
@@ -228,7 +229,7 @@ abstract class Cache extends Component implements \ArrayAccess
*/ */
public function delete($key) public function delete($key)
{ {
$key = $this->keyPrefix . $this->buildKey($key); $key = $this->buildKey($key);
return $this->deleteValue($key); return $this->deleteValue($key);
} }