*
* @since 1.25
*/
- public static function updateTags( $tagsToAdd, $tagsToRemove, &$rc_id = null,
- &$rev_id = null, &$log_id = null, $params = null ) {
+ public static function updateTags(
+ $tagsToAdd, $tagsToRemove,
+ &$rc_id = null, &$rev_id = null, &$log_id = null, $params = null
+ ) {
$tagsToAdd = array_filter( (array)$tagsToAdd ); // Make sure we're submitting all tags...
$tagsToRemove = array_filter( (array)$tagsToRemove );
// Might as well look for rcids and so on.
if ( !$rc_id ) {
// Info might be out of date, somewhat fractionally, on slave.
+ // LogEntry/LogPage and WikiPage match rev/log/rc timestamps,
+ // so use that relation to avoid full table scans.
if ( $log_id ) {
$rc_id = $dbw->selectField(
- 'recentchanges',
+ array( 'logging', 'recentchanges' ),
'rc_id',
- array( 'rc_logid' => $log_id ),
+ array(
+ 'log_id' => $log_id,
+ 'rc_timestamp = log_timestamp',
+ 'rc_logid = log_id'
+ ),
__METHOD__
);
} elseif ( $rev_id ) {
$rc_id = $dbw->selectField(
- 'recentchanges',
+ array( 'revision', 'recentchanges' ),
'rc_id',
- array( 'rc_this_oldid' => $rev_id ),
+ array(
+ 'rev_id' => $rev_id,
+ 'rc_timestamp = rev_timestamp',
+ 'rc_this_oldid = rev_id'
+ ),
__METHOD__
);
}
* @param string $selected Tag to select by default
* @param bool $fullForm Affects return value, see below
* @param Title $title Title object to send the form to. Used only if $fullForm is true.
+ * @param bool $ooui Use an OOUI TextInputWidget as selector instead of a non-OOUI input field
+ * You need to call OutputPage::enableOOUI() yourself.
* @return string|array
* - if $fullForm is false: an array of (label, selector).
* - if $fullForm is true: HTML of entire form built around the selector.
*/
public static function buildTagFilterSelector( $selected = '',
- $fullForm = false, Title $title = null
+ $fullForm = false, Title $title = null, $ooui = false
) {
global $wgUseTagFilter;
'label',
array( 'for' => 'tagfilter' ),
wfMessage( 'tag-filter' )->parse()
- ),
- Xml::input(
+ )
+ );
+
+ if ( $ooui ) {
+ $data[] = new OOUI\TextInputWidget( array(
+ 'id' => 'tagfilter',
+ 'name' => 'tagfilter',
+ 'value' => $selected,
+ 'classes' => 'mw-tagfilter-input',
+ ) );
+ } else {
+ $data[] = Xml::input(
'tagfilter',
20,
$selected,
array( 'class' => 'mw-tagfilter-input mw-ui-input mw-ui-input-inline', 'id' => 'tagfilter' )
- )
- );
+ );
+ }
if ( !$fullForm ) {
return $data;
public static function listExtensionActivatedTags() {
return ObjectCache::getMainWANInstance()->getWithSetCallback(
wfMemcKey( 'active-tags' ),
- function() {
+ 300,
+ function ( $oldValue, &$ttl, array &$setOpts ) {
+ $setOpts += Database::getCacheSetOptions( wfGetDB( DB_SLAVE ) );
+
// Ask extensions which tags they consider active
$extensionActive = array();
Hooks::run( 'ChangeTagsListActive', array( &$extensionActive ) );
return $extensionActive;
},
- 300,
- array( wfMemcKey( 'active-tags' ) ),
- array( 'lockTSE' => INF )
+ array(
+ 'checkKeys' => array( wfMemcKey( 'active-tags' ) ),
+ 'lockTSE' => 300,
+ 'pcTTL' => 30
+ )
);
}
return ObjectCache::getMainWANInstance()->getWithSetCallback(
wfMemcKey( 'valid-tags-db' ),
- function() use ( $fname ) {
+ 300,
+ function ( $oldValue, &$ttl, array &$setOpts ) use ( $fname ) {
$dbr = wfGetDB( DB_SLAVE );
- $tags = $dbr->selectFieldValues(
- 'valid_tag', 'vt_tag', array(), $fname );
+
+ $setOpts += Database::getCacheSetOptions( $dbr );
+
+ $tags = $dbr->selectFieldValues( 'valid_tag', 'vt_tag', array(), $fname );
return array_filter( array_unique( $tags ) );
},
- 300,
- array( wfMemcKey( 'valid-tags-db' ) ),
- array( 'lockTSE' => INF )
+ array(
+ 'checkKeys' => array( wfMemcKey( 'valid-tags-db' ) ),
+ 'lockTSE' => 300,
+ 'pcTTL' => 30
+ )
);
}
public static function listExtensionDefinedTags() {
return ObjectCache::getMainWANInstance()->getWithSetCallback(
wfMemcKey( 'valid-tags-hook' ),
- function() {
+ 300,
+ function ( $oldValue, &$ttl, array &$setOpts ) {
+ $setOpts += Database::getCacheSetOptions( wfGetDB( DB_SLAVE ) );
+
$tags = array();
Hooks::run( 'ListDefinedTags', array( &$tags ) );
return array_filter( array_unique( $tags ) );
},
- 300,
- array( wfMemcKey( 'valid-tags-hook' ) ),
- array( 'lockTSE' => INF )
+ array(
+ 'checkKeys' => array( wfMemcKey( 'valid-tags-hook' ) ),
+ 'lockTSE' => 300,
+ 'pcTTL' => 30
+ )
);
}
* @return array Array of string => int
*/
public static function tagUsageStatistics() {
- static $cachedStats = null;
-
- // Process cache to avoid I/O and repeated regens during holdoff
- if ( $cachedStats !== null ) {
- return $cachedStats;
- }
-
$fname = __METHOD__;
- $cachedStats = ObjectCache::getMainWANInstance()->getWithSetCallback(
+ return ObjectCache::getMainWANInstance()->getWithSetCallback(
wfMemcKey( 'change-tag-statistics' ),
- function() use ( $fname ) {
- $out = array();
-
+ 300,
+ function ( $oldValue, &$ttl, array &$setOpts ) use ( $fname ) {
$dbr = wfGetDB( DB_SLAVE, 'vslow' );
+
+ $setOpts += Database::getCacheSetOptions( $dbr );
+
$res = $dbr->select(
'change_tag',
array( 'ct_tag', 'hitcount' => 'count(*)' ),
array( 'GROUP BY' => 'ct_tag', 'ORDER BY' => 'hitcount DESC' )
);
+ $out = array();
foreach ( $res as $row ) {
$out[$row->ct_tag] = $row->hitcount;
}
return $out;
},
- 300,
- array( wfMemcKey( 'change-tag-statistics' ) ),
- array( 'lockTSE' => INF )
+ array(
+ 'checkKeys' => array( wfMemcKey( 'change-tag-statistics' ) ),
+ 'lockTSE' => 300,
+ 'pcTTL' => 30
+ )
);
-
- return $cachedStats;
}
/**
dépôts / lhc / web / wiklou.git / blobdiff