Changeset 10514

Timestamp:

02/05/2016 02:41:22 AM (10 years ago)

Author:

boonebgorges

Message:

Improve performance of bp_sort_by_key().

bp_sort_by_key() originally used create_function() to allow sorting by
dynamic $type and $key. However, create_function() has a tendency to
perform poorly. PHP 5.3 anonymous closures are much faster, but are unavailable
as long as we support PHP 5.2. So we introduce a new class that plays a role
similar to an anonymous closure, with a similar speed benefit.

Fixes #6864.

Location:

trunk/src/bp-core

Files:

• bp-core-classes.php (modified) (1 diff)
• bp-core-functions.php (modified) (1 diff)
• classes/class-bp-core-sort-by-key-callback.php (added)

trunk/src/bp-core/bp-core-classes.php

@@ -22 +22 @@
 require dirname( __FILE__ ) . '/classes/class-bp-members-suggestions.php';
 require dirname( __FILE__ ) . '/classes/class-bp-recursive-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-core-sort-by-key-callback.php';
 require dirname( __FILE__ ) . '/classes/class-bp-media-extractor.php';
 require dirname( __FILE__ ) . '/classes/class-bp-attachment.php';

trunk/src/bp-core/bp-core-functions.php

@@ -119 +119 @@
  */
 function bp_sort_by_key( $items, $key, $type = 'alpha' ) {
-    usort( $items, create_function( '$a, $b', '
-        $values = array( 0 => false, 1 => false, );
-        $func_args = func_get_args();
-        foreach ( $func_args as $indexi => $index ) {
-            if ( isset( $index->' . $key . ' ) ) {
-                $values[ $indexi ] = $index->' . $key . ';
-            } elseif ( isset( $index["' . $key . '"] ) ) {
-                $values[ $indexi ] = $index["' . $key . '"];
-            }
-        }
-
-        if ( isset( $values[0], $values[1] ) ) {
-            if ( "num" === "' . $type . '" ) {
-                $cmp = $values[0] - $values[1];
-            } else {
-                $cmp = strcmp( $values[0], $values[1] );
-            }
-
-            if ( 0 > $cmp ) {
-                $retval = -1;
-            } elseif ( 0 < $cmp ) {
-                $retval = 1;
-            } else {
-                $retval = 0;
-            }
-            return $retval;
-        } else {
-            return 0;
-        }
-    ') );
+    usort( $items, array( new BP_Core_Sort_By_Key_Callback( $key, $type ), 'sort_callback' ) );
 
     return $items;