banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved cache index changes detection (again)

Browse Source
pull/247/merge
Aleksander Machniak 9 years ago
parent 044c1a0523
commit b120d42f5b
2 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File

55
program/lib/Roundcube/rcube_cache.php
Unescape Escape View File

@ -355,8 +355,16 @@ class rcube_cache
$result = $this->add_record($this->ckey($key), $data); $result = $this->add_record($this->ckey($key), $data);
// make sure index will be updated // make sure index will be updated
if ($result && !array_key_exists($key, $this->cache_sums)) { if ($result) {
$this->cache_sums[$key] = true; if (!array_key_exists($key, $this->cache_sums)) {
$this->cache_sums[$key] = true;
}
$this->load_index();
if (!$this->index_changed && !in_array($key, $this->index)) {
$this->index_changed = true;
}
} }
return $result; return $result;
@ -420,23 +428,30 @@ class rcube_cache
// Remove all keys // Remove all keys
if ($key === null) { if ($key === null) {
foreach ($this->index as $key) { foreach ($this->index as $key) {
$this->delete_record($key, false); $this->delete_record($this->ckey($key));
} }
$this->index = array(); $this->index = array();
} }
// Remove keys by name prefix // Remove keys by name prefix
else if ($prefix_mode) { else if ($prefix_mode) {
foreach ($this->index as $k) { foreach ($this->index as $idx => $k) {
if (strpos($k, $key) === 0) { if (strpos($k, $key) === 0) {
$this->delete_record($k); $this->delete_record($this->ckey($k));
unset($this->index[$idx]);
} }
} }
} }
// Remove one key by name // Remove one key by name
else { else {
$this->delete_record($key); $this->delete_record($this->ckey($key));
if (($idx = array_search($key, $this->index)) !== false) {
unset($this->index[$idx]);
}
} }
$this->index_changed = true;
return; return;
} }
@ -488,42 +503,32 @@ class rcube_cache
$this->debug('set', $key, $data, $result); $this->debug('set', $key, $data, $result);
} }
if ($result) {
$this->index_changed = true;
}
return $result; return $result;
} }
/** /**
* Deletes entry from memcache/apc DB. * Deletes entry from memcache/apc DB.
*
* @param string $key Cache key name
*
* @param boolean True on success, False on failure
*/ */
private function delete_record($key, $index=true) private function delete_record($key)
{ {
$ckey = $this->ckey($key);
if ($this->type == 'memcache') { if ($this->type == 'memcache') {
// #1488592: use 2nd argument // #1488592: use 2nd argument
$result = $this->db->delete($ckey, 0); $result = $this->db->delete($key, 0);
} }
else { else {
$result = apc_delete($ckey); $result = apc_delete($key);
} }
if ($this->debug) { if ($this->debug) {
$this->debug('delete', $ckey, null, $result); $this->debug('delete', $key, null, $result);
} }
if ($result) { return $result;
$this->index_changed = true;
}
if ($index) {
if (($idx = array_search($key, $this->index)) !== false) {
unset($this->index[$idx]);
}
}
} }

49
program/lib/Roundcube/rcube_cache_shared.php
Unescape Escape View File

@ -349,8 +349,16 @@ class rcube_cache_shared
$result = $this->add_record($this->ckey($key), $data); $result = $this->add_record($this->ckey($key), $data);
// make sure index will be updated // make sure index will be updated
if ($result && !array_key_exists($key, $this->cache_sums)) { if ($result) {
$this->cache_sums[$key] = true; if (!array_key_exists($key, $this->cache_sums)) {
$this->cache_sums[$key] = true;
}
$this->load_index();
if (!$this->index_changed && !in_array($key, $this->index)) {
$this->index_changed = true;
}
} }
return $result; return $result;
@ -409,23 +417,30 @@ class rcube_cache_shared
// Remove all keys // Remove all keys
if ($key === null) { if ($key === null) {
foreach ($this->index as $key) { foreach ($this->index as $key) {
$this->delete_record($key, false); $this->delete_record($this->ckey($key));
} }
$this->index = array(); $this->index = array();
} }
// Remove keys by name prefix // Remove keys by name prefix
else if ($prefix_mode) { else if ($prefix_mode) {
foreach ($this->index as $k) { foreach ($this->index as $idx => $k) {
if (strpos($k, $key) === 0) { if (strpos($k, $key) === 0) {
$this->delete_record($k); $this->delete_record($this->ckey($k));
unset($this->index[$idx]);
} }
} }
} }
// Remove one key by name // Remove one key by name
else { else {
$this->delete_record($key); $this->delete_record($this->ckey($key));
if (($idx = array_search($key, $this->index)) !== false) {
unset($this->index[$idx]);
}
} }
$this->index_changed = true;
return; return;
} }
@ -475,21 +490,19 @@ class rcube_cache_shared
$this->debug('set', $key, $data, $result); $this->debug('set', $key, $data, $result);
} }
if ($result) {
$this->index_changed = true;
}
return $result; return $result;
} }
/** /**
* Deletes entry from memcache/apc DB. * Deletes entry from memcache/apc DB.
*
* @param string $key Cache key name
*
* @param boolean True on success, False on failure
*/ */
private function delete_record($key, $index=true) private function delete_record($key)
{ {
$ckey = $this->ckey($key);
if ($this->type == 'memcache') { if ($this->type == 'memcache') {
// #1488592: use 2nd argument // #1488592: use 2nd argument
$result = $this->db->delete($ckey, 0); $result = $this->db->delete($ckey, 0);
@ -502,15 +515,7 @@ class rcube_cache_shared
$this->debug('delete', $ckey, null, $result); $this->debug('delete', $ckey, null, $result);
} }
if ($result) { return $result;
$this->index_changed = true;
}
if ($index) {
if (($idx = array_search($key, $this->index)) !== false) {
unset($this->index[$idx]);
}
}
} }

Write Preview
Loading…
Cancel
Save