Changeset 56925

Timestamp:

10/12/2023 11:39:05 PM (3 years ago)

Author:

peterwilsoncc

Message:

Query: Cache post parent IDs in posts group.

Move the cache of post parent IDs from the dedicated group post_parents to posts. This maintains backward compatibility for clearing all post object related data by calling wp_cache_flush_group( 'posts' ).

Post parent IDs are now cached with with the prefix post_parent: in the posts group.

Follow up to [56763].

Props spacedmonkey, joemcgill, peterwilsoncc.
See #59188.

Location:

trunk

Files:

• src/wp-includes/class-wp-query.php (modified) (3 diffs)
• src/wp-includes/post.php (modified) (3 diffs)
• tests/phpunit/tests/post/primePostParentsCaches.php (modified) (5 diffs)
• tests/phpunit/tests/query/cacheResults.php (modified) (1 diff)

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

@@ -3193 +3193 @@
                                                 _prime_post_parent_id_caches( $post_ids );
 
+                                                $post_parent_cache_keys = array();
+                                                foreach ( $post_ids as $post_id ) {
+                                                        $post_parent_cache_keys[] = 'post_parent:' . (string) $post_id;
+                                                }
+
                                                 /** @var int[] */
-                                                $post_parents = wp_cache_get_multiple( $post_ids, 'post_parent' );
-
-                                                foreach ( $post_parents as $id => $post_parent ) {
+                                                $post_parents = wp_cache_get_multiple( $post_parent_cache_keys, 'posts' );
+
+                                                foreach ( $post_parents as $cache_key => $post_parent ) {
                                                         $obj              = new stdClass();
-                                                        $obj->ID          = (int) $id;
+                                                        $obj->ID          = (int) str_replace( 'post_parent:', '', $cache_key );
                                                         $obj->post_parent = (int) $post_parent;
 
@@ -3246 +3251 @@
 
                         /** @var int[] */
-                        $post_parents = array();
-                        $post_ids     = array();
+                        $post_parents       = array();
+                        $post_ids           = array();
+                        $post_parents_cache = array();
 
                         foreach ( $this->posts as $key => $post ) {
@@ -3255 +3261 @@
                                 $post_parents[ (int) $post->ID ] = (int) $post->post_parent;
                                 $post_ids[]                      = (int) $post->ID;
+
+                                $post_parents_cache[ 'post_parent:' . (string) $post->ID ] = (int) $post->post_parent;
                         }
                         // Prime post parent caches, so that on second run, there is not another database query.
-                        wp_cache_add_multiple( $post_parents, 'post_parent' );
+                        wp_cache_add_multiple( $post_parents_cache, 'posts' );
 
                         if ( $q['cache_results'] && $id_query_is_cacheable ) {

trunk/src/wp-includes/post.php

@@ -7271 +7271 @@
 
         wp_cache_delete( $post->ID, 'posts' );
+        wp_cache_delete( 'post_parent:' . (string) $post->ID, 'posts' );
         wp_cache_delete( $post->ID, 'post_meta' );
-        wp_cache_delete( $post->ID, 'post_parent' );
 
         clean_object_term_cache( $post->ID, $post->post_type );
@@ -7818 +7818 @@
         global $wpdb;
 
-        $non_cached_ids = _get_non_cached_ids( $ids, 'post_parent' );
+        $ids = array_filter( $ids, '_validate_cache_id' );
+        $ids = array_unique( array_map( 'intval', $ids ), SORT_NUMERIC );
+
+        if ( empty( $ids ) ) {
+                return;
+        }
+
+        $cache_keys = array();
+        foreach ( $ids as $id ) {
+                $cache_keys[ $id ] = 'post_parent:' . (string) $id;
+        }
+
+        $cached_data = wp_cache_get_multiple( array_values( $cache_keys ), 'posts' );
+
+        $non_cached_ids = array();
+        foreach ( $cache_keys as $id => $cache_key ) {
+                if ( false === $cached_data[ $cache_key ] ) {
+                        $non_cached_ids[] = $id;
+                }
+        }
+
         if ( ! empty( $non_cached_ids ) ) {
                 $fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.ID, $wpdb->posts.post_parent FROM $wpdb->posts WHERE ID IN (%s)", implode( ',', $non_cached_ids ) ) );
@@ -7825 +7845 @@
                         $post_parent_data = array();
                         foreach ( $fresh_posts as $fresh_post ) {
-                                $post_parent_data[ (int) $fresh_post->ID ] = (int) $fresh_post->post_parent;
+                                $post_parent_data[ 'post_parent:' . (string) $fresh_post->ID ] = (int) $fresh_post->post_parent;
                         }
 
-                        wp_cache_add_multiple( $post_parent_data, 'post_parent' );
+                        wp_cache_add_multiple( $post_parent_data, 'posts' );
                 }
         }

trunk/tests/phpunit/tests/post/primePostParentsCaches.php

@@ -43 +43 @@
 
                 $this->assertSame( 1, $num_queries, 'Unexpected number of queries.' );
-                $this->assertSameSets( array( 0 ), wp_cache_get_multiple( array( $post_id ), 'post_parent' ), 'Array of parent ids' );
+                $this->assertSameSets( array( 0 ), wp_cache_get_multiple( array( "post_parent:{$post_id}" ), 'posts' ), 'Array of parent ids' );
         }
 
@@ -54 +54 @@
                 $num_queries = get_num_queries() - $before_num_queries;
 
+                $cache_keys = array_map(
+                        function ( $post_id ) {
+                                return "post_parent:{$post_id}";
+                        },
+                        self::$posts
+                );
+
                 $this->assertSame( 1, $num_queries, 'Unexpected number of queries.' );
-                $this->assertSameSets( array( 0, 0, 0 ), wp_cache_get_multiple( self::$posts, 'post_parent' ), 'Array of parent ids' );
+                $this->assertSameSets( array( 0, 0, 0 ), wp_cache_get_multiple( $cache_keys, 'posts' ), 'Array of parent ids' );
         }
 
@@ -85 +92 @@
 
                 $this->assertSame( 1, $num_queries, 'Unexpected number of queries on first run' );
-                $this->assertSameSets( array( self::$posts[0] ), wp_cache_get_multiple( array( $page_id ), 'post_parent' ), 'Array of parent ids with post 0 as parent' );
+                $this->assertSameSets( array( self::$posts[0] ), wp_cache_get_multiple( array( "post_parent:{$page_id}" ), 'posts' ), 'Array of parent ids with post 0 as parent' );
 
                 wp_update_post(
@@ -99 +106 @@
 
                 $this->assertSame( 1, $num_queries, 'Unexpected number of queries on second run' );
-                $this->assertSameSets( array( self::$posts[1] ), wp_cache_get_multiple( array( $page_id ), 'post_parent' ), 'Array of parent ids with post 1 as parent' );
+                $this->assertSameSets( array( self::$posts[1] ), wp_cache_get_multiple( array( "post_parent:{$page_id}" ), 'posts' ), 'Array of parent ids with post 1 as parent' );
         }
 
@@ -122 +129 @@
 
                 $this->assertSame( 1, $num_queries, 'Unexpected number of queries on first run' );
-                $this->assertSameSets( array( $parent_page_id ), wp_cache_get_multiple( array( $page_id ), 'post_parent' ), 'Array of parent ids with post 0 as parent' );
+                $this->assertSameSets( array( $parent_page_id ), wp_cache_get_multiple( array( "post_parent:{$page_id}" ), 'posts' ), 'Array of parent ids with post 0 as parent' );
 
                 wp_delete_post( $parent_page_id, true );
 
                 $this->assertSame( 1, $num_queries, 'Unexpected number of queries on second run' );
-                $this->assertSameSets( array( false ), wp_cache_get_multiple( array( $page_id ), 'post_parent' ), 'Array of parent ids with false values' );
+                $this->assertSameSets( array( false ), wp_cache_get_multiple( array( "post_parent:{$page_id}" ), 'posts' ), 'Array of parent ids with false values' );
         }
 }

trunk/tests/phpunit/tests/query/cacheResults.php

@@ -739 +739 @@
                 $query1->query( $args );
 
-                $post_ids = wp_list_pluck( $query1->posts, 'ID' );
-                wp_cache_delete_multiple( $post_ids, 'post_parent' );
+                $post_ids   = wp_list_pluck( $query1->posts, 'ID' );
+                $cache_keys = array_map(
+                        function ( $post_id ) {
+                                return "post_parent:{$post_id}";
+                        },
+                        $post_ids
+                );
+
+                wp_cache_delete_multiple( $cache_keys, 'posts' );
 
                 $queries_before = get_num_queries();