<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[61002] trunk/src/wp-includes/rest-api/endpoints: REST API: Improve performance of `X-WP-Total`/`X-WP-TotalPages` queries.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/61002">61002</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/61002","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-21 03:31:55 +0000 (Tue, 21 Oct 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>REST API: Improve performance of `X-WP-Total`/`X-WP-TotalPages` queries.
Improve the performance of fallback queries to determine the total number of objects available on various REST endpoints for out of bounds queries.
The database queries are modified to return the minimum amount of data required for determining the count and bypass priming of meta a term caches where appropriate.
Props adamsilverstein, joehoyle, johnbillion, jorbin, kadamwhite, spacedmonkey, sukhendu2002, westonruter.
Fixes <a href="https://core.trac.wordpress.org/ticket/62801">#62801</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestglobalstylesrevisionscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestrevisionscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2025-10-21 02:48:53 UTC (rev 61001)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2025-10-21 03:31:55 UTC (rev 61002)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,12 +323,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_pages = (int) $query->max_num_pages;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_comments < 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Out-of-bounds, run the query again without LIMIT for total count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Out-of-bounds, run the query without pagination/offset to get the total count.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $prepared_args['number'], $prepared_args['offset'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = new WP_Comment_Query();
- $prepared_args['count'] = true;
- $prepared_args['orderby'] = 'none';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = new WP_Comment_Query();
+ $prepared_args['count'] = true;
+ $prepared_args['orderby'] = 'none';
+ $prepared_args['update_comment_meta_cache'] = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total_comments = $query->query( $prepared_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $max_pages = (int) ceil( $total_comments / $request['per_page'] );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestglobalstylesrevisionscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php 2025-10-21 02:48:53 UTC (rev 61001)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php 2025-10-21 03:31:55 UTC (rev 61002)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,9 +203,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_revisions = $revisions_query->found_posts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_revisions < 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Out-of-bounds, run the query again without LIMIT for total count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Out-of-bounds, run the query without pagination/offset to get the total count.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $query_args['paged'], $query_args['offset'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count_query = new WP_Query();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $count_query = new WP_Query();
+ $query_args['fields'] = 'ids';
+ $query_args['posts_per_page'] = 1;
+ $query_args['update_post_meta_cache'] = false;
+ $query_args['update_post_term_cache'] = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $count_query->query( $query_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $total_revisions = $count_query->found_posts;
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2025-10-21 02:48:53 UTC (rev 61001)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2025-10-21 03:31:55 UTC (rev 61002)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,10 +487,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_posts = $posts_query->found_posts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_posts < 1 && $page > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Out-of-bounds, run the query again without LIMIT for total count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Out-of-bounds, run the query without pagination/offset to get the total count.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $query_args['paged'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count_query = new WP_Query();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count_query = new WP_Query();
+ $query_args['fields'] = 'ids';
+ $query_args['posts_per_page'] = 1;
+ $query_args['update_post_meta_cache'] = false;
+ $query_args['update_post_term_cache'] = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $count_query->query( $query_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $total_posts = $count_query->found_posts;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestrevisionscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php 2025-10-21 02:48:53 UTC (rev 61001)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php 2025-10-21 03:31:55 UTC (rev 61002)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,12 +308,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_revisions = $revisions_query->found_posts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_revisions < 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Out-of-bounds, run the query again without LIMIT for total count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Out-of-bounds, run the query without pagination/offset to get the total count.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $query_args['paged'], $query_args['offset'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count_query = new WP_Query();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count_query = new WP_Query();
+ $query_args['fields'] = 'ids';
+ $query_args['posts_per_page'] = 1;
+ $query_args['update_post_meta_cache'] = false;
+ $query_args['update_post_term_cache'] = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $count_query->query( $query_args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $total_revisions = $count_query->found_posts;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2025-10-21 02:48:53 UTC (rev 61001)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2025-10-21 03:31:55 UTC (rev 61002)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,10 +399,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_users = $query->get_total();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_users < 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Out-of-bounds, run the query again without LIMIT for total count.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Out-of-bounds, run the query without pagination/offset to get the total count.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $prepared_args['number'], $prepared_args['offset'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count_query = new WP_User_Query( $prepared_args );
- $total_users = $count_query->get_total();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $prepared_args['number'] = 1;
+ $prepared_args['fields'] = 'ID';
+ $count_query = new WP_User_Query( $prepared_args );
+ $total_users = $count_query->get_total();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response->header( 'X-WP-Total', (int) $total_users );
</span></span></pre>
</div>
</div>
</body>
</html>