Changeset 54892 for branches/6.1

Timestamp:

11/29/2022 08:09:24 PM (2 years ago)

Author:

ocean90

Message:

Query: Account for primed post caches without primed post meta/term caches.

In [54352] update_post_caches() was replaced by _prime_post_caches() to reduce excessive object cache calls. That's because _prime_post_caches() checks first if post IDs aren't already cached. Unfortunately this becomes an issue if a post itself is cached but not the meta/terms.
To fix this regression, _prime_post_caches() now always calls update_postmeta_cache() and update_object_term_cache() depending on the arguments passed to it. Both functions internally check whether IDs are already cached so the fix from [54352] remains in place.

Props peterwilsoncc, spacedmonkey, ocean90.
Fixes #57163.

Location:

branches/6.1

Files:

• src/wp-includes/post.php (modified) (4 diffs)
• tests/phpunit/tests/post/primePostCaches.php (added)
• tests/phpunit/tests/query/cacheResults.php (modified) (3 diffs)

branches/6.1/src/wp-includes/post.php

@@ -7823 +7823 @@
     $post_type_taxonomies = array();
     $term_ids             = array();
+    $prime_post_terms     = array();
     foreach ( $posts as $post ) {
         if ( ! ( $post instanceof WP_Post ) ) {
@@ -7832 +7833 @@
         }
 
+        foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
+            $prime_post_terms[ $taxonomy ][] = $post->ID;
+        }
+    }
+
+    foreach ( $prime_post_terms as $taxonomy => $post_ids ){
+        wp_cache_get_multiple( $post_ids, "{$taxonomy}_relationships" );
+    }
+
+    foreach ( $posts as $post ) {
         foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
             // Term cache should already be primed by `update_post_term_cache()`.
@@ -7878 +7889 @@
  * @since 6.1.0 This function is no longer marked as "private".
  *
- * @see update_post_caches()
+ * @see update_post_cache()
+ * @see update_postmeta_cache()
+ * @see update_object_term_cache()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -7893 +7906 @@
         $fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", implode( ',', $non_cached_ids ) ) );
 
-        update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+        if ( $fresh_posts ) {
+            // Despite the name, update_post_cache() expects an array rather than a single post.
+            update_post_cache( $fresh_posts );
+        }
+    }
+
+    if ( $update_meta_cache ) {
+        update_postmeta_cache( $ids );
+    }
+
+    if ( $update_term_cache ) {
+        $post_types = array_map( 'get_post_type', $ids );
+        $post_types = array_unique( $post_types );
+        update_object_term_cache( $ids, $post_types );
     }
 }

branches/6.1/tests/phpunit/tests/query/cacheResults.php

@@ -1238 +1238 @@
         $query_1 = new WP_Query(
             array(
-                'post_type' => 'page',
-                'fields'    => $fields,
-                'author'    => self::$author_id,
+                'post_type'              => 'page',
+                'fields'                 => $fields,
+                'author'                 => self::$author_id,
+                'update_post_meta_cache' => false,
+                'update_post_term_cache' => false,
             )
         );
@@ -1248 +1250 @@
         $query_1->the_post();
         $num_loop_queries = get_num_queries() - $start_loop_queries;
+        /*
+         * Two expected queries:
+         * 1: User meta data,
+         * 2: User data.
+         */
         $this->assertSame( 2, $num_loop_queries, 'Unexpected number of queries while initializing the loop.' );
 
@@ -1272 +1279 @@
         );
     }
+
+    /**
+     * Ensure lazy loading term meta queries all term meta in a single query.
+     *
+     * @since 6.1.2
+     * @ticket 57163
+     * @ticket 22176
+     */
+    public function test_get_post_meta_lazy_loads_all_term_meta_data() {
+        $query = new WP_Query();
+
+        $t2 = $this->factory()->term->create(
+            array(
+                'taxonomy' => 'category',
+                'slug'     => 'bar',
+                'name'     => 'Bar',
+            )
+        );
+
+        wp_set_post_terms( self::$posts[0], $t2, 'category', true );
+        // Clean data added to cache by factory and setting terms.
+        clean_term_cache( array( self::$t1, $t2 ), 'category' );
+        clean_post_cache( self::$posts[0] );
+
+        $num_queries_start = get_num_queries();
+        $query_posts       = $query->query(
+            array(
+                'lazy_load_term_meta' => true,
+                'no_found_rows'       => true,
+            )
+        );
+        $num_queries       = get_num_queries() - $num_queries_start;
+
+        /*
+         * Four expected queries:
+         * 1: Post IDs
+         * 2: Post data
+         * 3: Post meta data.
+         * 4: Post term data.
+         */
+        $this->assertSame( 4, $num_queries, 'Unexpected number of queries while querying posts.' );
+        $this->assertNotEmpty( $query_posts, 'Query posts is empty.' );
+
+        $num_queries_start = get_num_queries();
+        get_term_meta( self::$t1 );
+        $num_queries = get_num_queries() - $num_queries_start;
+
+        /*
+         * One expected query:
+         * 1: Term meta data.
+         */
+        $this->assertSame( 1, $num_queries, 'Unexpected number of queries during first query of term meta.' );
+
+        $num_queries_start = get_num_queries();
+        get_term_meta( $t2 );
+        $num_queries = get_num_queries() - $num_queries_start;
+
+        // No additional queries expected.
+        $this->assertSame( 0, $num_queries, 'Unexpected number of queries during second query of term meta.' );
+    }
 }