Overhead in countries_countries_alter() [#2027613]

Hi,

countries_countries_alter() contains following code:

$countries = array_intersect_key($enabled_countries, $countries);
$countries = array_merge($countries, array_diff_key($enabled_countries, $countries));
uasort($countries, 'countries_sort');

I might be wrong, but I think $countries and $enabled_countries will always be equal at the end? And since $enabled_countries was already sorted in countries_get_countries() we can save a lot of sorting overhead (+-10 seconds in my case)...

Patch forthcoming.

Comment	File	Size	Author
#1	countries-hook-countries-alter-overhead-2027613-1.patch	581 bytes	Matthijs
#1

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

Matthijs

Dutch

CreditAttribution: Matthijs commented 25 June 2013 at 12:18

Status:

Active

» Needs review

File	Size
countries-hook-countries-alter-overhead-2027613-1.patch	581 bytes

Comment #2

Alan D. CreditAttribution: Alan D. commented 29 June 2013 at 00:51

Status:

Needs review

» Reviewed & tested by the community

I think the logic here was meant to update the existing countries then to merge in any additional ones that were coming in from the $countries parameter that were not defined within the Countries module. However, as it is written, there is a logical error that breaks this and you effectively do have what your patch does.

Personally, happy to pass all responsibility to the countries module, so RTBTC from me :)