L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-36407 cache: unit tests + checks + improved string cache

Browse Source
This commit is contained in:
Sam Hemelryk
2012-11-16 09:46:49 +13:00
parent 2566210c63
commit 5dd68a7523
4 changed files with 88 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/classes/loaders.php
Vendored
+30 -21
View File
@@ -275,11 +275,11 @@ class cache implements cache_loader {
// 1. Parse the key.
$parsedkey = $this->parse_key($key);
// 2. Get it from the persist cache if we can (only when persist is enabled and it has already been requested/set).
$result = $this->get_from_persist_cache($parsedkey);
$result = false;
if ($this->is_using_persist_cache()) {
$result = $this->get_from_persist_cache($parsedkey);
}
if ($result !== false) {
if ($this->perfdebug) {
cache_helper::record_cache_hit('** static persist **', $this->definition->get_id());
}
if (!is_scalar($result)) {
// If data is an object it will be a reference.
// If data is an array if may contain references.
@@ -288,8 +288,6 @@ class cache implements cache_loader {
$result = $this->unref($result);
}
return $result;
} else if ($this->perfdebug) {
cache_helper::record_cache_miss('** static persist **', $this->definition->get_id());
}
// 3. Get it from the store. Obviously wasn't in the persist cache.
$result = $this->store->get($parsedkey);
@@ -909,23 +907,34 @@ class cache implements cache_loader {
$key = $key['key'];
}
if (!$this->persist || !array_key_exists($key, $this->persistcache)) {
return false;
}
$data = $this->persistcache[$key];
if (!$this->has_a_ttl() || !$data instanceof cache_ttl_wrapper) {
if ($data instanceof cache_cached_object) {
$data = $data->restore_object();
}
return $data;
}
if ($data->has_expired()) {
$this->delete_from_persist_cache($key);
return false;
$result = false;
} else {
if ($data instanceof cache_cached_object) {
$data = $data->restore_object();
$data = $this->persistcache[$key];
if (!$this->has_a_ttl() || !$data instanceof cache_ttl_wrapper) {
if ($data instanceof cache_cached_object) {
$data = $data->restore_object();
}
$result = $data;
} else if ($data->has_expired()) {
$this->delete_from_persist_cache($key);
$result = false;
} else {
if ($data instanceof cache_cached_object) {
$data = $data->restore_object();
}
$result = $data->data;
}
return $data->data;
}
if ($result) {
if ($this->perfdebug) {
cache_helper::record_cache_hit('** static persist **', $this->definition->get_id());
}
return $result;
} else {
if ($this->perfdebug) {
cache_helper::record_cache_miss('** static persist **', $this->definition->get_id());
}
return false;
}
}