Always clear the object cache after each chunk of comments and users

wp-cli/wp-cli#6426 makes the formatter read the requested fields of each
item while it is current, also when it can't stream them. User meta and
the post fields of comments are therefore read before the cache of their
chunk is cleared, so the cache no longer needs to be kept for them.

The posts of each chunk of comments are now loaded in one query, so that
fields like post_title don't load each post again in every chunk.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D26yjkN2BiqCXT6p6o1WqS

Author: claude

src/Comment_Command.php

@@ -524,8 +524,7 @@ public function list_( $args, $assoc_args ) {
 
 		// Threaded results are nested, so they can't be loaded in chunks.
 		if ( ! in_array( $formatter->format, [ 'count', 'ids' ], true ) && empty( $assoc_args['hierarchical'] ) ) {
-			$fields = $formatter->field ? [ $formatter->field ] : (array) $formatter->fields;
-			$formatter->display_items( $this->query_comments_in_chunks( $assoc_args, $fields ) );
+			$formatter->display_items( $this->query_comments_in_chunks( $assoc_args, $need_url ) );
 			return;
 		}
 
@@ -574,23 +573,15 @@ function ( $comment ) {
 	 * a chunk at a time, and the object cache is cleared after each chunk. Formats that
 	 * can be written item by item are then streamed by the formatter.
 	 *
-	 * Fields that WP_Comment reads from the comment's post are read from the object
-	 * cache. If any of them are displayed, the cache is kept, because the formatter may
-	 * only read them once all comments have been loaded.
+	 * Fields that WP_Comment reads from the comment's post are read from the object cache.
+	 * The formatter reads the requested fields of each comment while it is the current
+	 * item, before the cache of its chunk is cleared, even when it can't stream them.
 	 *
 	 * @param array<string, mixed> $query_args WP_Comment_Query arguments.
-	 * @param string[]             $fields     Fields that will be displayed.
+	 * @param bool                 $need_url   Whether to add the `url` property to each comment.
 	 * @return \Generator<int, \WP_Comment>
 	 */
-	private function query_comments_in_chunks( $query_args, $fields ) {
-		$need_url    = in_array( 'url', $fields, true );
-		$clear_cache = true;
-		foreach ( $fields as $field ) {
-			if ( 'url' !== $field && ! property_exists( 'WP_Comment', $field ) && ! property_exists( 'WP_Comment', 'comment_' . $field ) ) {
-				$clear_cache = false;
-			}
-		}
-
+	private function query_comments_in_chunks( $query_args, $need_url ) {
 		$result = ( new WP_Comment_Query() )->query(
 			array_merge(
 				$query_args,
@@ -616,6 +607,8 @@ private function query_comments_in_chunks( $query_args, $fields ) {
 		$chunk_args['fields']        = '';
 		$chunk_args['count']         = false;
 		$chunk_args['no_found_rows'] = true;
+		// Load the posts of each chunk in one query, as fields like `post_title` read them.
+		$chunk_args['update_comment_post_cache'] = true;
 
 		foreach ( array_chunk( $ids, self::LIST_CHUNK_SIZE ) as $chunk ) {
 			$chunk_args['comment__in'] = $chunk;
@@ -641,9 +634,7 @@ private function query_comments_in_chunks( $query_args, $fields ) {
 			}
 
 			unset( $comments );
-			if ( $clear_cache ) {
-				self::clear_runtime_object_cache();
-			}
+			self::clear_runtime_object_cache();
 		}
 	}
 

src/User_Command.php

@@ -177,8 +177,8 @@ public function list_( $args, $assoc_args ) {
 		} elseif ( 'count' === $formatter->format ) {
 			$formatter->display_items( get_users( $assoc_args ) );
 		} else {
-			$fields = $formatter->field ? [ $formatter->field ] : (array) $formatter->fields;
-			$formatter->display_items( $this->query_users_in_chunks( $assoc_args, $fields ) );
+			$need_url = 'url' === $formatter->field || in_array( 'url', (array) $formatter->fields, true );
+			$formatter->display_items( $this->query_users_in_chunks( $assoc_args, $need_url ) );
 		}
 	}
 
@@ -189,28 +189,15 @@ public function list_( $args, $assoc_args ) {
 	 * loaded a chunk at a time, and the object cache is cleared after each chunk. Formats
 	 * that can be written item by item are then streamed by the formatter.
 	 *
-	 * User meta is read from the object cache. If any meta is displayed, the cache is
-	 * kept, because the formatter may only read it once all users have been loaded.
+	 * User meta is read from the object cache. The formatter reads the requested fields of
+	 * each user while it is the current item, before the cache of its chunk is cleared,
+	 * even when it can't stream them.
 	 *
-	 * @param array    $query_args WP_User_Query arguments.
-	 * @param string[] $fields     Fields that will be displayed.
+	 * @param array $query_args WP_User_Query arguments.
+	 * @param bool  $need_url   Whether to add the `url` property to each user.
 	 * @return \Generator<int, \WP_User>
 	 */
-	private function query_users_in_chunks( $query_args, $fields ) {
-		$columns     = [ 'ID', 'user_login', 'user_pass', 'user_nicename', 'user_email', 'user_url', 'user_registered', 'user_activation_key', 'user_status', 'display_name' ];
-		$need_url    = in_array( 'url', $fields, true );
-		$clear_cache = true;
-		foreach ( $fields as $field ) {
-			if (
-				! in_array( $field, [ 'url', 'roles' ], true )
-				&& ! in_array( $field, $columns, true )
-				&& ! in_array( 'user_' . $field, $columns, true )
-				&& ! property_exists( 'WP_User', $field )
-			) {
-				$clear_cache = false;
-			}
-		}
-
+	private function query_users_in_chunks( $query_args, $need_url ) {
 		$ids = array_map( 'intval', (array) get_users( array_merge( $query_args, [ 'fields' => 'ids' ] ) ) );
 
 		$chunk_args = $query_args;
@@ -244,9 +231,7 @@ private function query_users_in_chunks( $query_args, $fields ) {
 			}
 
 			unset( $users );
-			if ( $clear_cache ) {
-				self::clear_runtime_object_cache();
-			}
+			self::clear_runtime_object_cache();
 		}
 	}