From 33b32ebc4ee8cdc577792c40ee47736394442dc4 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Mon, 9 Oct 2023 23:01:15 +0000 Subject: [PATCH] Query: Rename `_prime_post_parents_caches()` for clarity. Change the name of `_prime_post_parents_caches()` to `_prime_post_parent_id_caches()` to make it clearer only the parent post ID is cached rather than the entire post parent object. Follow up to [56763]. Props spacedmonkey, joemcgill, peterwilsoncc. See #59188. git-svn-id: https://develop.svn.wordpress.org/trunk@56811 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-query.php | 2 +- src/wp-includes/post.php | 4 +-- .../tests/post/primePostParentsCaches.php | 32 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php index a52b5a484e..3fcb942aa7 100644 --- a/src/wp-includes/class-wp-query.php +++ b/src/wp-includes/class-wp-query.php @@ -3191,7 +3191,7 @@ class WP_Query { return $this->posts; } elseif ( 'id=>parent' === $q['fields'] ) { - _prime_post_parents_caches( $post_ids ); + _prime_post_parent_id_caches( $post_ids ); /** @var int[] */ $post_parents = wp_cache_get_multiple( $post_ids, 'post_parent' ); diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index 1f2c65e158..a85d8fbdb5 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -7797,7 +7797,7 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache } /** - * Prime post parent caches. + * Prime the cache containing the parent ID of various post objects. * * @global wpdb $wpdb WordPress database abstraction object. * @@ -7805,7 +7805,7 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache * * @param int[] $ids ID list. */ -function _prime_post_parents_caches( array $ids ) { +function _prime_post_parent_id_caches( array $ids ) { global $wpdb; $non_cached_ids = _get_non_cached_ids( $ids, 'post_parent' ); diff --git a/tests/phpunit/tests/post/primePostParentsCaches.php b/tests/phpunit/tests/post/primePostParentsCaches.php index a430450aab..6365688c22 100644 --- a/tests/phpunit/tests/post/primePostParentsCaches.php +++ b/tests/phpunit/tests/post/primePostParentsCaches.php @@ -1,19 +1,19 @@ assertSame( 1, $num_queries, 'Unexpected number of queries.' ); @@ -48,9 +48,9 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { /** * @ticket 59188 */ - public function test_prime_post_parents_caches_multiple() { + public function test_prime_post_parent_id_caches_multiple() { $before_num_queries = get_num_queries(); - _prime_post_parents_caches( self::$posts ); + _prime_post_parent_id_caches( self::$posts ); $num_queries = get_num_queries() - $before_num_queries; $this->assertSame( 1, $num_queries, 'Unexpected number of queries.' ); @@ -60,10 +60,10 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { /** * @ticket 59188 */ - public function test_prime_post_parents_caches_multiple_runs() { - _prime_post_parents_caches( self::$posts ); + public function test_prime_post_parent_id_caches_multiple_runs() { + _prime_post_parent_id_caches( self::$posts ); $before_num_queries = get_num_queries(); - _prime_post_parents_caches( self::$posts ); + _prime_post_parent_id_caches( self::$posts ); $num_queries = get_num_queries() - $before_num_queries; $this->assertSame( 0, $num_queries, 'Unexpected number of queries.' ); @@ -72,7 +72,7 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { /** * @ticket 59188 */ - public function test_prime_post_parents_caches_update() { + public function test_prime_post_parent_id_caches_update() { $page_id = self::factory()->post->create( array( 'post_type' => 'page', @@ -80,7 +80,7 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { ) ); $before_num_queries = get_num_queries(); - _prime_post_parents_caches( array( $page_id ) ); + _prime_post_parent_id_caches( array( $page_id ) ); $num_queries = get_num_queries() - $before_num_queries; $this->assertSame( 1, $num_queries, 'Unexpected number of queries on first run' ); @@ -94,7 +94,7 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { ); $before_num_queries = get_num_queries(); - _prime_post_parents_caches( array( $page_id ) ); + _prime_post_parent_id_caches( array( $page_id ) ); $num_queries = get_num_queries() - $before_num_queries; $this->assertSame( 1, $num_queries, 'Unexpected number of queries on second run' ); @@ -104,7 +104,7 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { /** * @ticket 59188 */ - public function test_prime_post_parents_caches_delete() { + public function test_prime_post_parent_id_caches_delete() { $parent_page_id = self::factory()->post->create( array( 'post_type' => 'page', @@ -117,7 +117,7 @@ class Tests_Post_PrimePostParentsCaches extends WP_UnitTestCase { ) ); $before_num_queries = get_num_queries(); - _prime_post_parents_caches( array( $page_id ) ); + _prime_post_parent_id_caches( array( $page_id ) ); $num_queries = get_num_queries() - $before_num_queries; $this->assertSame( 1, $num_queries, 'Unexpected number of queries on first run' );