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

Reset Title cache when importing titles.

Browse source 
WikiImporter now uses NaiveImportTitleFactory, which in turn uses Title::makeTitleSafe,
bypassing the internal title cache. To avoid (potentially cached) Title objects obtained
via Title::newFromText getting out of sync, WikiImporter now clears the title
cache in addition to clearing the LinkCache.

NOTE: a test for this is provided by I2be12fa7d439b.

Bug: T89307
Change-Id: Ib50c48d4797fc21c62090c0be69e87f7e7d07428
This commit is contained in:
daniel 2015-05-24 17:50:24 +02:00
parent af2f7e00c3
commit a43af3bc0e
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/Import.php
View file

@ -1570,8 +1570,7 @@ class WikiRevision {
}
// avoid memory leak...?
$linkCache = LinkCache::singleton();
$linkCache->clear();
Title::clearCaches();
$page = WikiPage::factory( $this->title );
$page->loadPageData( 'fromdbmaster' );

8
includes/Title.php
View file

@ -3309,6 +3309,14 @@ class Title {
$this->mIsBigDeletion = null;
}
public static function clearCaches() {
$linkCache = LinkCache::singleton();
$linkCache->clear();
$titleCache = self::getTitleCache();
$titleCache->clear();
}
/**
* Capitalize a text string for a title if it belongs to a namespace that capitalizes
*

13
tests/phpunit/includes/TitleMethodsTest.php
View file

@ -323,4 +323,17 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
$title = Title::newFromText( $text );
$this->assertEquals( $expected, $title->getOtherPage()->getPrefixedText() );
}
public function testClearCaches() {
$linkCache = LinkCache::singleton();
$title1 = Title::newFromText( 'Foo' );
$linkCache->addGoodLinkObj( 23, $title1 );
Title::clearCaches();
$title2 = Title::newFromText( 'Foo' );
$this->assertNotSame( $title1, $title2, 'title cache should be empty' );
$this->assertEquals( 0, $linkCache->getGoodLinkID( 'Foo' ), 'link cache should be empty' );
}
}