<!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>[BuddyPress][8333] trunk: When migrating last_activity data, clear all data to avoid duplicates</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8333">8333</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-04-30 19:22:59 +0000 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When migrating last_activity data, clear all data to avoid duplicates
Previously, duplicates were avoided with a NOT IN subquery. But this caused
load problems on large installations, where the subquery would return
many thousands of results.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5572">#5572</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkteststestcasesmembersfunctionsphp">trunk/tests/testcases/members/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (8332 => 8333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2014-04-30 17:22:22 UTC (rev 8332)
+++ trunk/bp-members/bp-members-functions.php 2014-04-30 19:22:59 UTC (rev 8333)
</span><span class="lines">@@ -1036,18 +1036,16 @@
</span><span class="cx">
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><del>- // The "NOT IN" clause prevents duplicates
</del><ins>+ // Wipe out existing last_activity data in the activity table -
+ // this helps to prevent duplicates when pulling from the usermeta
+ // table
+ $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->members->table_name_last_activity} WHERE component = %s AND type = 'last_activity'", $bp->members->id ) );
+
</ins><span class="cx"> $sql = "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `action`, `content`, `primary_link`, `item_id`, `date_recorded` ) (
</span><span class="cx"> SELECT user_id, '{$bp->members->id}' as component, 'last_activity' as type, '' as action, '' as content, '' as primary_link, 0 as item_id, meta_value AS date_recorded
</span><span class="cx"> FROM {$wpdb->usermeta}
</span><span class="cx"> WHERE
</span><span class="cx"> meta_key = 'last_activity'
</span><del>- AND
- user_id NOT IN (
- SELECT user_id
- FROM {$bp->members->table_name_last_activity}
- WHERE component = '{$bp->members->id}' AND type = 'last_activity'
- )
</del><span class="cx"> );";
</span><span class="cx">
</span><span class="cx"> return $wpdb->query( $sql );
</span></span></pre></div>
<a id="trunkteststestcasesmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/members/functions.php (8332 => 8333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/members/functions.php 2014-04-30 17:22:22 UTC (rev 8332)
+++ trunk/tests/testcases/members/functions.php 2014-04-30 19:22:59 UTC (rev 8333)
</span><span class="lines">@@ -353,4 +353,50 @@
</span><span class="cx"> $found_email = isset( $found['signups'][0]->user_email ) ? $found['signups'][0]->user_email : '';
</span><span class="cx"> $this->assertSame( $u_obj->user_email, $found_email );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group bp_last_activity_migrate
+ * @expectedIncorrectUsage update_user_meta( $user_id, 'last_activity' )
+ * @expectedIncorrectUsage get_user_meta( $user_id, 'last_activity' )
+ */
+ public function test_bp_last_activity_migrate() {
+ // We explicitly do not want last_activity created, so use the
+ // WP factory methods
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+ $u3 = $this->factory->user->create();
+
+ $time = time();
+ $t1 = date( 'Y-m-d H:i:s', $time - 50 );
+ $t2 = date( 'Y-m-d H:i:s', $time - 500 );
+ $t3 = date( 'Y-m-d H:i:s', $time - 5000 );
+
+ update_user_meta( $u1, 'last_activity', $t1 );
+ update_user_meta( $u2, 'last_activity', $t2 );
+ update_user_meta( $u3, 'last_activity', $t3 );
+
+ // Create an existing entry in last_activity to test no dupes
+ global $wpdb, $bp;
+ $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `action`, `content`, `primary_link`, `item_id`, `date_recorded` ) VALUES ( %d, %s, %s, %s, %s, %s, %d, %s )", $u2, $bp->members->id, 'last_activity', '', '', 0, $t1 ) );
+
+ bp_last_activity_migrate();
+
+ $expected = array(
+ $u1 => $t1,
+ $u2 => $t2,
+ $u3 => $t3,
+ );
+
+ $found = array(
+ $u1 => '',
+ $u2 => '',
+ $u3 => '',
+ );
+
+ foreach ( $found as $uid => $v ) {
+ $found[ $uid ] = bp_get_user_last_activity( $uid );
+ }
+
+ $this->assertSame( $expected, $found );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>