&$rev_id = null, &$log_id = null, $params = null, RecentChange $rc = null,
User $user = null
) {
- global $wgChangeTagsSchemaMigrationStage;
-
$tagsToAdd = array_filter( (array)$tagsToAdd ); // Make sure we're submitting all tags...
$tagsToRemove = array_filter( (array)$tagsToRemove );
);
}
- // update the tag_summary row
- $prevTags = [];
- if ( !self::updateTagSummaryRow( $tagsToAdd, $tagsToRemove, $rc_id, $rev_id,
- $log_id, $prevTags )
- ) {
- // nothing to do
+ $prevTags = self::getPrevTags( $rc_id, $log_id, $rev_id );
+
+ // add tags
+ $tagsToAdd = array_values( array_diff( $tagsToAdd, $prevTags ) );
+ $newTags = array_unique( array_merge( $prevTags, $tagsToAdd ) );
+
+ // remove tags
+ $tagsToRemove = array_values( array_intersect( $tagsToRemove, $newTags ) );
+ $newTags = array_values( array_diff( $newTags, $tagsToRemove ) );
+
+ sort( $prevTags );
+ sort( $newTags );
+ if ( $prevTags == $newTags ) {
return [ [], [], $prevTags ];
}
$changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
if ( count( $tagsToAdd ) ) {
$changeTagMapping = [];
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) {
- foreach ( $tagsToAdd as $tag ) {
- $changeTagMapping[$tag] = $changeTagDefStore->acquireId( $tag );
- }
- // T207881: update the counts at the end of the transaction
- $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tagsToAdd ) {
- $dbw->update(
- 'change_tag_def',
- [ 'ctd_count = ctd_count + 1' ],
- [ 'ctd_name' => $tagsToAdd ],
- __METHOD__
- );
- } );
+ foreach ( $tagsToAdd as $tag ) {
+ $changeTagMapping[$tag] = $changeTagDefStore->acquireId( $tag );
}
+ $fname = __METHOD__;
+ // T207881: update the counts at the end of the transaction
+ $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tagsToAdd, $fname ) {
+ $dbw->update(
+ 'change_tag_def',
+ [ 'ctd_count = ctd_count + 1' ],
+ [ 'ctd_name' => $tagsToAdd ],
+ $fname
+ );
+ } );
$tagsRows = [];
foreach ( $tagsToAdd as $tag ) {
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $tagName = null;
- } else {
- $tagName = $tag;
- }
// Filter so we don't insert NULLs as zero accidentally.
// Keep in mind that $rc_id === null means "I don't care/know about the
// rc_id, just delete $tag on this revision/log entry". It doesn't
// mean "only delete tags on this revision/log WHERE rc_id IS NULL".
$tagsRows[] = array_filter(
[
- 'ct_tag' => $tagName,
'ct_rc_id' => $rc_id,
'ct_log_id' => $log_id,
'ct_rev_id' => $rev_id,
// delete from change_tag
if ( count( $tagsToRemove ) ) {
+ $fname = __METHOD__;
foreach ( $tagsToRemove as $tag ) {
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $tagName = null;
- $tagId = $changeTagDefStore->getId( $tag );
- } else {
- $tagName = $tag;
- $tagId = null;
- }
$conds = array_filter(
[
- 'ct_tag' => $tagName,
'ct_rc_id' => $rc_id,
'ct_log_id' => $log_id,
'ct_rev_id' => $rev_id,
- 'ct_tag_id' => $tagId,
+ 'ct_tag_id' => $changeTagDefStore->getId( $tag ),
]
);
$dbw->delete( 'change_tag', $conds, __METHOD__ );
- if ( $dbw->affectedRows() && $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) {
+ if ( $dbw->affectedRows() ) {
// T207881: update the counts at the end of the transaction
- $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tag ) {
+ $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw, $tag, $fname ) {
$dbw->update(
'change_tag_def',
[ 'ctd_count = ctd_count - 1' ],
[ 'ctd_name' => $tag ],
- __METHOD__
+ $fname
);
$dbw->delete(
'change_tag_def',
[ 'ctd_name' => $tag, 'ctd_count' => 0, 'ctd_user_defined' => 0 ],
- __METHOD__
+ $fname
);
} );
}
return [ $tagsToAdd, $tagsToRemove, $prevTags ];
}
- /**
- * Adds or removes a given set of tags to/from the relevant row of the
- * tag_summary table. Modifies the tagsToAdd and tagsToRemove arrays to
- * reflect the tags that were actually added and/or removed.
- *
- * @param array &$tagsToAdd
- * @param array &$tagsToRemove If a tag is present in both $tagsToAdd and
- * $tagsToRemove, it will be removed
- * @param int|null $rc_id Null if not known or not applicable
- * @param int|null $rev_id Null if not known or not applicable
- * @param int|null $log_id Null if not known or not applicable
- * @param array &$prevTags Optionally outputs a list of the tags that were
- * in the tag_summary row to begin with
- * @return bool True if any modifications were made, otherwise false
- * @since 1.25
- */
- protected static function updateTagSummaryRow( &$tagsToAdd, &$tagsToRemove,
- $rc_id, $rev_id, $log_id, &$prevTags = []
- ) {
- $dbw = wfGetDB( DB_MASTER );
-
- $tsConds = array_filter( [
- 'ts_rc_id' => $rc_id,
- 'ts_rev_id' => $rev_id,
- 'ts_log_id' => $log_id
- ] );
-
- // Can't both add and remove a tag at the same time...
- $tagsToAdd = array_diff( $tagsToAdd, $tagsToRemove );
-
- // Update the summary row.
- // $prevTags can be out of date on replica DBs, especially when addTags is called consecutively,
- // causing loss of tags added recently in tag_summary table.
- $prevTags = $dbw->selectField( 'tag_summary', 'ts_tags', $tsConds, __METHOD__ );
- $prevTags = $prevTags ?: '';
- $prevTags = array_filter( explode( ',', $prevTags ) );
-
- // add tags
- $tagsToAdd = array_values( array_diff( $tagsToAdd, $prevTags ) );
- $newTags = array_unique( array_merge( $prevTags, $tagsToAdd ) );
-
- // remove tags
- $tagsToRemove = array_values( array_intersect( $tagsToRemove, $newTags ) );
- $newTags = array_values( array_diff( $newTags, $tagsToRemove ) );
-
- sort( $prevTags );
- sort( $newTags );
- if ( $prevTags == $newTags ) {
- return false;
- }
+ private static function getPrevTags( $rc_id = null, $rev_id = null, $log_id = null ) {
+ $conds = array_filter(
+ [
+ 'ct_rc_id' => $rc_id,
+ 'ct_log_id' => $log_id,
+ 'ct_rev_id' => $rev_id,
+ ]
+ );
- if ( !$newTags ) {
- // No tags left, so delete the row altogether
- $dbw->delete( 'tag_summary', $tsConds, __METHOD__ );
- } else {
- // Specify the non-DEFAULT value columns in the INSERT/REPLACE clause
- $row = array_filter( [ 'ts_tags' => implode( ',', $newTags ) ] + $tsConds );
- // Check the unique keys for conflicts, ignoring any NULL *_id values
- $uniqueKeys = [];
- foreach ( [ 'ts_rev_id', 'ts_rc_id', 'ts_log_id' ] as $uniqueColumn ) {
- if ( isset( $row[$uniqueColumn] ) ) {
- $uniqueKeys[] = [ $uniqueColumn ];
- }
- }
+ $dbw = wfGetDB( DB_MASTER );
+ $tagIds = $dbw->selectFieldValues( 'change_tag', 'ct_tag_id', $conds, __METHOD__ );
- $dbw->replace( 'tag_summary', $uniqueKeys, $row, __METHOD__ );
+ $tags = [];
+ foreach ( $tagIds as $tagId ) {
+ $tags[] = MediaWikiServices::getInstance()->getChangeTagDefStore()->getName( (int)$tagId );
}
- return true;
+ return $tags;
}
/**
public static function modifyDisplayQuery( &$tables, &$fields, &$conds,
&$join_conds, &$options, $filter_tag = ''
) {
- global $wgChangeTagsSchemaMigrationStage, $wgUseTagFilter;
+ global $wgUseTagFilter;
// Normalize to arrays
$tables = (array)$tables;
$tables[] = 'change_tag';
$join_conds['change_tag'] = [ 'INNER JOIN', $join_cond ];
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $filterTagIds = [];
- $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
- foreach ( (array)$filter_tag as $filterTagName ) {
- try {
- $filterTagIds[] = $changeTagDefStore->getId( $filterTagName );
- } catch ( NameTableAccessException $exception ) {
- // Return nothing.
- $conds[] = '0';
- break;
- };
- }
+ $filterTagIds = [];
+ $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
+ foreach ( (array)$filter_tag as $filterTagName ) {
+ try {
+ $filterTagIds[] = $changeTagDefStore->getId( $filterTagName );
+ } catch ( NameTableAccessException $exception ) {
+ // Return nothing.
+ $conds[] = '0';
+ break;
+ };
+ }
- if ( $filterTagIds !== [] ) {
- $conds['ct_tag_id'] = $filterTagIds;
- }
- } else {
- $conds['ct_tag'] = $filter_tag;
+ if ( $filterTagIds !== [] ) {
+ $conds['ct_tag_id'] = $filterTagIds;
}
if (
* @throws MWException When unable to determine appropriate JOIN condition for tagging
*/
public static function makeTagSummarySubquery( $tables ) {
- global $wgChangeTagsSchemaMigrationStage;
-
// Normalize to arrays
$tables = (array)$tables;
throw new MWException( 'Unable to determine appropriate JOIN condition for tagging.' );
}
- $tagTables[] = 'change_tag';
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $tagTables[] = 'change_tag_def';
- $join_cond_ts_tags = [ 'change_tag_def' => [ 'INNER JOIN', 'ct_tag_id=ctd_id' ] ];
- $field = 'ctd_name';
- } else {
- $field = 'ct_tag';
- $join_cond_ts_tags = [];
- }
+ $tagTables = [ 'change_tag', 'change_tag_def' ];
+ $join_cond_ts_tags = [ 'change_tag_def' => [ 'INNER JOIN', 'ct_tag_id=ctd_id' ] ];
+ $field = 'ctd_name';
return wfGetDB( DB_REPLICA )->buildGroupConcatField(
',', $tagTables, $field, $join_cond, $join_cond_ts_tags
}
/**
- * Defines a tag in the valid_tag table and/or update ctd_user_defined field in change_tag_def,
- * without checking that the tag name is valid.
+ * Set ctd_user_defined = 1 in change_tag_def without checking that the tag name is valid.
* Extensions should NOT use this function; they can use the ListDefinedTags
* hook instead.
*
* @since 1.25
*/
public static function defineTag( $tag ) {
- global $wgChangeTagsSchemaMigrationStage;
-
$dbw = wfGetDB( DB_MASTER );
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) {
- $tagDef = [
- 'ctd_name' => $tag,
- 'ctd_user_defined' => 1,
- 'ctd_count' => 0
- ];
- $dbw->upsert(
- 'change_tag_def',
- $tagDef,
- [ 'ctd_name' ],
- [ 'ctd_user_defined' => 1 ],
- __METHOD__
- );
- }
+ $tagDef = [
+ 'ctd_name' => $tag,
+ 'ctd_user_defined' => 1,
+ 'ctd_count' => 0
+ ];
+ $dbw->upsert(
+ 'change_tag_def',
+ $tagDef,
+ [ 'ctd_name' ],
+ [ 'ctd_user_defined' => 1 ],
+ __METHOD__
+ );
- if ( $wgChangeTagsSchemaMigrationStage < MIGRATION_NEW ) {
- $dbw->replace(
- 'valid_tag',
- [ 'vt_tag' ],
- [ 'vt_tag' => $tag ],
- __METHOD__
- );
- }
// clear the memcache of defined tags
self::purgeTagCacheAll();
}
/**
- * Removes a tag from the valid_tag table and/or update ctd_user_defined field in change_tag_def.
+ * Update ctd_user_defined = 0 field in change_tag_def.
* The tag may remain in use by extensions, and may still show up as 'defined'
* if an extension is setting it from the ListDefinedTags hook.
*
* @since 1.25
*/
public static function undefineTag( $tag ) {
- global $wgChangeTagsSchemaMigrationStage;
-
$dbw = wfGetDB( DB_MASTER );
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) {
- $dbw->update(
- 'change_tag_def',
- [ 'ctd_user_defined' => 0 ],
- [ 'ctd_name' => $tag ],
- __METHOD__
- );
-
- $dbw->delete(
- 'change_tag_def',
- [ 'ctd_name' => $tag, 'ctd_count' => 0 ],
- __METHOD__
- );
- }
+ $dbw->update(
+ 'change_tag_def',
+ [ 'ctd_user_defined' => 0 ],
+ [ 'ctd_name' => $tag ],
+ __METHOD__
+ );
- if ( $wgChangeTagsSchemaMigrationStage < MIGRATION_NEW ) {
- $dbw->delete( 'valid_tag', [ 'vt_tag' => $tag ], __METHOD__ );
- }
+ $dbw->delete(
+ 'change_tag_def',
+ [ 'ctd_name' => $tag, 'ctd_count' => 0 ],
+ __METHOD__
+ );
// clear the memcache of defined tags
self::purgeTagCacheAll();
return Status::newFatal( 'tags-create-no-name' );
}
- // tags cannot contain commas (used as a delimiter in tag_summary table),
+ // tags cannot contain commas (used to be used as a delimiter in tag_summary table),
// pipe (used as a delimiter between multiple tags in
// SpecialRecentchanges and friends), or slashes (would break tag description messages in
// MediaWiki namespace)
}
/**
- * Creates a tag by adding a row to the `valid_tag` table.
- * and/or add it to `change_tag_def` table.
+ * Creates a tag by adding it to `change_tag_def` table.
*
* Extensions should NOT use this function; they can use the ListDefinedTags
* hook instead.
* @since 1.25
*/
public static function deleteTagEverywhere( $tag ) {
- global $wgChangeTagsSchemaMigrationStage;
$dbw = wfGetDB( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
- // delete from valid_tag and/or set ctd_user_defined = 0
+ // set ctd_user_defined = 0
self::undefineTag( $tag );
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $tagId = MediaWikiServices::getInstance()->getChangeTagDefStore()->getId( $tag );
- $conditions = [ 'ct_tag_id' => $tagId ];
- } else {
- $conditions = [ 'ct_tag' => $tag ];
- }
-
- // find out which revisions use this tag, so we can delete from tag_summary
- $result = $dbw->select( 'change_tag',
- [ 'ct_rc_id', 'ct_log_id', 'ct_rev_id' ],
- $conditions,
- __METHOD__ );
- foreach ( $result as $row ) {
- // remove the tag from the relevant row of tag_summary
- $tagsToAdd = [];
- $tagsToRemove = [ $tag ];
- self::updateTagSummaryRow( $tagsToAdd, $tagsToRemove, $row->ct_rc_id,
- $row->ct_rev_id, $row->ct_log_id );
- }
-
// delete from change_tag
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $tagId = MediaWikiServices::getInstance()->getChangeTagDefStore()->getId( $tag );
- $dbw->delete( 'change_tag', [ 'ct_tag_id' => $tagId ], __METHOD__ );
- } else {
- $dbw->delete( 'change_tag', [ 'ct_tag' => $tag ], __METHOD__ );
- }
-
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_OLD ) {
- $dbw->delete( 'change_tag_def', [ 'ctd_name' => $tag ], __METHOD__ );
- }
-
+ $tagId = MediaWikiServices::getInstance()->getChangeTagDefStore()->getId( $tag );
+ $dbw->delete( 'change_tag', [ 'ct_tag_id' => $tagId ], __METHOD__ );
+ $dbw->delete( 'change_tag_def', [ 'ctd_name' => $tag ], __METHOD__ );
$dbw->endAtomic( __METHOD__ );
// give extensions a chance
}
/**
- * Lists tags explicitly defined in the `valid_tag` table of the database.
- * Tags in table 'change_tag' which are not in table 'valid_tag' are not
- * included. In case of new backend loads the data from `change_tag_def` table.
+ * Lists tags explicitly defined in the `change_tag_def` table of the database.
*
* Tries memcached first.
*
$cache->makeKey( 'valid-tags-db' ),
WANObjectCache::TTL_MINUTE * 5,
function ( $oldValue, &$ttl, array &$setOpts ) use ( $fname ) {
- global $wgChangeTagsSchemaMigrationStage;
$dbr = wfGetDB( DB_REPLICA );
$setOpts += Database::getCacheSetOptions( $dbr );
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- $tags = self::listExplicitlyDefinedTagsNewBackend();
- } else {
- $tags = $dbr->selectFieldValues( 'valid_tag', 'vt_tag', [], $fname );
- }
+ $tags = $dbr->selectFieldValues(
+ 'change_tag_def',
+ 'ctd_name',
+ [ 'ctd_user_defined' => 1 ],
+ $fname
+ );
return array_filter( array_unique( $tags ) );
},
);
}
- /**
- * Lists tags explicitly user defined tags. When ctd_user_defined is true.
- *
- * @return string[] Array of strings: tags
- * @since 1.25
- */
- private static function listExplicitlyDefinedTagsNewBackend() {
- $dbr = wfGetDB( DB_REPLICA );
- return $dbr->selectFieldValues(
- 'change_tag_def',
- 'ctd_name',
- [ 'ctd_user_defined' => 1 ],
- __METHOD__
- );
- }
-
/**
* Lists tags defined by core or extensions using the ListDefinedTags hook.
* Extensions need only define those tags they deem to be in active use.
$cache->touchCheckKey( $cache->makeKey( 'valid-tags-db' ) );
$cache->touchCheckKey( $cache->makeKey( 'valid-tags-hook' ) );
+ MediaWikiServices::getInstance()->getChangeTagDefStore()->reloadMap();
+
self::purgeTagUsageCache();
}
* Returns a map of any tags used on the wiki to number of edits
* tagged with them, ordered descending by the hitcount.
* This does not include tags defined somewhere that have never been applied.
- *
- * Keeps a short-term cache in memory, so calling this multiple times in the
- * same request should be fine.
- *
* @return array Array of string => int
*/
public static function tagUsageStatistics() {
- global $wgChangeTagsSchemaMigrationStage;
- if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
- return self::newTagUsageStatistics();
- }
-
- $fname = __METHOD__;
- $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
- return $cache->getWithSetCallback(
- $cache->makeKey( 'change-tag-statistics' ),
- WANObjectCache::TTL_MINUTE * 5,
- function ( $oldValue, &$ttl, array &$setOpts ) use ( $fname ) {
- $dbr = wfGetDB( DB_REPLICA, 'vslow' );
-
- $setOpts += Database::getCacheSetOptions( $dbr );
-
- $res = $dbr->select(
- 'change_tag',
- [ 'ct_tag', 'hitcount' => 'count(*)' ],
- [],
- $fname,
- [ 'GROUP BY' => 'ct_tag', 'ORDER BY' => 'hitcount DESC' ]
- );
-
- $out = [];
- foreach ( $res as $row ) {
- $out[$row->ct_tag] = $row->hitcount;
- }
-
- return $out;
- },
- [
- 'checkKeys' => [ $cache->makeKey( 'change-tag-statistics' ) ],
- 'lockTSE' => WANObjectCache::TTL_MINUTE * 5,
- 'pcTTL' => WANObjectCache::TTL_PROC_LONG
- ]
- );
- }
-
- /**
- * Same self::tagUsageStatistics() but uses change_tag_def.
- *
- * @return array Array of string => int
- */
- private static function newTagUsageStatistics() {
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
'change_tag_def',
dépôts / lhc / web / wiklou.git / blobdiff