Ticket #10274: 10274.diff

wp-includes/functions.php

@@ -331 +331 @@
         if ( isset( $notoptions[$setting] ) )
                 return $default;
 
-        $alloptions = wp_load_alloptions();
+        $value = wp_cache_get( $setting, 'options' );
 
-        if ( isset( $alloptions[$setting] ) ) {
-                $value = $alloptions[$setting];
-        } else {
-                $value = wp_cache_get( $setting, 'options' );
+        if ( false === $value ) {
+                if ( defined( 'WP_INSTALLING' ) )
+                        $suppress = $wpdb->suppress_errors();
+                // expected_slashed ($setting)
+                $row = $wpdb->get_row( "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" );
+                if ( defined( 'WP_INSTALLING' ) )
+                        $wpdb->suppress_errors($suppress);
 
-                if ( false === $value ) {
-                        if ( defined( 'WP_INSTALLING' ) )
-                                $suppress = $wpdb->suppress_errors();
-                        // expected_slashed ($setting)
-                        $row = $wpdb->get_row( "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" );
-                        if ( defined( 'WP_INSTALLING' ) )
-                                $wpdb->suppress_errors($suppress);
-
-                        if ( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
-                                $value = $row->option_value;
-                                wp_cache_add( $setting, $value, 'options' );
-                        } else { // option does not exist, so we must cache its non-existence
-                                $notoptions[$setting] = true;
-                                wp_cache_set( 'notoptions', $notoptions, 'options' );
-                                return $default;
-                        }
+                if ( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
+                        $value = $row->option_value;
+                        wp_cache_add( $setting, $value, 'options' );
+                        wp_cache_delete( 'all_options', 'options' );
+                } else { // option does not exist, so we must cache its non-existence
+                        $notoptions[$setting] = true;
+                        wp_cache_set( 'notoptions', $notoptions, 'options' );
+                        return $default;
                 }
         }
 
@@ -400 +395 @@
 }
 
 /**
- * Retrieve all autoload options or all options, if no autoloaded ones exist.
- *
- * This is different from wp_load_alloptions() in that this function does not
- * cache its results and will retrieve all options from the database every time
- *
- * it is called.
- *
- * @since 1.0.0
- * @package WordPress
- * @subpackage Option
- * @uses apply_filters() Calls 'pre_option_$optionname' hook with option value as parameter.
- * @uses apply_filters() Calls 'all_options' on options list.
- *
- * @return array List of all options.
- */
-function get_alloptions() {
-        global $wpdb;
-        $show = $wpdb->hide_errors();
-        if ( !$options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-                $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
-        $wpdb->show_errors($show);
-
-        foreach ( (array) $options as $option ) {
-                // "When trying to design a foolproof system,
-                //  never underestimate the ingenuity of the fools :)" -- Dougal
-                if ( in_array( $option->option_name, array( 'siteurl', 'home', 'category_base', 'tag_base' ) ) )
-                        $option->option_value = untrailingslashit( $option->option_value );
-                $value = maybe_unserialize( $option->option_value );
-                $all_options->{$option->option_name} = apply_filters( 'pre_option_' . $option->option_name, $value );
-        }
-        return apply_filters( 'all_options', $all_options );
-}
-
-/**
- * Loads and caches all autoloaded options, if available or all options.
- *
- * This is different from get_alloptions(), in that this function will cache the
- * options and will return the cached options when called again.
- *
- * @since 2.2.0
- * @package WordPress
- * @subpackage Option
- *
- * @return array List all options.
- */
-function wp_load_alloptions() {
-        global $wpdb;
-
-        $alloptions = wp_cache_get( 'alloptions', 'options' );
-
-        if ( !$alloptions ) {
-                $suppress = $wpdb->suppress_errors();
-                if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-                        $alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
-                $wpdb->suppress_errors($suppress);
-                $alloptions = array();
-                foreach ( (array) $alloptions_db as $o )
-                        $alloptions[$o->option_name] = $o->option_value;
-                wp_cache_add( 'alloptions', $alloptions, 'options' );
-        }
-        return $alloptions;
-}
-
-/**
  * Update the value of an option that was already added.
  *
  * You do not need to serialize values, if the value needs to be serialize, then
@@ -522 +453 @@
         $_newvalue = $newvalue;
         $newvalue = maybe_serialize( $newvalue );
 
-        $alloptions = wp_load_alloptions();
-        if ( isset( $alloptions[$option_name] ) ) {
-                $alloptions[$option_name] = $newvalue;
-                wp_cache_set( 'alloptions', $alloptions, 'options' );
-        } else {
-                wp_cache_set( $option_name, $newvalue, 'options' );
-        }
+        wp_cache_set( $option_name, $newvalue, 'options' );
+        wp_cache_delete( 'all_options', 'options' );
 
         $wpdb->update($wpdb->options, array('option_value' => $newvalue), array('option_name' => $option_name) );
 
@@ -583 +509 @@
         $value = maybe_serialize( $value );
         $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
 
-        if ( 'yes' == $autoload ) {
-                $alloptions = wp_load_alloptions();
-                $alloptions[$name] = $value;
-                wp_cache_set( 'alloptions', $alloptions, 'options' );
-        } else {
-                wp_cache_set( $name, $value, 'options' );
-        }
+        wp_cache_set( $name, $value, 'options' );
+        wp_cache_delete( 'all_options', 'options');
 
         // This option exists now
         $notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh
@@ -626 +547 @@
                 return false;
         // expected_slashed ($name)
         $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
-        if ( 'yes' == $option->autoload ) {
-                $alloptions = wp_load_alloptions();
-                if ( isset( $alloptions[$name] ) ) {
-                        unset( $alloptions[$name] );
-                        wp_cache_set( 'alloptions', $alloptions, 'options' );
-                }
-        } else {
-                wp_cache_delete( $name, 'options' );
-        }
+        wp_cache_delete( $name, 'options' );
+        wp_cache_delete( 'all_options', 'options' );
+
         return true;
 }
 
@@ -683 +598 @@
                 $value = wp_cache_get($transient, 'transient');
         } else {
                 $transient_option = '_transient_' . $wpdb->escape($transient);
-                // If option is not in alloptions, it is not autoloaded and thus has a timeout
-                $alloptions = wp_load_alloptions();
-                if ( !isset( $alloptions[$transient_option] ) ) {
-                        $transient_timeout = '_transient_timeout_' . $wpdb->escape($transient);
-                        if ( get_option($transient_timeout) < time() ) {
+                $transient_timeout = '_transient_timeout_' . $wpdb->escape($transient);
+                // TODO: Avoid timeout option request if option is autoloaded,
+                // autoloaded options don't have timeouts.
+                $timeout = get_option($transient_timeout);
+                if ( $timeout ) {
+                        if ( $timeout < time() ) {
                                 delete_option($transient_option);
                                 delete_option($transient_timeout);
                                 return false;
@@ -1760 +1676 @@
                 return true;
 
         $suppress = $wpdb->suppress_errors();
-        $alloptions = wp_load_alloptions();
         // If siteurl is not set to autoload, check it specifically
-        if ( !isset( $alloptions['siteurl'] ) )
+        if ( !wp_cache_get('siteurl', 'options') )
                 $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
         else
-                $installed = $alloptions['siteurl'];
+                $installed = wp_cache_get('siteurl', 'options');
         $wpdb->suppress_errors( $suppress );
 
         $installed = !empty( $installed );

wp-includes/formatting.php

@@ -241 +241 @@
                 $quote_style = ENT_QUOTES;
         }
 
-        // Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
+        // Store the site charset as a static to avoid multiple calls to wp_cache_get()
         if ( !$charset ) {
                 static $_charset;
                 if ( !isset( $_charset ) ) {
-                        $alloptions = wp_load_alloptions();
-                        $_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
+                        $_charset = wp_cache_get('blog_charset');
                 }
                 $charset = $_charset;
         }

wp-settings.php

@@ -302 +302 @@
         wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
 }
 
+/**
+ * Loads and caches all autoloaded options
+ *
+ * @since 2.2.0
+ * @package WordPress
+ * @subpackage Option
+ *
+ */
+function wp_load_alloptions() {
+        global $wpdb;
+
+        if ( !defined( 'WP_INSTALLING' ) ) {
+                error_log('fetchin all_option');
+                $all_options = wp_cache_get('all_options', 'options');
+
+                if ( false !== $all_options ) {
+                        if ( false !== wp_cache_get_multi( array('options' => $all_options) ) )
+                                return;
+                }
+        }
+
+        $suppress = $wpdb->suppress_errors();
+        // order by option_id asc in case there are duplicate values - this makes the most recent value overwrite the others in the array
+        //  TODO: Assumes there are no autoload options, need to make this assumption optional
+        $all_options_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options FORCE INDEX(PRIMARY) ORDER BY option_id ASC" );
+        $wpdb->suppress_errors($suppress);
+        $options = array();
+        foreach ( (array) $all_options_db as $o ) {
+                wp_cache_add($o->option_name, $o->option_value, 'options');
+                $options[] = $o->option_name;
+        }
+
+        wp_cache_set('all_options', $options, 'options');
+
+        return;
+}
+
+wp_load_alloptions();
+
 require (ABSPATH . WPINC . '/plugin.php');
 require (ABSPATH . WPINC . '/default-filters.php');
 include_once(ABSPATH . WPINC . '/pomo/mo.php');