Ticket #2268: options-caches.diff

wp-includes/cache.php

@@ -193 +193 @@
                         }
                 } else
                         if ('options' == $group) {
+                                return; // disabled... handled in get_option() now
                                 $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");

wp-includes/functions.php

@@ -208 +208 @@
         if ( $pre ) 
                 return $pre; 
 
-        $value = wp_cache_get($setting, 'options');
+        // prevent non-existent options from triggering multiple queries
+        $notoptions = wp_cache_get('notoptions', 'options');
+        if ( isset($notoptions[$setting]) )
+                return false;
 
-        if ( false === $value ) {
-                if ( defined('WP_INSTALLING') )
-                        $wpdb->hide_errors();
-                $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
-                if ( defined('WP_INSTALLING') )
-                        $wpdb->show_errors();
+        $alloptions = wp_cache_get('alloptions', 'options');
 
-                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_set($setting, $value, 'options');
-                } else {
-                        return false;
+        if ( !$alloptions ) {
+                $wpdb->hide_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->show_errors();
+                $alloptions = array();
+                foreach ( (array) $alloptions_db as $o )
+                        $alloptions[$o->option_name] = $o->option_value;
+                wp_cache_set('alloptions', $alloptions, 'options');
+        }
+
+        if ( isset($alloptions[$setting]) ) {
+                $value = $alloptions[$setting];
+        } else {
+                $value = wp_cache_get($setting, 'options');
+
+                if ( false === $value ) {
+                        if ( defined('WP_INSTALLING') )
+                                $wpdb->hide_errors();
+                        $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
+                        if ( defined('WP_INSTALLING') )
+                                $wpdb->show_errors();
+
+                        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_set($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 false;
+                        }
                 }
         }
 
@@ -235 +259 @@
         return apply_filters( 'option_' . $setting, maybe_unserialize($value) );
 }
 
+function wp_protect_special_option($option) {
+        $protected = array('alloptions', 'notoptions');
+        if ( in_array($option, $protected) )
+                die(sprintf(__('%s is a protected WP option and may not be modified'), wp_specialchars($option)));
+}
+
 function form_option($option) {
         echo attribute_escape(get_option($option));
 }
@@ -265 +295 @@
 function update_option($option_name, $newvalue) {
         global $wpdb;
 
+        wp_protect_special_option($option_name);
+
         if ( is_string($newvalue) )
                 $newvalue = trim($newvalue);
 
@@ -279 +311 @@
                 return true;
         }
 
+        $notoptions = wp_cache_get('notoptions', 'options');
+        if ( isset($notoptions[$option_name]) ) {
+                unset($notoptions[$option_name]);
+                wp_cache_set('notoptions', $notoptions, 'options');
+        }
+
         $_newvalue = $newvalue;
         $newvalue = maybe_serialize($newvalue);
 
-        wp_cache_set($option_name, $newvalue, 'options');
+        $alloptions = wp_cache_get('alloptions', 'options');
+        if ( isset($alloptions[$option_name]) ) {
+                $alloptions[$options_name] = $newvalue;
+                wp_cache_set('alloptions', $alloptions, 'options');
+        } else {
+                wp_cache_set($option_name, $newvalue, 'options');
+        }
 
         $newvalue = $wpdb->escape($newvalue);
         $option_name = $wpdb->escape($option_name);
@@ -298 +342 @@
 function add_option($name, $value = '', $description = '', $autoload = 'yes') {
         global $wpdb;
 
-        // Make sure the option doesn't already exist
-        if ( false !== get_option($name) )
-                return;
+        wp_protect_special_option($name);
 
+        // Make sure the option doesn't already exist we can check the cache before we ask for a db query
+        $notoptions = wp_cache_get('notoptions', 'options');
+        if ( isset($notoptions[$name]) ) {
+                unset($notoptions[$name]);
+                wp_cache_set('notoptions', $notoptions, 'options');
+        } elseif ( false !== get_option($name) ) {
+                        return;
+        }
+
         $value = maybe_serialize($value);
 
-        wp_cache_set($name, $value, 'options');
+        if ( 'yes' == $autoload ) {
+                $alloptions = wp_cache_get('alloptions', 'options');
+                $alloptions[$name] = $value;
+                wp_cache_set('alloptions', $alloptions, 'options');
+        } else {
+                wp_cache_set($name, $value, 'options');
+        }
 
         $name = $wpdb->escape($name);
         $value = $wpdb->escape($value);
@@ -316 +373 @@
 
 function delete_option($name) {
         global $wpdb;
+
+        wp_protect_special_option($name);
+
         // Get the ID, if no ID then return
-        $option_id = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = '$name'");
-        if ( !$option_id ) return false;
+        $option = $wpdb->get_row("SELECT option_id, autoload FROM $wpdb->options WHERE option_name = '$name'");
+        if ( !$option->option_id ) return false;
         $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = '$name'");
-        wp_cache_delete($name, 'options');
+        if ( 'yes' == $option->autoload ) {
+                $alloptions = wp_cache_get('alloptions', 'options');
+                if ( isset($alloptions[$name]) ) {
+                        unset($alloptions[$name]);
+                        wp_cache_set('alloptions', $alloptions, 'options');
+                }
+        } else {
+                wp_cache_delete($name, 'options');
+        }
         return true;
 }