}
$dbw = wfGetDB( DB_MASTER );
-
// Use a named lock so that jobs for this page see each others' changes
$lockKey = "CategoryMembershipUpdates:{$page->getId()}";
$scopedLock = $dbw->getScopedLockAndFlush( $lockKey, __METHOD__, 10 );
return false;
}
- $cutoffUnix = wfTimestamp( TS_UNIX, $this->params['revTimestamp'] );
- // Using ENQUEUE_FUDGE_SEC handles jobs inserted out of revision order due to the delay
- // between COMMIT and actual enqueueing of the CategoryMembershipChangeJob job.
- $cutoffUnix -= self::ENQUEUE_FUDGE_SEC;
-
- $dbr = wfGetDB( DB_SLAVE, array( 'recentchanges' ) );
- if ( !wfGetLB()->safeWaitForPos( $dbr ) ) {
+ $dbr = wfGetDB( DB_SLAVE, [ 'recentchanges' ] );
+ // Wait till the slave is caught up so that jobs for this page see each others' changes
+ if ( !wfGetLB()->safeWaitForMasterPos( $dbr ) ) {
$this->setLastError( "Timed out while waiting for slave to catch up" );
return false;
}
+ // Clear any stale REPEATABLE-READ snapshot
+ wfGetLBFactory()->commitAll( __METHOD__ );
- $dbr->commit( __METHOD__, 'flush' );
+ $cutoffUnix = wfTimestamp( TS_UNIX, $this->params['revTimestamp'] );
+ // Using ENQUEUE_FUDGE_SEC handles jobs inserted out of revision order due to the delay
+ // between COMMIT and actual enqueueing of the CategoryMembershipChangeJob job.
+ $cutoffUnix -= self::ENQUEUE_FUDGE_SEC;
// Get the newest revision that has a SRC_CATEGORIZE row...
$row = $dbr->selectRow(
- array( 'revision', 'recentchanges' ),
- array( 'rev_timestamp', 'rev_id' ),
- array(
+ [ 'revision', 'recentchanges' ],
+ [ 'rev_timestamp', 'rev_id' ],
+ [
'rev_page' => $page->getId(),
'rev_timestamp >= ' . $dbr->addQuotes( $dbr->timestamp( $cutoffUnix ) )
- ),
+ ],
__METHOD__,
- array( 'ORDER BY' => 'rev_timestamp DESC, rev_id DESC' ),
- array(
- 'recentchanges' => array(
+ [ 'ORDER BY' => 'rev_timestamp DESC, rev_id DESC' ],
+ [
+ 'recentchanges' => [
'INNER JOIN',
- array(
+ [
'rc_this_oldid = rev_id',
'rc_source' => RecentChange::SRC_CATEGORIZE,
// Allow rc_cur_id or rc_timestamp index usage
'rc_cur_id = rev_page',
'rc_timestamp >= rev_timestamp'
- )
- )
- )
+ ]
+ ]
+ ]
);
// Only consider revisions newer than any such revision
if ( $row ) {
$res = $dbr->select(
'revision',
Revision::selectFields(),
- array(
+ [
'rev_page' => $page->getId(),
"rev_timestamp > $encCutoff" .
" OR (rev_timestamp = $encCutoff AND rev_id > $lastRevId)"
- ),
+ ],
__METHOD__,
- array( 'ORDER BY' => 'rev_timestamp ASC, rev_id ASC' )
+ [ 'ORDER BY' => 'rev_timestamp ASC, rev_id ASC' ]
);
// Apply all category updates in revision timestamp order
}
$dbw = wfGetDB( DB_MASTER );
+ $factory = wfGetLBFactory();
+ $ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
+
$catMembChange = new CategoryMembershipChange( $title, $newRev );
$catMembChange->checkTemplateLinks();
$categoryTitle = Title::makeTitle( NS_CATEGORY, $categoryName );
$catMembChange->triggerCategoryAddedNotification( $categoryTitle );
if ( $insertCount++ && ( $insertCount % $batchSize ) == 0 ) {
- $dbw->commit( __METHOD__, 'flush' );
- wfGetLBFactory()->waitForReplication();
+ $factory->commitAndWaitForReplication( __METHOD__, $ticket );
}
}
$categoryTitle = Title::makeTitle( NS_CATEGORY, $categoryName );
$catMembChange->triggerCategoryRemovedNotification( $categoryTitle );
if ( $insertCount++ && ( $insertCount++ % $batchSize ) == 0 ) {
- $dbw->commit( __METHOD__, 'flush' );
- wfGetLBFactory()->waitForReplication();
+ $factory->commitAndWaitForReplication( __METHOD__, $ticket );
}
}
}
// up to date, neither of which are true.
$oldCategories = $oldRev
? $this->getCategoriesAtRev( $title, $oldRev, $parseTimestamp )
- : array();
+ : [];
// Parse the new revision and get the categories
$newCategories = $this->getCategoriesAtRev( $title, $newRev, $parseTimestamp );
$categoryInserts = array_values( array_diff( $newCategories, $oldCategories ) );
$categoryDeletes = array_values( array_diff( $oldCategories, $newCategories ) );
- return array( $categoryInserts, $categoryDeletes );
+ return [ $categoryInserts, $categoryDeletes ];
}
/**