Ticket #31245: 31245-1.diff

wp-admin/includes/update-core.php

@@ -1085 +1085 @@
         // Clear the cache to prevent an update_option() from saving a stale db_version to the cache
         wp_cache_flush();
         // (Not all cache backends listen to 'flush')
-        wp_cache_delete( 'alloptions', 'options' );
+        wp_cache_delete( 'alloptionskeys', 'options' );
 
         // Remove working directory
         $wp_filesystem->delete($from, true);

wp-includes/cache.php

@@ -124 +124 @@
 }
 
 /**
+ * Retrieve multiple cache items.
+ *
+ * @param array $groups Associative array of cache groups to cache keys to fetch.
+ * @param string $force Whether to force a refetch rather than relying on the local cache (default is false).
+ * @return false|array False on failure or cache contents on success as an two-level associative array, keyed by group and cache key.
+ */
+function wp_cache_get_multi( $groups, $force = false ) {
+        global $wp_object_cache;
+
+        return $wp_object_cache->get_multi( $groups, $force );
+}
+
+/**
  * Increment numeric cache item's value
  *
  * @since 3.3.0
@@ -444 +457 @@
         }
 
         /**
+         * Retrieve multiple cache items.
+         *
+         * @param array $groups Associative array of cache groups to cache keys to fetch.
+         * @param string $force Whether to force a refetch rather than relying on the local cache (default is false).
+         * @return false|array False on failure or cache contents on success as an two-level associative array, keyed by group and cache key.
+         */
+        public function get_multi( $groups, $force = false ) {
+                $data = array();
+
+                foreach ( $groups as $group => $keys ) {
+                        $data[ $group ] = array();
+
+                        foreach ( $keys as $key ) {
+                                $value = $this->get( $key, $group, $force, $found );
+                                if ( ! $found ) {
+                                        continue;
+                                }
+
+                                $data[ $group ][ $key ] = $value;
+                        }
+                }
+
+                return $data;
+        }
+
+        /**
          * Decrements numeric cache item's value.
          *
          * @since 3.3.0

wp-includes/load.php

@@ -479 +479 @@
 }
 
 /**
+ * Retrieve multiple cache items.
+ *
+ * Note: This should be used only as a fallback if `wp_cache_get_multi` is not
+ * defined for the current object cache.
+ *
+ * @param array $groups Associative array of cache groups to cache keys to fetch.
+ * @param string $force Whether to force a refetch rather than relying on the local cache (default is false).
+ * @return false|array False on failure or cache contents on success as an two-level associative array, keyed by group and cache key.
+ */
+function _wp_cache_compat_get_multi( $groups, $force = false ) {
+        $data = array();
+
+        foreach ( $groups as $group => $keys ) {
+                $data[ $group ] = array();
+
+                foreach ( $keys as $key ) {
+                        $value = wp_cache_get( $key, $group, $force );
+                        if ( ! $value ) {
+                                continue;
+                        }
+
+                        $data[ $group ][ $key ] = $value;
+                }
+        }
+
+        return $data;
+}
+
+/**
  * Redirect to the installer if WordPress is not installed.
  *
  * Dies with an error message when Multisite is enabled.

wp-includes/option.php

@@ -144 +144 @@
  * @param string $option Option name.
  */
 function wp_protect_special_option( $option ) {
-        if ( 'alloptions' === $option || 'notoptions' === $option )
+        if ( 'alloptions' === $option || 'alloptionskeys' === $option || 'notoptions' === $option )
                 wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
 }
 
@@ -171 +171 @@
 function wp_load_alloptions() {
         global $wpdb;
 
-        if ( ! wp_installing() || ! is_multisite() )
-                $alloptions = wp_cache_get( 'alloptions', 'options' );
-        else
-                $alloptions = false;
+        $alloptions = false;
 
+        if ( !defined( 'WP_INSTALLING' ) || !is_multisite() ) {
+                $keys = wp_cache_get( 'alloptionskeys', 'options' );
+                if ( is_array( $keys ) ) {
+                        if ( function_exists( 'wp_cache_get_multi' ) ) {
+                                $cached_options = wp_cache_get_multi( array( 'options' => array_keys( $keys ) ) );
+                        } else {
+                                $cached_options = _wp_cache_compat_get_multi( array( 'options' => array_keys( $keys ) ) );
+                        }
+                        $alloptions = $cached_options['options'];
+                }
+        }
+
         if ( !$alloptions ) {
                 $suppress = $wpdb->suppress_errors();
                 if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
@@ -182 +191 @@
                         $alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
                 $wpdb->suppress_errors($suppress);
                 $alloptions = array();
+                $keys = array();
                 foreach ( (array) $alloptions_db as $o ) {
                         $alloptions[$o->option_name] = $o->option_value;
+                        $keys[ $o->option_name ] = true;
                 }
-                if ( ! wp_installing() || ! is_multisite() )
-                        wp_cache_add( 'alloptions', $alloptions, 'options' );
+
+                if ( !defined( 'WP_INSTALLING' ) || !is_multisite() ) {
+                        wp_cache_add( 'alloptionskeys', $keys, 'options' );
+
+                        foreach ( $alloptions as $key => $value ) {
+                                wp_cache_set( $key, $value, 'options' );
+                        }
+                }
         }
 
         return $alloptions;
@@ -333 +350 @@
         }
 
         if ( ! wp_installing() ) {
-                $alloptions = wp_load_alloptions();
-                if ( isset( $alloptions[$option] ) ) {
-                        $alloptions[ $option ] = $serialized_value;
-                        wp_cache_set( 'alloptions', $alloptions, 'options' );
-                } else {
-                        wp_cache_set( $option, $serialized_value, 'options' );
-                }
+                wp_cache_set( $option, $serialized_value, 'options' );
         }
 
         /**
@@ -435 +446 @@
 
         if ( ! wp_installing() ) {
                 if ( 'yes' == $autoload ) {
-                        $alloptions = wp_load_alloptions();
-                        $alloptions[ $option ] = $serialized_value;
-                        wp_cache_set( 'alloptions', $alloptions, 'options' );
-                } else {
-                        wp_cache_set( $option, $serialized_value, 'options' );
+                        $alloptionskeys = wp_cache_get( 'alloptionskeys', 'options' );
+                        $alloptionskeys[ $option ] = true;
+                        wp_cache_set( 'alloptionskeys', $alloptionskeys, 'options' );
                 }
+
+                wp_cache_set( $option, $serialized_value, 'options' );
         }
 
         // This option exists now
@@ -511 +522 @@
         $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
         if ( ! wp_installing() ) {
                 if ( 'yes' == $row->autoload ) {
-                        $alloptions = wp_load_alloptions();
-                        if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
-                                unset( $alloptions[$option] );
-                                wp_cache_set( 'alloptions', $alloptions, 'options' );
+                        $alloptionskeys = wp_cache_get( 'alloptionskeys', 'options' );
+                        if ( is_array( $alloptionskeys ) && isset( $alloptionskeys[$option] ) ) {
+                                unset( $alloptionskeys[$option] );
+                                wp_cache_set( 'alloptionskeys', $alloptionskeys, 'options' );
                         }
-                } else {
-                        wp_cache_delete( $option, 'options' );
                 }
+
+                wp_cache_delete( $option, 'options' );
         }
         if ( $result ) {