Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api: Add support for LinksMigration in ApiQueryBacklinksprop

Browse source 
It should be generalized enough to be used in future tables as well.
Note that it removes the useIndex when the table is in mapping even if
it's read old because useIndex is evil and should not be used like this.

Also removing the straight join hint as it would intefere with
linktarget join and I tested the query with the current version of
mariadb we have in production and it works just fine.

Bug: T304780
Change-Id: Iea3e0b309ddd013687008571513afeef6b9b672b
This commit is contained in:
Amir Sarabadani 2022-04-20 22:18:59 +02:00
parent f2ab3e7b38
commit 2cfaf2da13
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/api/ApiQueryBacklinksprop.php
View file

@ -24,6 +24,7 @@
*/
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
/**
* This implements prop=redirects, prop=linkshere, prop=catmembers,
@ -107,6 +108,7 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
$pageSet = $this->getPageSet();
$titles = $pageSet->getGoodAndMissingPages();
$map = $pageSet->getGoodAndMissingTitlesByNamespace();
$linksMigration = MediaWikiServices::getInstance()->getLinksMigration();
// Add in special pages, they can theoretically have backlinks too.
// (although currently they only do for prop=redirects)
@ -119,8 +121,12 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
$p = $settings['prefix'];
$hasNS = !isset( $settings['to_namespace'] );
if ( $hasNS ) {
$bl_namespace = "{$p}_namespace";
$bl_title = "{$p}_title";
if ( isset( $linksMigration::$mapping[$settings['linktable']] ) ) {
list( $bl_namespace, $bl_title ) = $linksMigration->getTitleFields( $settings['linktable'] );
} else {
$bl_namespace = "{$p}_namespace";
$bl_title = "{$p}_title";
}
} else {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
$bl_namespace = $settings['to_namespace'];
@ -210,7 +216,15 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
// Populate the rest of the query
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
$this->addTables( [ $settings['linktable'], 'page' ] );
if ( isset( $linksMigration::$mapping[$settings['linktable']] ) ) {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
$queryInfo = $linksMigration->getQueryInfo( $settings['linktable'] );
$this->addTables( array_merge( [ 'page' ], $queryInfo['tables'] ) );
$this->addJoinConds( $queryInfo['joins'] );
} else {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
$this->addTables( [ $settings['linktable'], 'page' ] );
}
$this->addWhere( "$bl_from = page_id" );
if ( $this->getModuleName() === 'redirects' ) {
@ -279,18 +293,13 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
if ( $params['namespace'] !== null && !empty( $settings['from_namespace'] ) ) {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
$this->addOption( 'USE INDEX', [ $settings['linktable'] => $idxWithFromNS ] );
} else {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
} elseif ( !isset( $linksMigration::$mapping[$settings['linktable']] ) ) {
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset False positive
$this->addOption( 'USE INDEX', [ $settings['linktable'] => $idxNoFromNS ] );
}
}
// MySQL (or at least 5.5.5-10.0.23-MariaDB) chooses a really bad query
// plan if it thinks there will be more matching rows in the linktable
// than are in page. Use STRAIGHT_JOIN here to force it to use the
// intended, fast plan. See T145079 for details.
$this->addOption( 'STRAIGHT_JOIN' );
$this->addOption( 'LIMIT', $params['limit'] + 1 );
$res = $this->select( __METHOD__ );