When loading revision slots from the new MCR schema, slot role names and content model names need to be resolved. Doing so programmatically based on an in-memory cache avoids having to join against two additional table every time we load slot meta-data. This relies on NameTableStore, which was designed for exactly this use case. Bug: T198561 Change-Id: Ic005931b669f9d0173ef47ac17331d44fb1141ca
328 lines
7.8 KiB
PHP
328 lines
7.8 KiB
PHP
<?php
|
|
namespace MediaWiki\Tests\Storage;
|
|
|
|
use CommentStoreComment;
|
|
use MediaWiki\MediaWikiServices;
|
|
use MediaWiki\Storage\MutableRevisionRecord;
|
|
use MediaWiki\Storage\RevisionRecord;
|
|
use MediaWiki\Storage\SlotRecord;
|
|
use TextContent;
|
|
use Title;
|
|
use WikitextContent;
|
|
|
|
/**
|
|
* Tests RevisionStore against the post-migration MCR DB schema.
|
|
*
|
|
* @covers \MediaWiki\Storage\RevisionStore
|
|
*
|
|
* @group RevisionStore
|
|
* @group Storage
|
|
* @group Database
|
|
* @group medium
|
|
*/
|
|
class McrRevisionStoreDbTest extends RevisionStoreDbTestBase {
|
|
|
|
use McrSchemaOverride;
|
|
|
|
protected function assertRevisionExistsInDatabase( RevisionRecord $rev ) {
|
|
$numberOfSlots = count( $rev->getSlotRoles() );
|
|
|
|
// new schema is written
|
|
$this->assertSelect(
|
|
'slots',
|
|
[ 'count(*)' ],
|
|
[ 'slot_revision_id' => $rev->getId() ],
|
|
[ [ (string)$numberOfSlots ] ]
|
|
);
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
$revQuery = $store->getSlotsQueryInfo( [ 'content' ] );
|
|
|
|
$this->assertSelect(
|
|
$revQuery['tables'],
|
|
[ 'count(*)' ],
|
|
[
|
|
'slot_revision_id' => $rev->getId(),
|
|
],
|
|
[ [ (string)$numberOfSlots ] ],
|
|
[],
|
|
$revQuery['joins']
|
|
);
|
|
|
|
parent::assertRevisionExistsInDatabase( $rev );
|
|
}
|
|
|
|
/**
|
|
* @param SlotRecord $a
|
|
* @param SlotRecord $b
|
|
*/
|
|
protected function assertSameSlotContent( SlotRecord $a, SlotRecord $b ) {
|
|
parent::assertSameSlotContent( $a, $b );
|
|
|
|
// Assert that the same content ID has been used
|
|
$this->assertSame( $a->getContentId(), $b->getContentId() );
|
|
}
|
|
|
|
public function provideInsertRevisionOn_successes() {
|
|
foreach ( parent::provideInsertRevisionOn_successes() as $case ) {
|
|
yield $case;
|
|
}
|
|
|
|
yield 'Multi-slot revision insertion' => [
|
|
[
|
|
'content' => [
|
|
'main' => new WikitextContent( 'Chicken' ),
|
|
'aux' => new TextContent( 'Egg' ),
|
|
],
|
|
'page' => true,
|
|
'comment' => $this->getRandomCommentStoreComment(),
|
|
'timestamp' => '20171117010101',
|
|
'user' => true,
|
|
],
|
|
];
|
|
}
|
|
|
|
public function provideNewNullRevision() {
|
|
foreach ( parent::provideNewNullRevision() as $case ) {
|
|
yield $case;
|
|
}
|
|
|
|
yield [
|
|
Title::newFromText( 'UTPage_notAutoCreated' ),
|
|
[
|
|
'content' => [
|
|
'main' => new WikitextContent( 'Chicken' ),
|
|
'aux' => new WikitextContent( 'Omelet' ),
|
|
],
|
|
],
|
|
CommentStoreComment::newUnsavedComment( __METHOD__ . ' comment multi' ),
|
|
];
|
|
}
|
|
|
|
public function provideNewMutableRevisionFromArray() {
|
|
foreach ( parent::provideNewMutableRevisionFromArray() as $case ) {
|
|
yield $case;
|
|
}
|
|
|
|
yield 'Basic array, multiple roles' => [
|
|
[
|
|
'id' => 2,
|
|
'page' => 1,
|
|
'timestamp' => '20171017114835',
|
|
'user_text' => '111.0.1.2',
|
|
'user' => 0,
|
|
'minor_edit' => false,
|
|
'deleted' => 0,
|
|
'len' => 29,
|
|
'parent_id' => 1,
|
|
'sha1' => '89qs83keq9c9ccw9olvvm4oc9oq50ii',
|
|
'comment' => 'Goat Comment!',
|
|
'content' => [
|
|
'main' => new WikitextContent( 'Söme Cöntent' ),
|
|
'aux' => new TextContent( 'Öther Cöntent' ),
|
|
]
|
|
]
|
|
];
|
|
}
|
|
|
|
public function testGetQueryInfo_NoSlotDataJoin() {
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
$queryInfo = $store->getQueryInfo();
|
|
|
|
// with the new schema enabled, query info should not join the main slot info
|
|
$this->assertFalse( array_key_exists( 'a_slot_data', $queryInfo['tables'] ) );
|
|
$this->assertFalse( array_key_exists( 'a_slot_data', $queryInfo['joins'] ) );
|
|
}
|
|
|
|
public function provideGetArchiveQueryInfo() {
|
|
yield [
|
|
[
|
|
'tables' => [
|
|
'archive',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getDefaultArchiveFields( false ),
|
|
[
|
|
'ar_comment_text' => 'ar_comment',
|
|
'ar_comment_data' => 'NULL',
|
|
'ar_comment_cid' => 'NULL',
|
|
'ar_user_text' => 'ar_user_text',
|
|
'ar_user' => 'ar_user',
|
|
'ar_actor' => 'NULL',
|
|
]
|
|
),
|
|
'joins' => [
|
|
],
|
|
]
|
|
];
|
|
}
|
|
|
|
public function provideGetQueryInfo() {
|
|
// TODO: more option variations
|
|
yield [
|
|
[ 'page', 'user' ],
|
|
[
|
|
'tables' => [
|
|
'revision',
|
|
'page',
|
|
'user',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getDefaultQueryFields( false ),
|
|
$this->getCommentQueryFields(),
|
|
$this->getActorQueryFields(),
|
|
[
|
|
'page_namespace',
|
|
'page_title',
|
|
'page_id',
|
|
'page_latest',
|
|
'page_is_redirect',
|
|
'page_len',
|
|
'user_name',
|
|
]
|
|
),
|
|
'joins' => [
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
'user' => [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
|
|
],
|
|
]
|
|
];
|
|
}
|
|
|
|
public function provideGetSlotsQueryInfo() {
|
|
yield 'no options' => [
|
|
[],
|
|
[
|
|
'tables' => [
|
|
'slots'
|
|
],
|
|
'fields' => [
|
|
'slot_revision_id',
|
|
'slot_content_id',
|
|
'slot_origin',
|
|
'slot_role_id',
|
|
],
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'role option' => [
|
|
[ 'role' ],
|
|
[
|
|
'tables' => [
|
|
'slots',
|
|
'slot_roles',
|
|
],
|
|
'fields' => [
|
|
'slot_revision_id',
|
|
'slot_content_id',
|
|
'slot_origin',
|
|
'slot_role_id',
|
|
'role_name',
|
|
],
|
|
'joins' => [
|
|
'slot_roles' => [ 'LEFT JOIN', [ 'slot_role_id = role_id' ] ],
|
|
],
|
|
]
|
|
];
|
|
yield 'content option' => [
|
|
[ 'content' ],
|
|
[
|
|
'tables' => [
|
|
'slots',
|
|
'content',
|
|
],
|
|
'fields' => [
|
|
'slot_revision_id',
|
|
'slot_content_id',
|
|
'slot_origin',
|
|
'slot_role_id',
|
|
'content_size',
|
|
'content_sha1',
|
|
'content_address',
|
|
'content_model',
|
|
],
|
|
'joins' => [
|
|
'content' => [ 'INNER JOIN', [ 'slot_content_id = content_id' ] ],
|
|
],
|
|
]
|
|
];
|
|
yield 'content and model options' => [
|
|
[ 'content', 'model' ],
|
|
[
|
|
'tables' => [
|
|
'slots',
|
|
'content',
|
|
'content_models',
|
|
],
|
|
'fields' => [
|
|
'slot_revision_id',
|
|
'slot_content_id',
|
|
'slot_origin',
|
|
'slot_role_id',
|
|
'content_size',
|
|
'content_sha1',
|
|
'content_address',
|
|
'content_model',
|
|
'model_name',
|
|
],
|
|
'joins' => [
|
|
'content' => [ 'INNER JOIN', [ 'slot_content_id = content_id' ] ],
|
|
'content_models' => [ 'LEFT JOIN', [ 'content_model = model_id' ] ],
|
|
],
|
|
]
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Storage\RevisionStore::insertRevisionOn
|
|
* @covers \MediaWiki\Storage\RevisionStore::insertSlotRowOn
|
|
* @covers \MediaWiki\Storage\RevisionStore::insertContentRowOn
|
|
*/
|
|
public function testInsertRevisionOn_T202032() {
|
|
// This test only makes sense for MySQL
|
|
if ( $this->db->getType() !== 'mysql' ) {
|
|
$this->assertTrue( true );
|
|
return;
|
|
}
|
|
|
|
// NOTE: must be done before checking MAX(rev_id)
|
|
$page = $this->getTestPage();
|
|
|
|
$maxRevId = $this->db->selectField( 'revision', 'MAX(rev_id)' );
|
|
|
|
// Construct a slot row that will conflict with the insertion of the next revision ID,
|
|
// to emulate the failure mode described in T202032. Nothing will ever read this row,
|
|
// we just need it to trigger a primary key conflict.
|
|
$this->db->insert( 'slots', [
|
|
'slot_revision_id' => $maxRevId + 1,
|
|
'slot_role_id' => 1,
|
|
'slot_content_id' => 0,
|
|
'slot_origin' => 0
|
|
], __METHOD__ );
|
|
|
|
$rev = new MutableRevisionRecord( $page->getTitle() );
|
|
$rev->setTimestamp( '20180101000000' );
|
|
$rev->setComment( CommentStoreComment::newUnsavedComment( 'test' ) );
|
|
$rev->setUser( $this->getTestUser()->getUser() );
|
|
$rev->setContent( 'main', new WikitextContent( 'Text' ) );
|
|
$rev->setPageId( $page->getId() );
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
$return = $store->insertRevisionOn( $rev, $this->db );
|
|
|
|
$this->assertSame( $maxRevId + 2, $return->getId() );
|
|
|
|
// is the new revision correct?
|
|
$this->assertRevisionCompleteness( $return );
|
|
$this->assertRevisionRecordsEqual( $rev, $return );
|
|
|
|
// can we find it directly in the database?
|
|
$this->assertRevisionExistsInDatabase( $return );
|
|
|
|
// can we load it from the store?
|
|
$loaded = $store->getRevisionById( $return->getId() );
|
|
$this->assertRevisionCompleteness( $loaded );
|
|
$this->assertRevisionRecordsEqual( $return, $loaded );
|
|
}
|
|
|
|
}
|