<!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>[3895] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php: Support Forums: Stop using SQL_CALC_FOUND_ROWS on single forum 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 { 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="http://meta.trac.wordpress.org/changeset/3895">3895</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3895","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jmdodd</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-31 19:52:23 +0000 (Wed, 31 Aug 2016)</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'>Support Forums: Stop using SQL_CALC_FOUND_ROWS on single forum queries.
A better search is more valuable than completely accurate pagination, as the page content will always be in flux as more topics are added to the beginning of the stack.
Order by PRIMARY KEY whenever possible.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassperformanceoptimizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassperformanceoptimizationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php 2016-08-31 18:54:48 UTC (rev 3894)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php 2016-08-31 19:52:23 UTC (rev 3895)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,19 +4,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Performance_Optimizations {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $term = null;
+ var $query = null;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Gravatar suppression on lists of topics.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'bbp_after_get_topic_author_link_parse_args', array( __CLASS__, 'get_author_link' ) );
- add_filter( 'bbp_after_get_reply_author_link_parse_args', array( __CLASS__, 'get_author_link' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bbp_after_get_topic_author_link_parse_args', array( $this, 'get_author_link' ) );
+ add_filter( 'bbp_after_get_reply_author_link_parse_args', array( $this, 'get_author_link' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Query simplification.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'bbp_after_has_topics_parse_args', array( __CLASS__, 'has_topics' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bbp_after_has_topics_parse_args', array( $this, 'has_topics' ) );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove unnecessary Gravatar display on lists of topics.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_author_link( $r ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_author_link( $r ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_single_topic() || bbp_is_topic_edit() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['type'] = 'name';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,54 +27,72 @@
</span><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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Optimize queries for has_topics as much as possible to avoid breaking things.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Optimize queries for has_topics as much as possible.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function has_topics( $r ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function has_topics( $r ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filter view queries so they only look at the last N days of topics.
- */
- if ( bbp_is_single_view() ) {
- $view = bbp_get_view_id();
- // Exclude plugin and theme views from this restriction.
- // @todo Update date to a reasonable range once we're done importing.
- if ( ! in_array( $view, array( 'plugin', 'theme', 'review' ) ) ) {
- $r['date_query'] = array( 'after' => '19 months ago' );
- } else {
- $term = self::get_term();
-
- // If there are a lot of results for a single plugin or theme,
- // order by post_date to avoid an INNER JOIN ON.
- if ( $term && ! is_wp_error( $term ) && property_exists( $term, 'count' ) ) {
- if ( $term->count > 10000 ) {
- unset( $r['meta_key'] );
- unset( $r['meta_type'] );
-
- $r['orderby'] = 'post_date';
- }
- }
- }
-
- /**
- * Filter forum queries so they are not sorted by the post meta value of
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter queries so they are not sorted by the post meta value of
</ins><span class="cx" style="display: block; padding: 0 10px"> * `_bbp_last_active_time`. This query needs additional optimization
</span><span class="cx" style="display: block; padding: 0 10px"> * to run over large sets of posts.
</span><span class="cx" style="display: block; padding: 0 10px"> * See also:
</span><span class="cx" style="display: block; padding: 0 10px"> * - https://bbpress.trac.wordpress.org/ticket/1925
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( bbp_is_single_forum() ) {
- unset( $r['meta_key'] );
- unset( $r['meta_type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $r['post_type'] ) && 'topic' == $r['post_type'] ) {
+ // Theme and plugin views rely on taxonomy queries.
+ if ( isset( $r['tax_query'] ) ) {
+ return $r;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This only works because we don't edit dates on forum topics.
- $r['orderby'] = 'post_date';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // has_topics() uses this by default.
+ if ( isset( $r['meta_key'] ) && '_bbp_last_active_time' == $r['meta_key'] ) {
+ unset( $r['meta_key'] );
+ unset( $r['meta_type'] );
+ $r['orderby'] = 'ID';
+ }
+
+ // If this is a forum, limit the number of pages we're dealing with.
+ if ( isset( $r['post_parent'] ) && get_post_type( $r['post_parent'] ) === bbp_get_forum_post_type() ) {
+ $r['no_found_rows'] = true;
+ add_filter( 'bbp_topic_pagination', array( $this, 'forum_pagination' ) );
+ $this->query = $r;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $r;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function forum_pagination( $r ) {
+ global $wpdb;
+
+ // Try the stored topic count.
+ $count = get_post_meta( $this->query['post_parent'], '_bbp_topic_count', true );
+ if ( ! empty( $count ) ) {
+ $r['total'] = $count / bbp_get_topics_per_page();
+ return $r;
+ }
+
+ // Try SQL.
+ if ( ! is_null( $this->query ) ) {
+ $count = $wpdb->query( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'topic' AND post_status = 'publish' LIMIT 1", $this->query['post_parent'] ) );
+ if ( $count ) {
+ $r['total'] = $count / bbp_get_topics_per_page();
+ return $r;
+ }
+ }
+
+ // If all else fails...
+ $r['total'] = 10;
+ return $r;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the term for a plugin or theme view from query_var.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_term() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_term() {
+ if ( null !== $this->term ) {
+ return $this->term;
+ }
+
+ $slug = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( get_query_var( Plugin::get_instance()->plugins->query_var() ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = Plugin::get_instance()->plugins->slug();
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = Plugin::get_instance()->plugins->taxonomy();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +100,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = Plugin::get_instance()->themes->slug();
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = Plugin::get_instance()->themes->taxonomy();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = get_term( $slug, $tax );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $slug ) {
+ $term = get_term_by( 'slug', $slug, $tax );
+ } else {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return $term;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>