wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 23:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Implement backfillUnreadWikis.php in terms of resetNotificationCount()"

Browse source 
Better idea: invalidate caches in this script, and write
a separate script to recompute existing euw rows.

This reverts commit c83af257d2.

Change-Id: I57bccfb726eada646cb318206d9091a20d59dcf5
This commit is contained in:
Catrope 2016-06-17 13:43:22 +00:00
parent 74917b8fae
commit 2771b94af7
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/NotifUser.php
View file

@ -454,9 +454,8 @@ class MWEchoNotifUser {
/**
* Recalculates the number of notifications that a user has.
* @param $dbSource int use master or slave database to pull count
* @param $deferUpdate bool Whether to defer the update to the echo_unread_wikis table
*/
public function resetNotificationCount( $dbSource = DB_SLAVE, $deferUpdate = true ) {
public function resetNotificationCount( $dbSource = DB_SLAVE ) {
global $wgEchoCrossWikiNotifications;
// Reset alert and message counts, and store them for later
$alertCount = $this->getNotificationCount( false, $dbSource, EchoAttributeManager::ALERT, false );
@ -506,17 +505,12 @@ class MWEchoNotifUser {
// Schedule an update to the echo_unread_wikis table
$user = $this->mUser;
$updateCallback = function () use ( $user, $alertCount, $alertUnread, $msgCount, $msgUnread ) {
DeferredUpdates::addCallableUpdate( function () use ( $user, $alertCount, $alertUnread, $msgCount, $msgUnread ) {
$uw = EchoUnreadWikis::newFromUser( $user );
if ( $uw ) {
$uw->updateCount( wfWikiID(), $alertCount, $alertUnread, $msgCount, $msgUnread );
}
};
if ( $deferUpdate ) {
DeferredUpdates::addCallableUpdate( $updateCallback );
} else {
$updateCallback();
}
} );
}
$this->invalidateCache();

13
maintenance/backfillUnreadWikis.php
View file

@ -10,7 +10,7 @@ class BackfillUnreadWikis extends Maintenance {
public function __construct() {
parent::__construct();
$this->mDescription = "Backfill echo_unread_wikis table and recache notification counts for all users";
$this->mDescription = "Backfill echo_unread_wikis table";
$this->setBatchSize( 300 );
}
@ -28,7 +28,16 @@ class BackfillUnreadWikis extends Maintenance {
$user = User::newFromRow( $row );
$notifUser = MWEchoNotifUser::newFromUser( $user );
$notifUser->resetNotificationCount( DB_SLAVE, false );
$uw = EchoUnreadWikis::newFromUser( $user );
if ( $uw ) {
$alertCount = $notifUser->getNotificationCount( false, DB_SLAVE, EchoAttributeManager::ALERT, false );
$alertUnread = $notifUser->getLastUnreadNotificationTime( false, DB_SLAVE, EchoAttributeManager::ALERT, false );
$msgCount = $notifUser->getNotificationCount( false, DB_SLAVE, EchoAttributeManager::MESSAGE, false );
$msgUnread = $notifUser->getLastUnreadNotificationTime( false, DB_SLAVE, EchoAttributeManager::MESSAGE, false );
$uw->updateCount( wfWikiID(), $alertCount, $alertUnread, $msgCount, $msgUnread );
}
}
$processed += count( $batch );