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

Performance: Limit number of SQL queries needed for "object relations update" operation

Browse source
This commit is contained in:
Aleksander Machniak 2016-02-13 13:09:59 +01:00
parent 52053f355a
commit 446cd0dfe1
4 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -572,14 +572,8 @@ class kolab_calendar extends kolab_storage_folder_api
*/ */
protected function save_links($uid, $links) protected function save_links($uid, $links)
{ {
// make sure we have a valid array
if (empty($links)) {
$links = array();
}
$storage = kolab_storage_config::get_instance(); $storage = kolab_storage_config::get_instance();
$remove = array_diff($storage->get_object_links($uid), $links); return $storage->save_object_links($uid, (array) $links);
return $storage->save_object_links($uid, $links, $remove);
} }
/** /**

6
plugins/kolab_notes/kolab_notes.php
View file

@ -1247,12 +1247,8 @@ class kolab_notes extends rcube_plugin
private function save_links($uid, $links) private function save_links($uid, $links)
{ {
if (empty($links)) {
$links = array();
}
$config = kolab_storage_config::get_instance(); $config = kolab_storage_config::get_instance();
$remove = array_diff($config->get_object_links($uid), $links); return $config->save_object_links($uid, (array) $links);
return $config->save_object_links($uid, $links, $remove);
} }
/** /**

20
plugins/libkolab/lib/kolab_storage_config.php
View file

@ -711,7 +711,8 @@ class kolab_storage_config
* Find objects linked with the given groupware object through a relation * Find objects linked with the given groupware object through a relation
* *
* @param string Object UUID * @param string Object UUID
* @param array List of related URIs *
* @return array List of related URIs
*/ */
public function get_object_links($uid) public function get_object_links($uid)
{ {
@ -735,9 +736,17 @@ class kolab_storage_config
} }
/** /**
* Save relations of an object.
* Note, that we already support only one-to-one relations.
* So, all relations to the object that are not provided in $links
* argument will be removed.
* *
* @param string $uid Object UUID
* @param array $links List of related-object URIs
*
* @return bool True on success, False on failure
*/ */
public function save_object_links($uid, $links, $remove = array()) public function save_object_links($uid, $links)
{ {
$object_uri = self::build_member_url($uid); $object_uri = self::build_member_url($uid);
$relations = $this->get_relations_for_member($uid); $relations = $this->get_relations_for_member($uid);
@ -748,14 +757,9 @@ class kolab_storage_config
kolab_storage_config::resolve_members($relation); kolab_storage_config::resolve_members($relation);
// remove and add links // remove and add links
$members = array_diff($relation['members'], (array)$remove); $members = array($object_uri);
$members = array_unique(array_merge($members, $links)); $members = array_unique(array_merge($members, $links));
// make sure the object_uri is still a member
if (!in_array($object_uri, $members)) {
$members[$object_uri];
}
// remove relation if no other members remain // remove relation if no other members remain
if (count($members) <= 1) { if (count($members) <= 1) {
$done = $this->delete($relation['uid']); $done = $this->delete($relation['uid']);

8
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
View file

@ -1114,14 +1114,8 @@ class tasklist_kolab_driver extends tasklist_driver
*/ */
private function save_links($uid, $links) private function save_links($uid, $links)
{ {
// make sure we have a valid array
if (empty($links)) {
$links = array();
}
$config = kolab_storage_config::get_instance(); $config = kolab_storage_config::get_instance();
$remove = array_diff($config->get_object_links($uid), $links); return $config->save_object_links($uid, (array) $links);
return $config->save_object_links($uid, $links, $remove);
} }
/** /**