Changeset 41190

Timestamp:

07/30/2017 02:55:17 PM (8 years ago)

Author:

boonebgorges

Message:

Comments: Ignore the 'fields' parameter in the comment query cache.

WP_Comment_Query always queries runs an ID query, and so is unaffected
by the 'fields' parameter. As such, 'fields' can be ignored when building
a cache key for the results of the ID query.

Props spacedmonkey.
Fixes #41348.

Location:

trunk

Files:

• src/wp-includes/class-wp-comment-query.php (modified) (1 diff)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -376 +376 @@
         }
 
-        // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-        $key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
+        /*
+         * Only use the args defined in the query_var_defaults to compute the key,
+         * but ignore 'fields', which does not affect query results.
+         */
+        $_args = wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) );
+        unset( $_args['fields'] );
+
+        $key = md5( serialize( $_args ) );
         $last_changed = wp_cache_get_last_changed( 'comment' );
-
 
         $cache_key   = "get_comments:$key:$last_changed";

trunk/tests/phpunit/tests/comment/query.php

@@ -2878 +2878 @@
         $this->assertEqualSets( array( $c ), $q->comments );
     }
+
+    /**
+     * @ticket 41348
+     */
+    public function test_count_query_should_miss_noncount_cache() {
+        global $wpdb;
+
+        $q = new WP_Comment_Query();
+
+        $query_1 = $q->query( array(
+            'fields' => 'ids',
+            'number' => 3,
+            'order' => 'ASC',
+        ) );
+
+        $number_of_queries = $wpdb->num_queries;
+
+        $query_2 = $q->query( array(
+            'fields' => 'ids',
+            'number' => 3,
+            'order' => 'ASC',
+            'count' => true,
+        ) );
+        $this->assertEquals( $number_of_queries + 1, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket 41348
+     */
+    public function test_count_query_should_hit_count_cache() {
+        global $wpdb;
+
+        $q = new WP_Comment_Query();
+
+        $query_1 = $q->query( array(
+            'fields' => 'ids',
+            'number' => 3,
+            'order' => 'ASC',
+            'count' => true,
+        ) );
+        $number_of_queries = $wpdb->num_queries;
+
+        $query_2 = $q->query( array(
+            'fields' => 'ids',
+            'number' => 3,
+            'order' => 'ASC',
+            'count' => true,
+        ) );
+        $this->assertEquals( $number_of_queries, $wpdb->num_queries );
+    }
+
+    /**
+     * @ticket 41348
+     */
+    public function test_different_values_of_fields_should_share_cached_values() {
+        global $wpdb;
+
+        $q = new WP_Comment_Query();
+
+        $query_1 = $q->query( array(
+            'fields' => 'all',
+            'number' => 3,
+            'order' => 'ASC',
+        ) );
+        $number_of_queries = $wpdb->num_queries;
+
+        $query_2 = $q->query( array(
+            'fields' => 'ids',
+            'number' => 3,
+            'order' => 'ASC',
+        ) );
+
+        $this->assertEquals( $number_of_queries, $wpdb->num_queries );
+    }
 }