extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressbook: Import speed boost by pre-querying the match condition

Browse Source
This commit is contained in:
nathan 2023-10-19 16:57:49 -06:00
parent f7e1dedac9
commit b374e4dd92
1 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
addressbook/inc/class.addressbook_import_contacts_csv.inc.php
View File

@ -58,7 +58,6 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
*/ */
public function import( $_stream, importexport_definition $_definition ) { public function import( $_stream, importexport_definition $_definition ) {
parent::import($_stream, $_definition); parent::import($_stream, $_definition);
if($_definition->plugin_options['empty_addressbook']) if($_definition->plugin_options['empty_addressbook'])
{ {
$this->empty_addressbook($this->user, $this->ids); $this->empty_addressbook($this->user, $this->ids);
@ -115,6 +114,43 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
$contact_owner = $this->user; $contact_owner = $this->user;
} }
$this->user = $contact_owner; $this->user = $contact_owner;
// Special case fast lookup for simple condition "field exists"
// We find ALL matches first to save DB queries. This saves 1 query per row, at the cost of RAM
// Should be 10x faster for large (thousands of rows) files, may be slower for small (tens of rows) files
$this->cached_condition = [];
foreach($definition->plugin_options['conditions'] as $condition)
{
$contacts = array();
$this->cached_condition[$condition['string']] = [];
switch($condition['type'])
{
// exists
case 'exists' :
// if we use account_id for the condition, we need to set the owner for filtering, as this
// enables Api\Contacts\Storage to decide what backend is to be used
if($condition['string'] == 'account_id')
{
$searchcondition['owner'] = 0;
}
$field = $condition['string'][0] == Api\Storage::CF_PREFIX ? 'contact_value' : $condition['string'];
$contacts = $this->bocontacts->search(
//array( $condition['string'] => $record[$condition['string']],),
'',
['contact_id', 'cat_id', $field],
'', '', '', false, 'AND', false,
$condition['string'][0] == Api\Storage::CF_PREFIX ? [$condition['string']] : null
);
foreach($contacts as $contact)
{
if(!isset($this->cached_condition[$condition['string']][$contact[$field]]))
{
$this->cached_condition[$condition['string']][$contact[$field]] = [];
}
$this->cached_condition[$condition['string']][$contact[$field]][] = $contact;
}
}
}
} }
/** /**
@ -215,7 +251,12 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
switch ( $condition['type'] ) { switch ( $condition['type'] ) {
// exists // exists
case 'exists' : case 'exists' :
if($record_array[$condition['string']]) { if($record_array[$condition['string']] && $this->cached_condition[$condition['string']])
{
$contacts = $this->cached_condition[$condition['string']][$record_array[$condition['string']]];
}
else if($record_array[$condition['string']])
{
$searchcondition = array( $condition['string'] => $record_array[$condition['string']]); $searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
// if we use account_id for the condition, we need to set the owner for filtering, as this // if we use account_id for the condition, we need to set the owner for filtering, as this
// enables Api\Contacts\Storage to decide what backend is to be used // enables Api\Contacts\Storage to decide what backend is to be used