Users: Revert Lazy-load user meta.

With [60915] reverted, this changeset is also being reverted to resolve test failures due to common code.

Reverts [60989].

Follow-up to [61037].

Props jorbin, ellatrix, spacedmonkey.
See #63021, #58001.

git-svn-id: https://develop.svn.wordpress.org/trunk@61038 602fd350-edb4-49c9-b593-d223f7449a82

Author: dream-encode

src/wp-includes/class-wp-metadata-lazyloader.php

@@ -65,10 +65,6 @@ public function __construct() {
 				'filter'   => 'get_blog_metadata',
 				'callback' => array( $this, 'lazyload_meta_callback' ),
 			),
-			'user'    => array(
-				'filter'   => 'get_user_metadata',
-				'callback' => array( $this, 'lazyload_meta_callback' ),
-			),
 		);
 	}
 

src/wp-includes/pluggable.php

@@ -125,8 +125,7 @@ function get_user_by( $field, $value ) {
 	function cache_users( $user_ids ) {
 		global $wpdb;
 
-		$user_ids = array_unique( array_map( 'intval', $user_ids ), SORT_NUMERIC );
-		wp_lazyload_user_meta( $user_ids );
+		update_meta_cache( 'user', $user_ids );
 
 		$clean = _get_non_cached_ids( $user_ids, 'users' );
 

src/wp-includes/user.php

@@ -1310,21 +1310,6 @@ function update_user_meta( $user_id, $meta_key, $meta_value, $prev_value = '' )
 	return update_metadata( 'user', $user_id, $meta_key, $meta_value, $prev_value );
 }
 
-/**
- * Queue user meta for lazy-loading.
- *
- * @since 6.9.0
- *
- * @param int[] $user_ids List of user IDs.
- */
-function wp_lazyload_user_meta( array $user_ids ) {
-	if ( empty( $user_ids ) ) {
-		return;
-	}
-	$lazyloader = wp_metadata_lazyloader();
-	$lazyloader->queue_objects( 'user', $user_ids );
-}
-
 /**
  * Counts number of users who have each of the user roles.
  *

tests/phpunit/includes/abstract-testcase.php

@@ -305,7 +305,6 @@ protected function reset_lazyload_queue() {
 		$lazyloader->reset_queue( 'term' );
 		$lazyloader->reset_queue( 'comment' );
 		$lazyloader->reset_queue( 'blog' );
-		$lazyloader->reset_queue( 'user' );
 	}
 
 	/**

tests/phpunit/tests/post/updatePostAuthorCaches.php

@@ -67,28 +67,6 @@ public function test_update_post_author_caches() {
 			$q->the_post();
 		}
 
-		$this->assertSame( 0, $action->get_call_count(), 'Ensure that user meta are not primed' );
-	}
-
-	/**
-	 * @ticket 63021
-	 */
-	public function test_update_post_author_caches_force_load_meta() {
-		$action = new MockAction();
-		add_filter( 'update_user_metadata_cache', array( $action, 'filter' ), 10, 2 );
-
-		$q = new WP_Query(
-			array(
-				'post_type'      => 'post',
-				'posts_per_page' => self::$post_author_count,
-			)
-		);
-
-		while ( $q->have_posts() ) {
-			$q->the_post();
-			get_the_author_meta(); // Force loading of author meta.
-		}
-
 		$args      = $action->get_args();
 		$last_args = end( $args );
 

tests/phpunit/tests/query/cacheResults.php

@@ -1982,10 +1982,11 @@ public function test_author_cache_warmed_by_the_loop( $fields ) {
 		$query_1->the_post();
 		$num_loop_queries = get_num_queries() - $start_loop_queries;
 		/*
-		 * One expected query:
-		 * 1: User data.
+		 * Two expected queries:
+		 * 1: User meta data,
+		 * 2: User data.
 		 */
-		$this->assertSame( 1, $num_loop_queries, 'Unexpected number of queries while initializing the loop.' );
+		$this->assertSame( 2, $num_loop_queries, 'Unexpected number of queries while initializing the loop.' );
 
 		$start_author_queries = get_num_queries();
 		get_user_by( 'ID', self::$author_id );

tests/phpunit/tests/query/thePost.php

@@ -265,10 +265,10 @@ public function test_the_loop_primes_the_author_cache( $fields, $expected_querie
 	 */
 	public function data_the_loop_fields() {
 		return array(
-			'all fields'                => array( 'all', 1 ),
-			'all fields (empty fields)' => array( '', 1 ),
-			'post IDs'                  => array( 'ids', 3 ),
-			'post ids and parent'       => array( 'id=>parent', 3 ),
+			'all fields'                => array( 'all', 2 ),
+			'all fields (empty fields)' => array( '', 2 ),
+			'post IDs'                  => array( 'ids', 4 ),
+			'post ids and parent'       => array( 'id=>parent', 4 ),
 		);
 	}