var $mId, //!< Page ID of the article linked from
$mTitle, //!< Title object of the article linked from
$mLinks, //!< Map of title strings to IDs for the links in the document
- $mExistingLinks,
$mImages, //!< DB keys of the images used, in the array key only
- $mExistingImages,
$mTemplates, //!< Map of title strings to IDs for the template references, including broken ones
- $mExistingTemplates,
$mExternals, //!< URLs of external links, array key only
- $mExistingExternals,
$mCategories, //!< Map of category names to sort keys
- $mExistingCategories,
$mInterlangs, //!< Map of language codes to titles
- $mExistingInterlangs,
$mProperties, //!< Map of arbitrary name to value
- $mExistingProperties,
$mDb, //!< Database connection reference
$mOptions, //!< SELECT options to be used (array)
$mRecursive; //!< Whether to queue jobs for recursive updates
/**
* Constructor
*
- * @param Title $title Title of the page we're updating
- * @param ParserOutput $parserOutput Output from a full parse of this page
- * @param bool $recursive Queue jobs for recursive updates?
+ * @param $title Title of the page we're updating
+ * @param $parserOutput ParserOutput: output from a full parse of this page
+ * @param $recursive Boolean: queue jobs for recursive updates?
*/
- function LinksUpdate( $title, $parserOutput, $recursive = true ) {
+ function __construct( $title, $parserOutput, $recursive = true ) {
global $wgAntiLockFlags;
if ( $wgAntiLockFlags & ALF_NO_LINK_LOCK ) {
$this->mExternals = $parserOutput->getExternalLinks();
$this->mCategories = $parserOutput->getCategories();
$this->mProperties = $parserOutput->getProperties();
+ $this->mInterwikis = $parserOutput->getInterwikiLinks();
# Convert the format of the interlanguage links
# I didn't want to change it in the ParserOutput, because that array is passed all
$this->mInterlangs[$key] = $title;
}
+ foreach ( $this->mCategories as $cat => &$sortkey ) {
+ # If the sortkey is longer then 255 bytes,
+ # it truncated by DB, and then doesn't get
+ # matched when comparing existing vs current
+ # categories, causing bug 25254.
+ $sortkey = substr( $sortkey, 0, 255 );
+ }
+
$this->mRecursive = $recursive;
wfRunHooks( 'LinksUpdateConstructed', array( &$this ) );
/**
* Update link tables with outgoing links from an updated article
*/
- function doUpdate() {
- global $wgUseDumbLinkUpdate, $wgTrackLinkChanges;
+ public function doUpdate() {
+ global $wgUseDumbLinkUpdate;
wfRunHooks( 'LinksUpdate', array( &$this ) );
if ( $wgUseDumbLinkUpdate ) {
} else {
$this->doIncrementalUpdate();
}
- if ( $wgTrackLinkChanges )
- $this->makeRecentlinkchanges();
wfRunHooks( 'LinksUpdateComplete', array( &$this ) );
-
}
- function doIncrementalUpdate() {
+ protected function doIncrementalUpdate() {
wfProfileIn( __METHOD__ );
# Page links
$this->incrTableUpdate( 'langlinks', 'll', $this->getInterlangDeletions( $existing ),
$this->getInterlangInsertions( $existing ) );
+ # Inline interwiki links
+ $existing = $this->getExistingInterwikis();
+ $this->incrTableUpdate( 'iwlinks', 'iwl', $this->getInterwikiDeletions( $existing ),
+ $this->getInterwikiInsertions( $existing ) );
+
# Template links
$existing = $this->getExistingTemplates();
$this->incrTableUpdate( 'templatelinks', 'tl', $this->getTemplateDeletions( $existing ),
* May be slower or faster depending on level of lock contention and write speed of DB
* Also useful where link table corruption needs to be repaired, e.g. in refreshLinks.php
*/
- function doDumbUpdate() {
+ protected function doDumbUpdate() {
wfProfileIn( __METHOD__ );
# Refresh category pages and image description pages
$this->dumbTableUpdate( 'templatelinks', $this->getTemplateInsertions(), 'tl_from' );
$this->dumbTableUpdate( 'externallinks', $this->getExternalInsertions(), 'el_from' );
$this->dumbTableUpdate( 'langlinks', $this->getInterlangInsertions(),'ll_from' );
+ $this->dumbTableUpdate( 'iwlinks', $this->getInterwikiInsertions(),'iwl_from' );
$this->dumbTableUpdate( 'page_props', $this->getPropertyInsertions(), 'pp_page' );
# Update the cache of all the category pages and image description
}
function queueRecursiveJobs() {
+ global $wgUpdateRowsPerJob;
wfProfileIn( __METHOD__ );
- $batchSize = 100;
- $dbr = wfGetDB( DB_SLAVE );
- $res = $dbr->select( array( 'templatelinks', 'page' ),
- array( 'page_namespace', 'page_title' ),
- array(
- 'page_id=tl_from',
- 'tl_namespace' => $this->mTitle->getNamespace(),
- 'tl_title' => $this->mTitle->getDBkey()
- ), __METHOD__
- );
-
- $done = false;
- while ( !$done ) {
- $jobs = array();
- for ( $i = 0; $i < $batchSize; $i++ ) {
- $row = $dbr->fetchObject( $res );
- if ( !$row ) {
- $done = true;
- break;
- }
- $title = Title::makeTitle( $row->page_namespace, $row->page_title );
- $jobs[] = new RefreshLinksJob( $title, '' );
- }
- Job::batchInsert( $jobs );
+ $cache = $this->mTitle->getBacklinkCache();
+ $batches = $cache->partition( 'templatelinks', $wgUpdateRowsPerJob );
+ if ( !$batches ) {
+ wfProfileOut( __METHOD__ );
+ return;
}
- $dbr->freeResult( $res );
+ $jobs = array();
+ foreach ( $batches as $batch ) {
+ list( $start, $end ) = $batch;
+ $params = array(
+ 'start' => $start,
+ 'end' => $end,
+ );
+ $jobs[] = new RefreshLinksJob2( $this->mTitle, $params );
+ }
+ Job::batchInsert( $jobs );
+
wfProfileOut( __METHOD__ );
}
/**
* Invalidate the cache of a list of pages from a single namespace
*
- * @param integer $namespace
- * @param array $dbkeys
+ * @param $namespace Integer
+ * @param $dbkeys Array
*/
function invalidatePages( $namespace, $dbkeys ) {
if ( !count( $dbkeys ) ) {
'page_touched < ' . $this->mDb->addQuotes( $now )
), __METHOD__
);
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$ids[] = $row->page_id;
}
if ( !count( $ids ) ) {
}
function invalidateImageDescriptions( $images ) {
- $this->invalidatePages( NS_IMAGE, array_keys( $images ) );
+ $this->invalidatePages( NS_FILE, array_keys( $images ) );
}
function dumbTableUpdate( $table, $insertions, $fromField ) {
}
}
- /**
- * Make a WHERE clause from a 2-d NS/dbkey array
- *
- * @param array $arr 2-d array indexed by namespace and DB key
- * @param string $prefix Field name prefix, without the underscore
- */
- function makeWhereFrom2d( &$arr, $prefix ) {
- $lb = new LinkBatch;
- $lb->setArray( $arr );
- return $lb->constructSet( $prefix, $this->mDb );
- }
-
/**
* Update a table by doing a delete query then an insert query
* @private
$fromField = "{$prefix}_from";
}
$where = array( $fromField => $this->mId );
- if ( $table == 'pagelinks' || $table == 'templatelinks' ) {
- $clause = $this->makeWhereFrom2d( $deletions, $prefix );
+ if ( $table == 'pagelinks' || $table == 'templatelinks' || $table == 'iwlinks' ) {
+ if ( $table == 'iwlinks' ) {
+ $baseKey = 'iwl_prefix';
+ } else {
+ $baseKey = "{$prefix}_namespace";
+ }
+ $clause = $this->mDb->makeWhereFrom2d( $deletions, $baseKey, "{$prefix}_title" );
if ( $clause ) {
$where[] = $clause;
} else {
function getLinkInsertions( $existing = array() ) {
$arr = array();
foreach( $this->mLinks as $ns => $dbkeys ) {
- # array_diff_key() was introduced in PHP 5.1, there is a compatibility function
- # in GlobalFunctions.php
$diffs = isset( $existing[$ns] ) ? array_diff_key( $dbkeys, $existing[$ns] ) : $dbkeys;
foreach ( $diffs as $dbk => $id ) {
$arr[] = array(
/**
* Get an array of category insertions
- * @param array $existing Array mapping existing category names to sort keys. If both
+ *
+ * @param $existing Array mapping existing category names to sort keys. If both
* match a link in $this, the link will be omitted from the output
* @private
*/
function getCategoryInsertions( $existing = array() ) {
+ global $wgContLang, $wgCategoryCollation;
$diffs = array_diff_assoc( $this->mCategories, $existing );
$arr = array();
foreach ( $diffs as $name => $sortkey ) {
+ $nt = Title::makeTitleSafe( NS_CATEGORY, $name );
+ $wgContLang->findVariantLink( $name, $nt, true );
+
+ if ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
+ $type = 'subcat';
+ } elseif ( $this->mTitle->getNamespace() == NS_FILE ) {
+ $type = 'file';
+ } else {
+ $type = 'page';
+ }
+
+ # TODO: This is kind of wrong, because someone might set a sort
+ # key prefix that's the same as the default sortkey for the
+ # title. This should be fixed by refactoring code to replace
+ # $sortkey in this array by a prefix, but it's basically harmless
+ # (Title::moveTo() has had the same issue for a long time).
+ if ( $this->mTitle->getCategorySortkey() == $sortkey ) {
+ $prefix = '';
+ $sortkey = $wgContLang->convertToSortkey( $sortkey );
+ } else {
+ # Treat custom sortkeys as a prefix, so that if multiple
+ # things are forced to sort as '*' or something, they'll
+ # sort properly in the category rather than in page_id
+ # order or such.
+ $prefix = $sortkey;
+ $sortkey = $wgContLang->convertToSortkey(
+ $this->mTitle->getCategorySortkey( $prefix ) );
+ }
+
$arr[] = array(
'cl_from' => $this->mId,
'cl_to' => $name,
'cl_sortkey' => $sortkey,
- 'cl_timestamp' => $this->mDb->timestamp()
+ 'cl_timestamp' => $this->mDb->timestamp(),
+ 'cl_sortkey_prefix' => $prefix,
+ 'cl_collation' => $wgCategoryCollation,
+ 'cl_type' => $type,
);
}
return $arr;
/**
* Get an array of interlanguage link insertions
- * @param array $existing Array mapping existing language codes to titles
+ *
+ * @param $existing Array mapping existing language codes to titles
* @private
*/
function getInterlangInsertions( $existing = array() ) {
return $arr;
}
+ /**
+ * Get an array of interwiki insertions for passing to the DB
+ * Skips the titles specified by the 2-D array $existing
+ * @private
+ */
+ function getInterwikiInsertions( $existing = array() ) {
+ $arr = array();
+ foreach( $this->mInterwikis as $prefix => $dbkeys ) {
+ $diffs = isset( $existing[$prefix] ) ? array_diff_key( $dbkeys, $existing[$prefix] ) : $dbkeys;
+ foreach ( $diffs as $dbk => $id ) {
+ $arr[] = array(
+ 'iwl_from' => $this->mId,
+ 'iwl_prefix' => $prefix,
+ 'iwl_title' => $dbk
+ );
+ }
+ }
+ return $arr;
+ }
/**
* Given an array of existing links, returns those links which are not in $this
return array_diff_assoc( $existing, $this->mProperties );
}
+ /**
+ * Given an array of existing interwiki links, returns those links which are not in $this
+ * and thus should be deleted.
+ * @private
+ */
+ function getInterwikiDeletions( $existing ) {
+ $del = array();
+ foreach ( $existing as $prefix => $dbkeys ) {
+ if ( isset( $this->mInterwikis[$prefix] ) ) {
+ $del[$prefix] = array_diff_key( $existing[$prefix], $this->mInterwikis[$prefix] );
+ } else {
+ $del[$prefix] = $existing[$prefix];
+ }
+ }
+ return $del;
+ }
+
/**
* Get an array of existing links, as a 2-D array
* @private
*/
function getExistingLinks() {
- if ( is_array( $this->mExistingLinks ) )
- return $this->mExistingLinks;
-
$res = $this->mDb->select( 'pagelinks', array( 'pl_namespace', 'pl_title' ),
array( 'pl_from' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
if ( !isset( $arr[$row->pl_namespace] ) ) {
$arr[$row->pl_namespace] = array();
}
$arr[$row->pl_namespace][$row->pl_title] = 1;
}
- $this->mDb->freeResult( $res );
- return $this->mExistingLinks = $arr;
+ return $arr;
}
/**
* @private
*/
function getExistingTemplates() {
- if ( is_array( $this->mExistingTemplates ) )
- return $this->mExistingTemplates;
-
$res = $this->mDb->select( 'templatelinks', array( 'tl_namespace', 'tl_title' ),
array( 'tl_from' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
if ( !isset( $arr[$row->tl_namespace] ) ) {
$arr[$row->tl_namespace] = array();
}
$arr[$row->tl_namespace][$row->tl_title] = 1;
}
- $this->mDb->freeResult( $res );
- return $this->mExistingTemplates = $arr;
+ return $arr;
}
/**
* @private
*/
function getExistingImages() {
- if ( is_array( $this->mExistingImages ) )
- return $this->mExistingImages;
-
$res = $this->mDb->select( 'imagelinks', array( 'il_to' ),
array( 'il_from' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$arr[$row->il_to] = 1;
}
- $this->mDb->freeResult( $res );
- return $this->mExistingImages = $arr;
+ return $arr;
}
/**
* @private
*/
function getExistingExternals() {
- if ( is_array( $this->mExistingExternals ) )
- return $this->mExistingExternals;
-
$res = $this->mDb->select( 'externallinks', array( 'el_to' ),
array( 'el_from' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$arr[$row->el_to] = 1;
}
- $this->mDb->freeResult( $res );
- return $this->mExistingExternals = $arr;
+ return $arr;
}
/**
* @private
*/
function getExistingCategories() {
- if ( is_array( $this->mExistingCategories ) )
- return $this->mExistingCategories;
-
- $res = $this->mDb->select( 'categorylinks', array( 'cl_to', 'cl_sortkey' ),
+ $res = $this->mDb->select( 'categorylinks', array( 'cl_to', 'cl_sortkey_prefix' ),
array( 'cl_from' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
- $arr[$row->cl_to] = $row->cl_sortkey;
+ foreach ( $res as $row ) {
+ if ( $row->cl_sortkey_prefix !== '' ) {
+ $arr[$row->cl_to] = $row->cl_sortkey_prefix;
+ } else {
+ $arr[$row->cl_to] = $this->mTitle->getCategorySortkey();
+ }
}
- $this->mDb->freeResult( $res );
- return $this->mExistingCategories = $arr;
+ return $arr;
}
/**
* @private
*/
function getExistingInterlangs() {
- if ( is_array( $this->mExistingInterlangs ) )
- return $this->mExistingInterlangs;
-
$res = $this->mDb->select( 'langlinks', array( 'll_lang', 'll_title' ),
array( 'll_from' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$arr[$row->ll_lang] = $row->ll_title;
}
- return $this->mExistingInterlangs = $arr;
+ return $arr;
+ }
+
+ /**
+ * Get an array of existing inline interwiki links, as a 2-D array
+ * @return array (prefix => array(dbkey => 1))
+ */
+ protected function getExistingInterwikis() {
+ $res = $this->mDb->select( 'iwlinks', array( 'iwl_prefix', 'iwl_title' ),
+ array( 'iwl_from' => $this->mId ), __METHOD__, $this->mOptions );
+ $arr = array();
+ foreach ( $res as $row ) {
+ if ( !isset( $arr[$row->iwl_prefix] ) ) {
+ $arr[$row->iwl_prefix] = array();
+ }
+ $arr[$row->iwl_prefix][$row->iwl_title] = 1;
+ }
+ return $arr;
}
/**
* @private
*/
function getExistingProperties() {
- if ( is_array( $this->mExistingProperties ) )
- return $this->mExistingProperties;
-
$res = $this->mDb->select( 'page_props', array( 'pp_propname', 'pp_value' ),
array( 'pp_page' => $this->mId ), __METHOD__, $this->mOptions );
$arr = array();
- while ( $row = $this->mDb->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$arr[$row->pp_propname] = $row->pp_value;
}
- $this->mDb->freeResult( $res );
- return $this->mExistingProperties = $arr;
+ return $arr;
}
function getTitle() {
return $this->mTitle;
}
+
+ /**
+ * Return the list of images used as generated by the parser
+ */
+ public function getImages() {
+ return $this->mImages;
+ }
/**
* Invalidate any necessary link lists related to page property changes
}
}
}
-
- // Recentlinkchanges constants
- const INSERTION = 1;
- const DELETION = 2;
- private static $rlcFields = array(
- 'rlc_type',
- 'rlc_timestamp',
- 'rlc_action',
- 'rlc_from',
- 'rlc_to_namespace',
- 'rlc_to_title',
- 'rlc_to_blob'
- );
- /*
- * Insert items to recentlinkchanges
- */
- function makeRecentlinkchanges() {
- $insert = array();
- $now = $this->mDb->timestamp();
-
- // Category changes
- $existing = array_keys( $this->getExistingCategories() );
- $current = array_keys( $this->mCategories );
- $this->simpleAddToLinkchanges( $insert, 'category', $now, $existing, $current, NS_CATEGORY );
-
- // External links
- $existing = array_keys( $this->getExistingExternals() );
- $current = array_keys( $this->mExternals );
- $insertions = array_diff( $current, $existing );
- foreach ( $insertions as $item )
- $insert[] = array(
- 'external', $now, self::INSERTION,
- $this->mId, null, null, $item );
- $deletions = array_diff( $existing, $current );
- foreach ( $deletions as $item )
- $insert[] = array(
- 'external', $now, self::DELETION,
- $this->mId, null, null, $item );
-
- // Image changes
- $existing = array_keys( $this->getExistingImages() );
- $current = array_keys( $this->mImages );
- $this->simpleAddToLinkchanges( $insert, 'image', $now, $existing, $current, NS_IMAGE );
-
- // Interlangs
- $existing = $this->getExistingInterlangs();
- $current = $this->mInterlangs;
- $this->assocAddToLinkchanges( $insert, 'interlang', $existing, $current );
-
- // Page links
- $existing = $this->getExistingLinks();
- $current = $this->mLinks;
- $this->addToLinkChangesByNamespace( $insert, 'page', $now, $existing, $current);
-
- // Properties
- $existing = $this->getExistingProperties();
- $current = $this->mProperties;
- $this->assocAddToLinkchanges( $insert, 'property', $existing, $current );
-
- // Templates
- $existing = $this->getExistingTemplates();
- $current = $this->mTemplates;
- $this->addToLinkChangesByNamespace( $insert, 'template', $now, $existing, $current);
-
- $this->mDb->insert( 'recentlinkchanges', $insert, __METHOD__ );
-
- }
-
- /*
- * Compute the difference for arrays of titles with namespace $ns and add
- * them to $insert.
- */
- private function simpleAddToLinkchanges( &$insert, $type, $now, $existing, $current, $ns ) {
-
- $insertions = array_diff( $current, $existing );
- foreach ( $insertions as $item )
- $insert[] = array_combine(self::$rlcFields, array(
- $type, $now, self::INSERTION,
- $this->mId, $ns, $item, null
- ) );
- $deletions = array_diff( $existing, $current );
- foreach ( $deletions as $item )
- $insert[] = array_combine(self::$rlcFields, array(
- $type, $now, self::DELETION,
- $this->mId, $ns, $item, null
- ) );
-
- }
-
- /*
- * Compute the difference for associative arrays and insert them to
- * $insert as title => blob.
- */
- function assocAddToLinkChanges( &$insert, $type, $now, $existing, $current ) {
- $insertions = array_diff_assoc( $current, $existing );
- foreach ( $insertions as $key => $value )
- $insert[] = array_combine(self::$rlcFields, array(
- $type, $now, self::INSERTION,
- $this->mId, null, $key, $value
- ) );
- $deletions = array_diff_assoc( $existing, $current );
- foreach ( $deletions as $key => $value )
- $insert[] = array_combine(self::$rlcFields, array(
- $type, $now, self::DELETION,
- $this->mId, null, $key, $value
- ) );
- }
-
- /*
- * Format arrays in the form $namespace => $titleArray for use in
- * simpleAddLinkLinkChanges
- */
- function addToLinkChangesByNamespace( &$insert, $type, $now, $existing, $current ) {
- $namespaces = array_merge( array_keys( $existing ), array_keys( $current ) );
- foreach ( $namespaces as $ns )
- $this->simpleAddToLinkchanges( $insert, $type, $now,
- isset( $existing[$ns] ) ? array_keys( $existing[$ns] ) : array(),
- isset( $current[$ns] ) ? array_keys( $current[$ns] ) : array(),
- $ns );
- }
}
dépôts / lhc / web / wiklou.git / blobdiff