Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve cache synchronization: fetch + insert in one row, increase time limit, unlock on script shutdown (#798)

Browse source
This commit is contained in:
Thomas Bruederli 2012-05-25 18:08:42 +02:00
parent bd1ab069e4
commit 06d970836c
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
plugins/libkolab/lib/kolab_storage_cache.php
View file

@ -33,6 +33,7 @@ class kolab_storage_cache
private $resource_uri; private $resource_uri;
private $enabled = true; private $enabled = true;
private $synched = false; private $synched = false;
private $synclock = false;
private $ready = false; private $ready = false;
private $binary_cols = array('photo','pgppublickey','pkcs7publickey'); private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
@ -48,6 +49,10 @@ class kolab_storage_cache
$this->imap = $rcmail->get_storage(); $this->imap = $rcmail->get_storage();
$this->enabled = $rcmail->config->get('kolab_cache', false); $this->enabled = $rcmail->config->get('kolab_cache', false);
// remove sync-lock on script termination
if ($this->enabled)
$rcmail->add_shutdown_function(array($this, '_sync_unlock'));
if ($storage_folder) if ($storage_folder)
$this->set_folder($storage_folder); $this->set_folder($storage_folder);
} }
@ -82,6 +87,9 @@ class kolab_storage_cache
if ($this->synched) if ($this->synched)
return; return;
// increase time limit
@set_time_limit(500);
// lock synchronization for this folder or wait if locked // lock synchronization for this folder or wait if locked
$this->_sync_lock(); $this->_sync_lock();
@ -109,10 +117,7 @@ class kolab_storage_cache
// fetch new objects from imap // fetch new objects from imap
$fetch_index = array_diff($this->index, $old_index); $fetch_index = array_diff($this->index, $old_index);
foreach ($this->_fetch($fetch_index, '*') as $object) { $this->_fetch($fetch_index, '*');
$msguid = $object['_msguid'];
$this->set($msguid, $object);
}
// delete invalid entries from local DB // delete invalid entries from local DB
$del_index = array_diff($old_index, $this->index); $del_index = array_diff($old_index, $this->index);
@ -133,7 +138,7 @@ class kolab_storage_cache
/** /**
* Read a single entry from cache or * Read a single entry from cache or from IMAP directly
* *
* @param string Related IMAP message UID * @param string Related IMAP message UID
* @param string Object type to read * @param string Object type to read
@ -152,8 +157,9 @@ class kolab_storage_cache
if ($this->ready) { if ($this->ready) {
$sql_result = $this->db->query( $sql_result = $this->db->query(
"SELECT * FROM kolab_cache ". "SELECT * FROM kolab_cache ".
"WHERE resource=? AND msguid=?", "WHERE resource=? AND type=? AND msguid=?",
$this->resource_uri, $this->resource_uri,
$type ?: $this->folder->type,
$msguid $msguid
); );
@ -180,7 +186,7 @@ class kolab_storage_cache
* @param mixed Hash array with object properties to save or false to delete the cache entry * @param mixed Hash array with object properties to save or false to delete the cache entry
* @param string IMAP folder name the entry relates to * @param string IMAP folder name the entry relates to
*/ */
public function set($msguid, $object, $foldername = null) public function set($msguid, $object, $foldername = null, $mcache = true)
{ {
// delegate to another cache instance // delegate to another cache instance
if ($foldername && $foldername != $this->folder->name) { if ($foldername && $foldername != $this->folder->name) {
@ -225,7 +231,8 @@ class kolab_storage_cache
} }
// keep a copy in memory for fast access // keep a copy in memory for fast access
$this->objects[$msguid] = $object; if ($mcache)
$this->objects[$msguid] = $object;
if ($object) if ($object)
$this->uid2msg[$object['uid']] = $msguid; $this->uid2msg[$object['uid']] = $msguid;
@ -409,7 +416,7 @@ class kolab_storage_cache
foreach ((array)$index as $msguid) { foreach ((array)$index as $msguid) {
if ($object = $this->folder->read_object($msguid, $type, $folder)) { if ($object = $this->folder->read_object($msguid, $type, $folder)) {
$results[] = $object; $results[] = $object;
$this->uid2msg[$object['uid']] = $msguid; $this->set($msguid, $object, null, false);
} }
} }
@ -512,6 +519,8 @@ class kolab_storage_cache
return; return;
} }
$this->synclock = true;
// create lock record if not exists // create lock record if not exists
if (!$sql_arr) { if (!$sql_arr) {
$this->db->query( $this->db->query(
@ -542,9 +551,9 @@ class kolab_storage_cache
/** /**
* Remove lock for this folder * Remove lock for this folder
*/ */
private function _sync_unlock() public function _sync_unlock()
{ {
if (!$this->ready) if (!$this->ready || !$this->synclock)
return; return;
$this->db->query( $this->db->query(