Changeset 4855

Timestamp:

02/01/07 08:53:08 (1 year ago)

Author:

markjaquith

Message:

Introduce Notoptions and Alloptions caching, so that all options (and previously attempted Notoptions) are read from the cache in one go. Should reduce cache misses to zero or close to it. fixes #3726

Files:

• trunk/wp-includes/cache.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (6 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-includes/cache.php

@@ -192 +192 @@
-                    $this->cache['category'][$catt->cat_ID] = $catt;
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-

trunk/wp-includes/functions.php

@@ -209 +209 @@
-        return $pre; 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -234 +247 @@
-
-    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)));
-}
-
@@ -263 +282 @@
-}
-
+function wp_load_alloptions() {
+    global $wpdb;
+
+    $alloptions = wp_cache_get('alloptions', 'options');
+
+    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');
+    }
+    return $alloptions;
+}
+
-function update_option($option_name, $newvalue) {
-    global $wpdb;
+
+    wp_protect_special_option($option_name);
-
-    if ( is_string($newvalue) )
@@ -280 +319 @@
-    }
-
+    $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);
-
-
+
+
+
+
+
+
+
-
-    $newvalue = $wpdb->escape($newvalue);
@@ -299 +350 @@
-    global $wpdb;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    $value = maybe_serialize($value);
-
-
+
+
+
+
+
+
+
-
-    $name = $wpdb->escape($name);
@@ -317 +381 @@
-function delete_option($name) {
-    global $wpdb;
+
+    wp_protect_special_option($name);
+
-    // Get the ID, if no ID then return
-_id = $wpdb->get_var("SELECT option_i
-
+ = $wpdb->get_row("SELECT option_id, autoloa
+->option
-    $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = '$name'");
-
+
+
+
+
+
+
+
+
+
-    return true;
-}

trunk/wp-includes/version.php

@@ -4 +4 @@
-
-$wp_version = '2.2-bleeding';
-2
+3
-
-?>