Changeset 41063

Timestamp:

07/17/2017 08:15:27 PM (9 years ago)

Author:

flixos90

Message:

Multisite: Improve caching in WP_Network_Query by ignoring the $fields argument.

Prior to this change there were two different cache keys used for the same query. That is because regardless of the $fields argument, the query response will be the same. This was already fixed for WP_Site_Query in [41059].

Props spacedmonkey.
Fixes #41347.

Location:

trunk

Files:

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

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

@@ -209 +209 @@
 
                 // $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 ) ) ) );
+                $_args = wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) );
+
+                // Ignore the $fields argument as the queried result will be the same regardless.
+                unset( $_args['fields'] );
+
+                $key = md5( serialize( $_args ) );
                 $last_changed = wp_cache_get_last_changed( 'networks' );
 

trunk/tests/phpunit/tests/multisite/networkQuery.php

@@ -380 +380 @@
                 $this->assertEquals( $expected, $found );
         }
+
+        /**
+         * @ticket 41347
+         */
+        public function test_wp_network_query_cache_with_different_fields_no_count() {
+                global $wpdb;
+
+                $q                 = new WP_Network_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 );
+        }
+
+        /**
+         * @ticket 41347
+         */
+        public function test_wp_network_query_cache_with_different_fields_active_count() {
+                global $wpdb;
+
+                $q = new WP_Network_Query();
+
+                $query_1           = $q->query( array(
+                        'fields'     => 'all',
+                        '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 41347
+         */
+        public function test_wp_network_query_cache_with_same_fields_different_count() {
+                global $wpdb;
+
+                $q = new WP_Network_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 );
+        }
 }