tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 21:29:23 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Allow caching of false config values (Fixes #4755) (#4762)

Browse Source 
False values were indistinguishable from cache misses. This patch solves
this by introducing a new multiple-return-value varation on cache->get().
The new method is named differently so as not to break a public API.
This commit is contained in:
Sam Minnée 2016-07-15 20:22:58 +12:00 committed by Loz Calver
parent 6abce3a0b8
commit 366224078b
1 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/Config.php
View File

@ -585,7 +585,8 @@ class Config {
// Have we got a cached value? Use it if so
$key = $class.$name.$sourceOptions;
if (($result = $this->cache->get($key)) === false) {
list($cacheHit, $result) = $this->cache->checkAndGet($key);
if (!$cacheHit) {
$tags = array();
$result = null;
$this->getUncached($class, $name, $sourceOptions, $result, $suppress, $tags);
@ -769,17 +770,37 @@ class Config_LRU {
return $this->miss ? ($this->hit / $this->miss) : 0;
}
/**
* Return a cached value in the case of a hit, false otherwise.
* For a more robust cache checking, use {@link checkAndGet()}
*
* @param string $key The cache key
* @return variant Cached value, if hit. False otherwise
*/
public function get($key) {
if (isset($this->indexing[$key])) {
list($hit, $result) = $this->checkAndGet($key);
return $hit ? $result : false;
}
/**
* Checks for a cache hit and looks up the value by returning multiple values.
* Distinguishes a cached 'false' value from a cache miss.
*
* @param string $key The cache key
* @return array First element boolean, isHit. Second element the actual result.
*/
public function checkAndGet($key) {
if (array_key_exists($key, $this->indexing)) {
$this->hit++;
$res = $this->cache[$this->indexing[$key]];
$res->c = ++$this->c;
return $res->value;
}
return array(true, $res->value);
$this->miss++;
return false;
} else {
$this->miss++;
return array(false, null);
}
}
public function clean($tag = null) {
@ -832,13 +853,22 @@ class Config_MemCache {
}
public function get($key) {
if(isset($this->cache[$key])) {
++$this->hit;
return $this->cache[$key][0];
}
list($hit, $result) = $this->checkAndGet($key);
return $hit ? $result : false;
}
++$this->miss;
return false;
/**
* Checks for a cache hit and returns the value as a multi-value return
* @return array First element boolean, isHit. Second element the actual result.
*/
public function checkAndGet($key) {
if(array_key_exists($key, $this->cache)) {
++$this->hit;
return array(true, $this->cache[$key][0]);
} else {
++$this->miss;
return array(false, null);
}
}
public function clean($tag = null) {