Changeset 3011

Timestamp:

11/07/05 21:56:03 (3 years ago)

Author:

ryan

Message:

Object caching, round one.

Files:

• trunk/wp-admin/admin-db.php (modified) (3 diffs)
• trunk/wp-includes/cache.php (added)
• trunk/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-includes/functions-post.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (14 diffs)
• trunk/wp-includes/pluggable-functions.php (modified) (4 diffs)
• trunk/wp-includes/registration-functions.php (modified) (3 diffs)
• trunk/wp-includes/template-functions-category.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (5 diffs)

trunk/wp-admin/admin-db.php

@@ -119 +119 @@
-    }
-
+    wp_cache_set($cat_ID, get_category($cat_ID), 'category');
+
-    if ($update) {
-        do_action('edit_category', $cat_ID);
-    } else {
+        wp_cache_delete('all_category_ids', 'category');
-        do_action('create_category', $cat_ID);
-        do_action('add_category', $cat_ID);
@@ -167 +170 @@
-    // TODO: Only set categories to general if they're not in another category already
-    $wpdb->query("UPDATE $wpdb->post2cat SET category_id='1' WHERE category_id='$cat_ID'");
+
+    wp_cache_delete($cat_ID, 'category');
+    wp_cache_delete('all_category_ids', 'category');
-
-    do_action('delete_category', $cat_ID);
@@ -234 +240 @@
-    $wpdb->query("DELETE FROM $wpdb->users WHERE ID = $id");
-
+    wp_cache_delete($id, 'users');
+    // TODO: Need to delete username keyed cache object.
+
-    do_action('delete_user', $id);
-

trunk/wp-includes/classes.php

@@ -444 +444 @@
-                $cat_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            $tables = ", $wpdb->post2cat, $wpdb->categories";
-            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) LEFT JOIN $wpdb->categories ON ($wpdb->post2cat.category_id = $wpdb->categories.cat_ID) ";

trunk/wp-includes/functions-post.php

@@ -138 +138 @@
-    wp_set_post_cats('', $post_ID, $post_category);
-
-
+ {
-        clean_page_cache($post_ID);
-
+
+
-        clean_post_cache($post_ID);
+    }
-
-    // Set GUID

trunk/wp-includes/functions.php

@@ -261 +261 @@
-
-function get_settings($setting) {
-, $cache_settings, $cache_nonexistantoptions
+
-    if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || defined('WP_INSTALLING') )
-        return false;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -339 +330 @@
-
-function update_option($option_name, $newvalue) {
-, $cache_settings
+
-
-    if ( is_string($newvalue) )
@@ -355 +346 @@
-        add_option($option_name);
-
+    wp_cache_set($option_name, $newvalue, 'options');
+
-    $newvalue = $wpdb->escape($newvalue);
- $option_name 
+$option_name
-    $wpdb->query("UPDATE $wpdb->options SET option_value = '$newvalue' WHERE option_name = '$option_name'");
-    $cache_settings = get_alloptions(); // Re cache settings
-    return true;
-}
@@ -371 +363 @@
-// thx Alex Stapleton, http://alex.vort-x.net/blog/
-function add_option($name, $value = '', $description = '', $autoload = 'yes') {
-, $cache_settings
+
-
-    // Make sure the option doesn't already exist
-isset($cache_settings->$name
+false !== get_option($name, 'options'
-        return;
-
@@ -381 +373 @@
-        $value = serialize($value);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    return;
-}
@@ -401 +389 @@
-    if ( !$option_id ) return false;
-    $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = '$name'");
+    wp_cache_delete($name, 'options');
-    return true;
-}
@@ -589 +578 @@
-// Handles page caching.
-function &get_page(&$page, $output = OBJECT) {
-page_cache, $
+
-
-    if ( empty($page) ) {
-
+ {
-            $_page = & $GLOBALS['page'];
-
+
+
-            $_page = null;
+        }
-    } elseif ( is_object($page) ) {
-
-
-
-
-
+
+
+
+
-            $_page = & $GLOBALS['page'];
-
-
-
+
+
+
+
-            $query = "SELECT * FROM $wpdb->posts WHERE ID= '$page'";
-page_cache[$page]
-$_page = & $page_cache[$page]
+_page
+wp_cache_add($_page->ID, $_page, 'pages')
-        }
-    }
@@ -623 +614 @@
-}
-
+function set_category_path($cat) {
+    $cat->fullpath = '/' . $cat->category_nicename;
+    $path = $cat->fullpath;
+    $curcat = $cat;
+    while ($curcat->category_parent != 0) {
+        $curcat = get_category($curcat->category_parent);
+        $path = '/' . $curcat->category_nicename . $path;
+    }
+    
+    $cat->fullpath = $path;
+
+    return $cat;
+}
+
-// Retrieves category data given a category ID or category object.
-// Handles category caching.
-function &get_category(&$category, $output = OBJECT) {
-cache_categories, $
+
-
-    if ( empty($category) )
-        return null;
-
-    if ( !isset($cache_categories) )
-        update_category_cache();
-
-    if ( is_object($category) ) {
-
-
-
-
-
+
+
+
+
-            $_category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$category'");
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -693 +697 @@
-    $category = &get_category($cat_ID);
-    return $category->cat_name;
+}
+
+function get_all_category_ids() {
+    global $wpdb;
+    
+    if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
+        $cat_ids = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
+        wp_cache_add('all_category_ids', $cat_ids, 'category');
+    }
+    
+    return $cat_ids;
-}
-
@@ -1232 +1247 @@
-    for ($i = 0; $i < count($pages); $i++) {
-        $page_cache[$pages[$i]->ID] = &$pages[$i];
+        wp_cache_add($pages[$i]->ID, $pages[$i], 'pages');
-    }
-}
@@ -1244 +1260 @@
-
-function update_post_category_cache($post_ids) {
-, $cache_categories
+
-
-    if ( empty($post_ids) )
@@ -1256 +1272 @@
-    WHERE category_id = cat_ID AND post_id IN ($post_ids)");
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -1323 +1336 @@
-
-function update_category_cache() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -2124 +2114 @@
-    if ( $cur->meta_value != $meta_value )
-        $wpdb->query("UPDATE $wpdb->usermeta SET meta_value = '$meta_value' WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
+
+    wp_cache_delete($user_id, 'users');
+    // FIXME: Need to delete username keyed cache object.
-}
-

trunk/wp-includes/pluggable-functions.php

@@ -28 +28 @@
-if ( !function_exists('get_userdata') ) :
-function get_userdata( $user_id ) {
-, $cache_userdata
+
-    $user_id = (int) $user_id;
-    if ( $user_id == 0 )
-        return false;
-
-
-
+
+
+
+
-
-    if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID = '$user_id'") )
-$cache_userdata[$user_id] = 
+
-
-    $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
@@ -52 +54 @@
-    }
-
-$cache_userdata[$user_id] = $user
-$cache_userdata[$cache_userdata[$user_id]->user_login] =& $cache_userdata[$user_id]
-
-cache_userdata[$user_id]
+wp_cache_add($user_id, $user, 'users')
+wp_cache_add($user->user_login, $user, 'users')
+
+user
-}
-endif;
@@ -96 +98 @@
-    if ( empty( $user_login ) )
-        return false;
-
-
-
+
+
+
+
-
-    if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") )
@@ -148 +151 @@
-    }
-
-
+
+
-
-    if (!$login) {

trunk/wp-includes/registration-functions.php

@@ -4 +4 @@
-    global $wpdb;
-    $username = sanitize_user( $username );
-
-
-
+
+
+
+
+
-}
-
@@ -50 +52 @@
-    }
-    
-    clean_user_cache($user_id);
-    clean_user_cache($user_login);
-
-    update_usermeta( $user_id, 'first_name', $first_name);
-    update_usermeta( $user_id, 'last_name', $last_name);
@@ -70 +69 @@
-        $user->set_role(get_settings('default_role'));
-    }
+
+    wp_cache_delete($user_id, 'users');
+    wp_cache_delete($user_login, 'users');
-    
-    if ( $update )

trunk/wp-includes/template-functions-category.php

@@ -127 +127 @@
-
-function get_category_children($id, $before = '/', $after = '') {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        if ( $category->category_parent == $id ) {
-            $chain .= $before.$category->cat_ID.$after;

trunk/wp-settings.php

@@ -21 +21 @@
-$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');
-unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories );
+
+if ( ! isset($blog_id) )
+    $blog_id = 1;
-
-// Fix for IIS, which doesn't set REQUEST_URI
@@ -75 +78 @@
-if ( defined('CUSTOM_USER_META_TABLE') )
-    $wpdb->usermeta = CUSTOM_USER_META_TABLE;
-
+
-// We're going to need to keep this around for a few months even though we're not using it internally
-
@@ -88 +91 @@
-$tablepostmeta = $wpdb->postmeta;
-
+if ( file_exists(ABSPATH . 'wp-content/object-cache.php') )
+    require (ABSPATH . 'wp-content/object-cache.php');
+else
+    require (ABSPATH . WPINC . '/cache.php');
+
+// For now, disable persistent caching by default.  To enable, comment out
+// the following line.
+define('DISABLE_CACHE', true);
+
+wp_cache_init();
+
-$wp_filters = array();
-
@@ -95 +109 @@
-
-$wpdb->hide_errors();
-
+
+
-    if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
-        $link = 'install.php';
@@ -195 +210 @@
-
-function shutdown_action_hook() {
+    wp_cache_close();
-    do_action('shutdown');
-}