<!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>[3903] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums: Support Forums: Improve performance.</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/3903">3903</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/3903","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-09-01 03:15:59 +0000 (Thu, 01 Sep 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: Improve performance.
Use fuzzy numbers for forum totals, as these are constantly changing.
Bound views by the last six months of posts. This can be adjusted later not performant enough.</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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumssupportforumsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/support-forums.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-09-01 03:00:35 UTC (rev 3902)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-performance-optimizations.php 2016-09-01 03:15:59 UTC (rev 3903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,6 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var $term = null;
</span><span class="cx" style="display: block; padding: 0 10px"> var $query = null;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $bound_id = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,15 +44,22 @@
</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><del style="background-color: #fdd; 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';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $r['meta_key'] ) ) {
+ // has_topics() uses this by default.
+ if ( '_bbp_last_active_time' == $r['meta_key'] ) {
+ unset( $r['meta_key'] );
+ unset( $r['meta_type'] );
+ $r['orderby'] = 'ID';
+ // Some views use meta key lookups and should only look at known
+ // open topics.
+ } elseif ( ! empty( $r['meta_key'] ) ) {
+ $r['orderby'] = 'ID';
+ add_filter( 'posts_where', array( $this, 'posts_in_six_months' ) );
+ }
</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"> // If this is a forum, limit the number of pages we're dealing with.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $r['post_parent'] ) && get_post_type( $r['post_parent'] ) === bbp_get_forum_post_type() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bbp_is_single_forum() && isset( $r['post_parent'] ) && get_post_type( $r['post_parent'] ) === bbp_get_forum_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['no_found_rows'] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_topic_pagination', array( $this, 'forum_pagination' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query = $r;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +68,14 @@
</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 posts_in_last_six_months( $w ) {
+ global $wpdb;
+
+ $bound_id = $this->get_bound_id( '6 MONTH' );
+ $w .= $wpdb->prepare( " AND ( $wpdb->posts.ID >= %d )", $bound_id );
+ return $w;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function forum_pagination( $r ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,14 +88,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try SQL.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $this->query ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'topic' AND post_status IN ( 'publish', 'closed' ) LIMIT 1", $this->query['post_parent'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['total'] = $count / bbp_get_topics_per_page();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $this->query['post_parent'], '_bbp_topic_count', $count );
+ update_post_meta( $this->query['post_parent'], '_bbp_total_topic_count', $count );
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If all else fails...
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Give a reasonable default to fall back on.
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['total'] = 10;
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,4 +125,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $term;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Get the ID from a topic one year ago so that we can only look at topics
+ * after that ID.
+ */
+ public function get_bound_id( $interval ) {
+ global $wpdb;
+
+ if ( ! in_array( $interval, array( '1 WEEK', '1 MONTH', '6 MONTH', '1 YEAR' ) ) ) {
+ $interval = '1 WEEK';
+ }
+
+ if ( array_key_exists( $interval, $this->bound_id ) ) {
+ return $this->bound_id[ $interval ];
+ }
+
+ // Check cache.
+ $cache_key = str_replace( ' ', '-', $interval );
+ $cache_group = 'topic-bound-ids';
+ $bound_id = wp_cache_get( $cache_key, $cache_group );
+ if ( false === $bound_id ) {
+
+ // Use the type_status_date index.
+ $bound_id = $wpdb->get_var( "
+ SELECT `ID`
+ FROM $wpdb->posts
+ WHERE post_type = 'topic'
+ AND post_status IN ( 'publish', 'closed' )
+ AND post_date < DATE_SUB( NOW(), INTERVAL $interval )
+ ORDER BY `ID` DESC
+ LIMIT 1 " );
+ // Set the bound id to 1 if there is not a suitable range.
+ if ( ! $bound_id ) {
+ $bound_id = 1;
+ }
+ $this->bound_id[ $interval ] = $bound_id;
+
+ wp_cache_set( $cache_key, $bound_id, $cache_group, 86400 );
+ }
+ return $bound_id;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasspluginphp"></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-plugin.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-plugin.php 2016-09-01 03:00:35 UTC (rev 3902)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin.php 2016-09-01 03:15:59 UTC (rev 3903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,10 +34,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->performance = new Performance_Optimizations;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->users = new Users;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->hooks = new Hooks;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These modifications are specific to https://wordpress.org/support/
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $blog_id && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID == $blog_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->dropin = new Dropin;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->themes = new Theme_Directory_Compat;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plugins = new Plugin_Directory_Compat;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumssupportforumsphp"></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/support-forums.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/support-forums.php 2016-09-01 03:00:35 UTC (rev 3902)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/support-forums.php 2016-09-01 03:15:59 UTC (rev 3903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Includes
</span><span class="cx" style="display: block; padding: 0 10px"> include( dirname( __FILE__ ) . '/inc/class-plugin.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> include( dirname( __FILE__ ) . '/inc/class-users.php' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+include( dirname( __FILE__ ) . '/inc/class-dropin.php' );
+include( dirname( __FILE__ ) . '/inc/class-hooks.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> include( dirname( __FILE__ ) . '/inc/class-directory-compat.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> include( dirname( __FILE__ ) . '/inc/class-theme-directory-compat.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> include( dirname( __FILE__ ) . '/inc/class-plugin-directory-compat.php' );
</span></span></pre>
</div>
</div>
</body>
</html>