Changeset 6296

Timestamp:

10/30/2007 06:03:11 AM (19 years ago)

Author:

ryan

Message:

wp_get_archives caching. fixes #5275

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (5 diffs)
• post.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -395 +395 @@
 
         if ( 'monthly' == $type ) {
-                $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
+                $query = "SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC $limit";
+                $key = md5($query);
+                $cache = wp_cache_get( 'wp_get_archives' , 'general');
+                if ( !isset( $cache[ $key ] ) ) {
+                        $arcresults = $wpdb->get_results($query);
+                        $cache[ $key ] = $arcresults;
+                        wp_cache_add( 'wp_get_archives', $cache, 'general' );
+                } else {
+                        $arcresults = $cache[ $key ];
+                }
                 if ( $arcresults ) {
                         $afterafter = $after;
@@ -407 +416 @@
                 }
         } elseif ('yearly' == $type) {
-         $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC" . $limit);
+                $query = "SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC $limit";
+                $key = md5($query);
+                $cache = wp_cache_get( 'wp_get_archives' , 'general');
+                if ( !isset( $cache[ $key ] ) ) {
+                        $arcresults = $wpdb->get_results($query);
+                        $cache[ $key ] = $arcresults;
+                        wp_cache_add( 'wp_get_archives', $cache, 'general' );
+                } else {
+                        $arcresults = $cache[ $key ];
+                }
                 if ($arcresults) {
                         $afterafter = $after;
@@ -419 +437 @@
                 }
         } elseif ( 'daily' == $type ) {
-                $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC" . $limit);
+                $query = "SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC $limit";
+                $key = md5($query);
+                $cache = wp_cache_get( 'wp_get_archives' , 'general');
+                if ( !isset( $cache[ $key ] ) ) {
+                        $arcresults = $wpdb->get_results($query);
+                        $cache[ $key ] = $arcresults;
+                        wp_cache_add( 'wp_get_archives', $cache, 'general' );
+                } else {
+                        $arcresults = $cache[ $key ];
+                }
                 if ( $arcresults ) {
                         $afterafter = $after;
@@ -433 +460 @@
         } elseif ( 'weekly' == $type ) {
                 $start_of_week = get_option('start_of_week');
-                $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY WEEK(post_date, $start_of_week), YEAR(post_date) ORDER BY post_date DESC" . $limit);
+                $query = "SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY WEEK(post_date, $start_of_week), YEAR(post_date) ORDER BY post_date DESC $limit";
+                $key = md5($query);
+                $cache = wp_cache_get( 'wp_get_archives' , 'general');
+                if ( !isset( $cache[ $key ] ) ) {
+                        $arcresults = $wpdb->get_results($query);
+                        $cache[ $key ] = $arcresults;
+                        wp_cache_add( 'wp_get_archives', $cache, 'general' );
+                } else {
+                        $arcresults = $cache[ $key ];
+                }
                 $arc_w_last = '';
                 $afterafter = $after;
@@ -454 +490 @@
         } elseif ( ( 'postbypost' == $type ) || ('alpha' == $type) ) {
                 ('alpha' == $type) ? $orderby = "post_title ASC " : $orderby = "post_date DESC ";
-                $arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit");
+                $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
+                $key = md5($query);
+                $cache = wp_cache_get( 'wp_get_archives' , 'general');
+                if ( !isset( $cache[ $key ] ) ) {
+                        $arcresults = $wpdb->get_results($query);
+                        $cache[ $key ] = $arcresults;
+                        wp_cache_add( 'wp_get_archives', $cache, 'general' );
+                } else {
+                        $arcresults = $cache[ $key ];
+                }
                 if ( $arcresults ) {
                         foreach ( $arcresults as $arcresult ) {

trunk/wp-includes/post.php

@@ -1633 +1633 @@
         clean_object_term_cache($id, 'post');
 
+        wp_cache_delete( 'wp_get_archives', 'general' );
+
         do_action('clean_post_cache', $id);
 }