From 044c1a052381d73a75a998af604bfd84b949d702 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 14 May 2015 03:06:57 -0400
Subject: [PATCH] Simplified code + some CS fixes
---
program/lib/Roundcube/rcube_cache_shared.php | 63 ++++++++-------------
program/lib/Roundcube/rcube_cache.php | 69 +++++++++-------------
2 files changed, 52 insertions(+), 80 deletions(-)
diff --git a/program/lib/Roundcube/rcube_cache.php b/program/lib/Roundcube/rcube_cache.php
index ba7b1f5..649dd93 100644
--- a/program/lib/Roundcube/rcube_cache.php
+++ b/program/lib/Roundcube/rcube_cache.php
@@ -268,20 +268,18 @@
// to have data in consistent state. Keeping the index consistent
// is needed for keys delete operation when we delete all keys or by prefix.
}
- else if ($this->type == 'memcache') {
+ else {
$ckey = $this->ckey($key);
- $data = $this->db->get($ckey);
+
+ if ($this->type == 'memcache') {
+ $data = $this->db->get($ckey);
+ }
+ else if ($this->type == 'apc') {
+ $data = apc_fetch($ckey);
+ }
if ($this->debug) {
$this->debug('get', $ckey, $data);
- }
- }
- else if ($this->type == 'apc') {
- $ckey = $this->ckey($key);
- $data = apc_fetch($ckey);
-
- if ($this->debug) {
- $this->debug('fetch', $ckey, $data);
}
}
@@ -473,21 +471,21 @@
{
if ($this->type == 'memcache') {
$result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
- if (!$result)
- $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
- if ($this->debug) {
- $this->debug('set', $key, $data, $result);
+ if (!$result) {
+ $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
}
}
else if ($this->type == 'apc') {
- if (apc_exists($key))
+ if (apc_exists($key)) {
apc_delete($key);
- $result = apc_store($key, $data, $this->ttl);
-
- if ($this->debug) {
- $this->debug('store', $key, $data, $result);
}
+
+ $result = apc_store($key, $data, $this->ttl);
+ }
+
+ if ($this->debug) {
+ $this->debug('set', $key, $data, $result);
}
if ($result) {
@@ -503,22 +501,18 @@
*/
private function delete_record($key, $index=true)
{
+ $ckey = $this->ckey($key);
+
if ($this->type == 'memcache') {
- $ckey = $this->ckey($key);
// #1488592: use 2nd argument
$result = $this->db->delete($ckey, 0);
-
- if ($this->debug) {
- $this->debug('delete', $ckey, null, $result);
- }
}
else {
- $ckey = $this->ckey($key);
$result = apc_delete($ckey);
+ }
- if ($this->debug) {
- $this->debug('delete', $ckey, null, $result);
- }
+ if ($this->debug) {
+ $this->debug('delete', $ckey, null, $result);
}
if ($result) {
@@ -538,11 +532,7 @@
*/
private function write_index()
{
- if (!$this->db) {
- return;
- }
-
- if ($this->type == 'db') {
+ if (!$this->db || $this->type == 'db') {
return;
}
@@ -572,7 +562,7 @@
*/
private function load_index()
{
- if (!$this->db) {
+ if (!$this->db || $this->type == 'db') {
return;
}
@@ -581,19 +571,16 @@
}
$index_key = $this->ikey();
+
if ($this->type == 'memcache') {
$data = $this->db->get($index_key);
-
- if ($this->debug) {
- $this->debug('get', $index_key, $data);
- }
}
else if ($this->type == 'apc') {
$data = apc_fetch($index_key);
+ }
- if ($this->debug) {
- $this->debug('fetch', $index_key, $data);
- }
+ if ($this->debug) {
+ $this->debug('get', $index_key, $data);
}
$this->index = $data ? unserialize($data) : array();
diff --git a/program/lib/Roundcube/rcube_cache_shared.php b/program/lib/Roundcube/rcube_cache_shared.php
index 2c771ee..21a99c0 100644
--- a/program/lib/Roundcube/rcube_cache_shared.php
+++ b/program/lib/Roundcube/rcube_cache_shared.php
@@ -263,20 +263,18 @@
// to have data in consistent state. Keeping the index consistent
// is needed for keys delete operation when we delete all keys or by prefix.
}
- else if ($this->type == 'memcache') {
+ else {
$ckey = $this->ckey($key);
- $data = $this->db->get($ckey);
+
+ if ($this->type == 'memcache') {
+ $data = $this->db->get($ckey);
+ }
+ else if ($this->type == 'apc') {
+ $data = apc_fetch($ckey);
+ }
if ($this->debug) {
$this->debug('get', $ckey, $data);
- }
- }
- else if ($this->type == 'apc') {
- $ckey = $this->ckey($key);
- $data = apc_fetch($ckey);
-
- if ($this->debug) {
- $this->debug('fetch', $ckey, $data);
}
}
@@ -460,22 +458,21 @@
{
if ($this->type == 'memcache') {
$result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
+
if (!$result) {
$result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
- }
- if ($this->debug) {
- $this->debug('set', $key, $data, $result);
}
}
else if ($this->type == 'apc') {
if (apc_exists($key)) {
apc_delete($key);
}
- $result = apc_store($key, $data, $this->ttl);
- if ($this->debug) {
- $this->debug('store', $key, $data, $result);
- }
+ $result = apc_store($key, $data, $this->ttl);
+ }
+
+ if ($this->debug) {
+ $this->debug('set', $key, $data, $result);
}
if ($result) {
@@ -491,22 +488,18 @@
*/
private function delete_record($key, $index=true)
{
+ $ckey = $this->ckey($key);
+
if ($this->type == 'memcache') {
- $ckey = $this->ckey($key);
// #1488592: use 2nd argument
$result = $this->db->delete($ckey, 0);
-
- if ($this->debug) {
- $this->debug('delete', $ckey, null, $result);
- }
}
else {
- $ckey = $this->ckey($key);
$result = apc_delete($ckey);
+ }
- if ($this->debug) {
- $this->debug('delete', $ckey, null, $result);
- }
+ if ($this->debug) {
+ $this->debug('delete', $ckey, null, $result);
}
if ($result) {
@@ -526,11 +519,7 @@
*/
private function write_index()
{
- if (!$this->db) {
- return;
- }
-
- if ($this->type == 'db') {
+ if (!$this->db || $this->type == 'db') {
return;
}
@@ -560,7 +549,7 @@
*/
private function load_index()
{
- if (!$this->db) {
+ if (!$this->db || $this->type == 'db') {
return;
}
@@ -572,17 +561,13 @@
if ($this->type == 'memcache') {
$data = $this->db->get($index_key);
-
- if ($this->debug) {
- $this->debug('get', $index_key, $data);
- }
}
else if ($this->type == 'apc') {
$data = apc_fetch($index_key);
+ }
- if ($this->debug) {
- $this->debug('fetch', $index_key, $data);
- }
+ if ($this->debug) {
+ $this->debug('get', $index_key, $data);
}
$this->index = $data ? unserialize($data) : array();
--
Gitblit v1.9.1