Changeset 53098

Timestamp:

04/07/2022 05:57:59 PM (3 years ago)

Author:

spacedmonkey

Message:

Networks and Sites: Improve cache key generation in WP_Network_Query class.

Improve cache key generation in the WP_Network_Query class by removing update_network_cache element in the array used to generate the cache key. This
element does not affect that cache and by removing it, it improves the likelihood of reusing an existing cache.

Props Spacedmonkey, furi3r, johnbillion, johnjamesjacoby, flixos90.
Fixes #55461.

Location:

trunk

Files:

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

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

@@ -243 +243 @@
         $_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'] );
+        // Ignore the $fields, $update_network_cache arguments as the queried result will be the same regardless.
+        unset( $_args['fields'], $_args['update_network_cache'] );
 
         $key          = md5( serialize( $_args ) );

trunk/tests/phpunit/tests/multisite/wpNetworkQuery.php

@@ -511 +511 @@
 
         /**
+         * @ticket 55461
+         */
+        public function test_wp_network_query_cache_with_same_fields_same_cache_field() {
+            $q                 = new WP_Network_Query();
+            $query_1           = $q->query(
+                array(
+                    'fields'               => 'all',
+                    'number'               => 3,
+                    'order'                => 'ASC',
+                    'update_network_cache' => true,
+                )
+            );
+            $number_of_queries = get_num_queries();
+
+            $query_2 = $q->query(
+                array(
+                    'fields'               => 'all',
+                    'number'               => 3,
+                    'order'                => 'ASC',
+                    'update_network_cache' => true,
+                )
+            );
+
+            $this->assertSame( $number_of_queries, get_num_queries() );
+        }
+
+        /**
+         * @ticket 55461
+         */
+        public function test_wp_network_query_cache_with_same_fields_different_cache_field() {
+            $q                 = new WP_Network_Query();
+            $query_1           = $q->query(
+                array(
+                    'fields'               => 'all',
+                    'number'               => 3,
+                    'order'                => 'ASC',
+                    'update_network_cache' => true,
+                )
+            );
+            $number_of_queries = get_num_queries();
+
+            $query_2 = $q->query(
+                array(
+                    'fields'               => 'all',
+                    'number'               => 3,
+                    'order'                => 'ASC',
+                    'update_network_cache' => false,
+                )
+            );
+
+            $this->assertSame( $number_of_queries, get_num_queries() );
+        }
+
+        /**
          * @ticket 45749
          * @ticket 47599