From: Stéphane Jacob Date: Wed, 18 May 2011 21:42:18 +0000 (+0200) Subject: Fixes terrible performance issue. X-Git-Tag: xorg/1.1.2~62^2~9 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=07b0a566e969144c27e2b7e11ed5abf958a6bd22;p=platal.git Fixes terrible performance issue. Signed-off-by: Stéphane Jacob --- diff --git a/classes/address.php b/classes/address.php index bca9e5f..46fbebe 100644 --- a/classes/address.php +++ b/classes/address.php @@ -914,23 +914,15 @@ class AddressIterator implements PlIterator pa.southwest_latitude, pa.southwest_longitude, pa.northeast_latitude, pa.northeast_longitude, pa.geocoding_date, pa.geocoding_calls, GROUP_CONCAT(DISTINCT pc.component_id SEPARATOR \',\') AS componentsIds, - pace1.long_name AS postalCode, pace2.long_name AS locality, pace3.long_name AS administrativeArea, pace4.long_name AS country + GROUP_CONCAT(pace1.long_name) AS postalCode, GROUP_CONCAT(pace2.long_name) AS locality, + GROUP_CONCAT(pace3.long_name) AS administrativeArea, GROUP_CONCAT(pace4.long_name) AS country FROM profile_addresses AS pa LEFT JOIN profile_addresses_components AS pc ON (pa.pid = pc.pid AND pa.jobid = pc.jobid AND pa.groupid = pc.groupid AND pa.type = pc.type AND pa.id = pc.id) - LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET(\'postal_code\', pace1.types)) - LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET(\'locality\', pace2.types)) - LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET(\'administrative_area_level_1\', pace3.types)) - LEFT JOIN profile_addresses_components_enum AS pace4 ON (FIND_IN_SET(\'country\', pace4.types)) - LEFT JOIN profile_addresses_components AS pac1 ON (pa.pid = pac1.pid AND pa.jobid = pac1.jobid AND pa.groupid = pac1.groupid - AND pa.id = pac1.id AND pa.type = pac1.type AND pace1.id = pac1.component_id) - LEFT JOIN profile_addresses_components AS pac2 ON (pa.pid = pac2.pid AND pa.jobid = pac2.jobid AND pa.groupid = pac2.groupid - AND pa.id = pac2.id AND pa.type = pac2.type AND pace2.id = pac2.component_id) - LEFT JOIN profile_addresses_components AS pac3 ON (pa.pid = pac3.pid AND pa.jobid = pac3.jobid AND pa.groupid = pac3.groupid - AND pa.id = pac3.id AND pa.type = pac3.type AND pace3.id = pac3.component_id) - LEFT JOIN profile_addresses_components AS pac4 ON (pa.pid = pac4.pid AND pa.jobid = pac4.jobid AND pa.groupid = pac4.groupid - AND pa.id = pac4.id AND pa.type = pac4.type AND pace4.id = pac4.component_id) - + LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET(\'postal_code\', pace1.types) AND pace1.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET(\'locality\', pace2.types) AND pace2.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET(\'administrative_area_level_1\', pace3.types) AND pace3.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace4 ON (FIND_IN_SET(\'country\', pace4.types) AND pace4.id = pc.component_id) ' . ((count($where) > 0) ? 'WHERE ' . implode(' AND ', $where) : '') . ' GROUP BY pa.pid, pa.jobid, pa.groupid, pa.type, pa.id ORDER BY pa.pid, pa.jobid, pa.id'; diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php index 0d1eb60..5a4b18c 100644 --- a/include/webservices/manageurs.server.inc.php +++ b/include/webservices/manageurs.server.inc.php @@ -38,18 +38,15 @@ function get_annuaire_infos($method, $params) { $params[1]); $array = $res->next(); } else { - $res = XDB::iterRow("SELECT p.birthdate, pa.text, pace3.short_name, pace2.short_name, pace1.short_name, p.pid, pa.id + $res = XDB::iterRow("SELECT p.birthdate, pa.text, GROUP_CONCAT(pace3.short_name), GROUP_CONCAT(pace2.short_name), + GROUP_CONCAT(pace1.short_name), p.pid, pa.id FROM profiles AS p LEFT JOIN profile_addresses AS pa ON (pa.pid = p.pid) - LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET('country', pace1.types)) - LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET('locality', pace2.types)) - LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET('postal_code', pace3.types)) - LEFT JOIN profile_addresses_components AS pac1 ON (pa.pid = pac1.pid AND pa.jobid = pac1.jobid AND pa.groupid = pac1.groupid - AND pa.id = pac1.id AND pa.type = pac1.type AND pace1.id = pac1.component_id) - LEFT JOIN profile_addresses_components AS pac2 ON (pa.pid = pac2.pid AND pa.jobid = pac2.jobid AND pa.groupid = pac2.groupid - AND pa.id = pac2.id AND pa.type = pac2.type AND pace2.id = pac2.component_id) - LEFT JOIN profile_addresses_components AS pac3 ON (pa.pid = pac3.pid AND pa.jobid = pac3.jobid AND pa.groupid = pac3.groupid - AND pa.id = pac3.id AND pa.type = pac3.type AND pace3.id = pac3.component_id) + LEFT JOIN profile_addresses_components AS pc ON (pa.pid = pc.pid AND pa.jobid = pc.jobid AND pa.groupid = pc.groupid + AND pa.type = pc.type AND pa.id = pc.id) + LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET(\'country\', pace1.types) AND pace1.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET(\'locality\', pace2.types) AND pace2.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET(\'postal_code\', pace3.types) AND pace3.id = pc.component_id) WHERE p.xorg_id = {?} AND NOT FIND_IN_SET('job', pa.flags) ORDER BY NOT FIND_IN_SET('current', pa.flags), FIND_IN_SET('secondary', pa.flags), diff --git a/modules/payment/money/paypal.inc.php b/modules/payment/money/paypal.inc.php index 9019afc..16fdc9b 100644 --- a/modules/payment/money/paypal.inc.php +++ b/modules/payment/money/paypal.inc.php @@ -67,21 +67,17 @@ class PayPal ); if ($user->hasProfile()) { - $res = XDB::query("SELECT pa.text, pace2.short_name AS city, pace3.short_name AS zip, pace1.short_name AS country, + $res = XDB::query("SELECT pa.text, GROUP_CONCAT(pace2.short_name) AS city, + GROUP_CONCAT(pace3.short_name) AS zip, GROUP_CONCAT(pace1.short_name) AS country, IF(pp1.display_tel != '', pp1.display_tel, pp2.display_tel) AS night_phone_b FROM profile_addresses AS pa LEFT JOIN profile_phones AS pp1 ON (pp1.pid = pa.pid AND pp1.link_type = 'address' AND pp1.link_id = pa.id) LEFT JOIN profile_phones AS pp2 ON (pp2.pid = pa.pid AND pp2.link_type = 'user' AND pp2.link_id = 0) - LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET('country', pace1.types)) - LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET('locality', pace2.types)) - LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET('postal_code', pace3.types)) - LEFT JOIN profile_addresses_components AS pac1 ON (pa.pid = pac1.pid AND pa.jobid = pac1.jobid AND pa.groupid = pac1.groupid - AND pa.id = pac1.id AND pa.type = pac1.type AND pace1.id = pac1.component_id) - LEFT JOIN profile_addresses_components AS pac2 ON (pa.pid = pac2.pid AND pa.jobid = pac2.jobid AND pa.groupid = pac2.groupid - AND pa.id = pac2.id AND pa.type = pac2.type AND pace2.id = pac2.component_id) - LEFT JOIN profile_addresses_components AS pac3 ON (pa.pid = pac3.pid AND pa.jobid = pac3.jobid AND pa.groupid = pac3.groupid - AND pa.id = pac3.id AND pa.type = pac3.type AND pace3.id = pac3.component_id) - + LEFT JOIN profile_addresses_components AS pc ON (pa.pid = pc.pid AND pa.jobid = pc.jobid AND pa.groupid = pc.groupid + AND pa.type = pc.type AND pa.id = pc.id) + LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET(\'country\', pace1.types) AND pace1.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET(\'locality\', pace2.types) AND pace2.id = pc.component_id) + LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET(\'postal_code\', pace3.types) AND pace3.id = pc.component_id) WHERE pa.pid = {?} AND FIND_IN_SET('current', pa.flags) GROUP BY pa.pid, pa.jobid, pa.groupid, pa.id, pa.type LIMIT 1",