Changeset 3678

Timestamp:

04/02/2006 12:33:10 AM (19 years ago)

Author:

ryan

Message:

Some optimization of the post query. #2604

Location:

trunk

Files:

• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/query.php (modified) (4 diffs)
• wp-includes/template-functions-links.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/upgrade-functions.php

@@ -167 +167 @@
         upgrade_160();
 
-    if ( $wp_current_db_version < 3582 )
+    if ( $wp_current_db_version < 3672 )
         upgrade_210();
 

trunk/wp-admin/upgrade-schema.php

@@ -114 +114 @@
   guid varchar(255) NOT NULL default '',
   menu_order int(11) NOT NULL default '0',
-  post_type varchar(100) NOT NULL default 'post',
+  post_type varchar(20) NOT NULL default 'post',
   post_mime_type varchar(100) NOT NULL default '',
   comment_count bigint(20) NOT NULL default '0',
   PRIMARY KEY  (ID),
-  KEY post_name (post_name)
+  KEY post_name (post_name),
+  KEY type_status_date (post_type, post_status, post_date)
 );
 CREATE TABLE $wpdb->users (

trunk/wp-includes/query.php

@@ -506 +506 @@
         $where = '';
         $limits = '';
-        $distinct = '';
         $join = '';
 
@@ -823 +822 @@
         }
 
-        //$now = gmdate('Y-m-d H:i:59');
-        
-        //only select past-dated posts, except if a logged in user is viewing a single: then, if they
-        //can edit the post, we let them through
-        //if ($pagenow != 'post.php' && $pagenow != 'edit.php' && !($this->is_single && $user_ID)) {
-        //  $where .= " AND post_date_gmt <= '$now'";
-        //  $distinct = 'DISTINCT';
-        //}
-
         if ( $this->is_attachment ) {
             $where .= ' AND (post_type = "attachment")';
@@ -843 +833 @@
             if ( is_admin() )
                 $where .= " OR post_status = 'future' OR post_status = 'draft'";
-            else
-                $distinct = 'DISTINCT';
     
             if ( is_user_logged_in() )
@@ -885 +873 @@
         // manipulate paging queries should use these hooks.
         $where = apply_filters('posts_where_paged', $where);
-        $groupby = " $wpdb->posts.ID ";
+        $groupby = '';
         $groupby = apply_filters('posts_groupby', $groupby);
+        if ( ! empty($groupby) )
+            $groupby = 'GROUP BY ' . $groupby;
         $join = apply_filters('posts_join_paged', $join);
         $orderby = apply_filters('posts_orderby', $q['orderby']); 
-        $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1" . $where . " GROUP BY " . $groupby . " ORDER BY " . $orderby . " $limits";
+        $request = " SELECT * FROM $wpdb->posts $join WHERE 1=1 $where $groupby ORDER BY $orderby $limits";
         $this->request = apply_filters('posts_request', $request);
 

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

@@ -471 +471 @@
     
     if ( 'posts' == get_query_var('what_to_show') ) {
-        preg_match('#FROM\s(.*)\sGROUP BY#siU', $wp_query->request, $matches);
+        preg_match('#FROM\s(.*)\sORDER BY#siU', $wp_query->request, $matches);
         $fromwhere = $matches[1];
         $numposts = $wpdb->get_var("SELECT COUNT(DISTINCT ID) FROM $fromwhere");
@@ -477 +477 @@
     } else {
         $posts = $wp_query->posts;
-        preg_match('#WHERE\s(.*)\sGROUP BY#siU', $wp_query->request, $matches);
+        preg_match('#WHERE\s(.*)\sORDER BY#siU', $wp_query->request, $matches);
         $where = preg_replace('/( AND )?post_date >= (\'|\")(.*?)(\'|\")( AND post_date <= (\'\")(.*?)(\'\"))?/siU', '', $matches[1]);
         $num_days = $wpdb->query("SELECT DISTINCT post_date FROM $wpdb->posts WHERE $where GROUP BY year(post_date), month(post_date), dayofmonth(post_date)");

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.1-alpha1';
-$wp_db_version = 3582;
+$wp_db_version = 3672;
 
 ?>