452c71663b
This consolidates tests for getQueryInfo, getArchiveQueryInfo, getSlotQueryInfo, and similar methods that help application logic be compatible with different migration stages of different aspects of the revision storage schema. Bug: T198561 Change-Id: I8e4ae69d7e00721a0af125afaf9a708f7fe99b0a
1177 lines
31 KiB
PHP
1177 lines
31 KiB
PHP
<?php
|
|
namespace MediaWiki\Tests\Storage;
|
|
|
|
use MediaWiki\MediaWikiServices;
|
|
use MediaWikiTestCase;
|
|
use Revision;
|
|
|
|
/**
|
|
* Tests RevisionStore against the post-migration MCR DB schema.
|
|
*
|
|
* @group RevisionStore
|
|
* @group Storage
|
|
* @group Database
|
|
*/
|
|
class RevisionQueryInfoTest extends MediaWikiTestCase {
|
|
|
|
protected function getRevisionQueryFields( $returnTextIdField = true ) {
|
|
$fields = [
|
|
'rev_id',
|
|
'rev_page',
|
|
'rev_timestamp',
|
|
'rev_minor_edit',
|
|
'rev_deleted',
|
|
'rev_len',
|
|
'rev_parent_id',
|
|
'rev_sha1',
|
|
];
|
|
if ( $returnTextIdField ) {
|
|
$fields[] = 'rev_text_id';
|
|
}
|
|
return $fields;
|
|
}
|
|
|
|
protected function getArchiveQueryFields( $returnTextFields = true ) {
|
|
$fields = [
|
|
'ar_id',
|
|
'ar_page_id',
|
|
'ar_namespace',
|
|
'ar_title',
|
|
'ar_rev_id',
|
|
'ar_timestamp',
|
|
'ar_minor_edit',
|
|
'ar_deleted',
|
|
'ar_len',
|
|
'ar_parent_id',
|
|
'ar_sha1',
|
|
];
|
|
if ( $returnTextFields ) {
|
|
$fields[] = 'ar_text_id';
|
|
}
|
|
return $fields;
|
|
}
|
|
|
|
protected function getOldCommentQueryFields( $prefix ) {
|
|
return [
|
|
"{$prefix}_comment_text" => "{$prefix}_comment",
|
|
"{$prefix}_comment_data" => 'NULL',
|
|
"{$prefix}_comment_cid" => 'NULL',
|
|
];
|
|
}
|
|
|
|
protected function getCompatCommentQueryFields( $prefix ) {
|
|
return [
|
|
"{$prefix}_comment_text"
|
|
=> "COALESCE( comment_{$prefix}_comment.comment_text, {$prefix}_comment )",
|
|
"{$prefix}_comment_data" => "comment_{$prefix}_comment.comment_data",
|
|
"{$prefix}_comment_cid" => "comment_{$prefix}_comment.comment_id",
|
|
];
|
|
}
|
|
|
|
protected function getNewCommentQueryFields( $prefix ) {
|
|
return [
|
|
"{$prefix}_comment_text" => "comment_{$prefix}_comment.comment_text",
|
|
"{$prefix}_comment_data" => "comment_{$prefix}_comment.comment_data",
|
|
"{$prefix}_comment_cid" => "comment_{$prefix}_comment.comment_id",
|
|
];
|
|
}
|
|
|
|
protected function getOldActorQueryFields( $prefix ) {
|
|
return [
|
|
"{$prefix}_user" => "{$prefix}_user",
|
|
"{$prefix}_user_text" => "{$prefix}_user_text",
|
|
"{$prefix}_actor" => 'NULL',
|
|
];
|
|
}
|
|
|
|
protected function getNewActorQueryFields( $prefix, $tmp = false ) {
|
|
return [
|
|
"{$prefix}_user" => "actor_{$prefix}_user.actor_user",
|
|
"{$prefix}_user_text" => "actor_{$prefix}_user.actor_name",
|
|
"{$prefix}_actor" => $tmp ?: "{$prefix}_actor",
|
|
];
|
|
}
|
|
|
|
protected function getCompatActorQueryFields( $prefix, $tmp = false ) {
|
|
return [
|
|
"{$prefix}_user" => "COALESCE( actor_{$prefix}_user.actor_user, {$prefix}_user )",
|
|
"{$prefix}_user_text" => "COALESCE( actor_{$prefix}_user.actor_name, {$prefix}_user_text )",
|
|
"{$prefix}_actor" => $tmp ?: "{$prefix}_actor",
|
|
];
|
|
}
|
|
|
|
protected function getCompatActorJoins( $prefix ) {
|
|
return [
|
|
"temp_{$prefix}_user" => [
|
|
"LEFT JOIN",
|
|
"temp_{$prefix}_user.revactor_{$prefix} = {$prefix}_id",
|
|
],
|
|
"actor_{$prefix}_user" => [
|
|
"LEFT JOIN",
|
|
"actor_{$prefix}_user.actor_id = temp_{$prefix}_user.revactor_actor",
|
|
],
|
|
];
|
|
}
|
|
|
|
protected function getCompatCommentJoins( $prefix ) {
|
|
return [
|
|
"temp_{$prefix}_comment" => [
|
|
"LEFT JOIN",
|
|
"temp_{$prefix}_comment.revcomment_{$prefix} = {$prefix}_id",
|
|
],
|
|
"comment_{$prefix}_comment" => [
|
|
"LEFT JOIN",
|
|
"comment_{$prefix}_comment.comment_id = temp_{$prefix}_comment.revcomment_comment_id",
|
|
],
|
|
];
|
|
}
|
|
|
|
protected function getTextQueryFields() {
|
|
return [
|
|
'old_text',
|
|
'old_flags',
|
|
];
|
|
}
|
|
|
|
protected function getPageQueryFields() {
|
|
return [
|
|
'page_namespace',
|
|
'page_title',
|
|
'page_id',
|
|
'page_latest',
|
|
'page_is_redirect',
|
|
'page_len',
|
|
];
|
|
}
|
|
|
|
protected function getUserQueryFields() {
|
|
return [
|
|
'user_name',
|
|
];
|
|
}
|
|
|
|
protected function getContentHandlerQueryFields( $prefix ) {
|
|
return [
|
|
"{$prefix}_content_format",
|
|
"{$prefix}_content_model",
|
|
];
|
|
}
|
|
|
|
public function provideArchiveQueryInfo() {
|
|
yield 'MCR, comment, actor' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_NEW,
|
|
],
|
|
[
|
|
'tables' => [
|
|
'archive',
|
|
'actor_ar_user' => 'actor',
|
|
'comment_ar_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getArchiveQueryFields( false ),
|
|
$this->getNewActorQueryFields( 'ar' ),
|
|
$this->getNewCommentQueryFields( 'ar' )
|
|
),
|
|
'joins' => [
|
|
'comment_ar_comment'
|
|
=> [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
|
|
'actor_ar_user' => [ 'JOIN', 'actor_ar_user.actor_id = ar_actor' ],
|
|
],
|
|
]
|
|
];
|
|
yield 'read-new MCR, comment, actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
|
|
],
|
|
[
|
|
'tables' => [
|
|
'archive',
|
|
'actor_ar_user' => 'actor',
|
|
'comment_ar_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getArchiveQueryFields( false ),
|
|
$this->getCompatActorQueryFields( 'ar' ),
|
|
$this->getCompatCommentQueryFields( 'ar' )
|
|
),
|
|
'joins' => [
|
|
'comment_ar_comment'
|
|
=> [ 'LEFT JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
|
|
'actor_ar_user' => [ 'LEFT JOIN', 'actor_ar_user.actor_id = ar_actor' ],
|
|
],
|
|
]
|
|
];
|
|
yield 'MCR write-both/read-old' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
],
|
|
[
|
|
'tables' => [
|
|
'archive',
|
|
'actor_ar_user' => 'actor',
|
|
'comment_ar_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getArchiveQueryFields( true ),
|
|
$this->getContentHandlerQueryFields( 'ar' ),
|
|
$this->getCompatActorQueryFields( 'ar' ),
|
|
$this->getCompatCommentQueryFields( 'ar' )
|
|
),
|
|
'joins' => [
|
|
'comment_ar_comment'
|
|
=> [ 'LEFT JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
|
|
'actor_ar_user' => [ 'LEFT JOIN', 'actor_ar_user.actor_id = ar_actor' ],
|
|
],
|
|
]
|
|
];
|
|
yield 'pre-MCR, no model' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[
|
|
'tables' => [
|
|
'archive',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getArchiveQueryFields( true ),
|
|
$this->getOldActorQueryFields( 'ar' ),
|
|
$this->getOldCommentQueryFields( 'ar' )
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
}
|
|
|
|
public function provideQueryInfo() {
|
|
// TODO: more option variations
|
|
yield 'MCR, page, user, comment, actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_NEW,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_NEW,
|
|
],
|
|
[ 'page', 'user' ],
|
|
[
|
|
'tables' => [
|
|
'revision',
|
|
'page',
|
|
'user',
|
|
'temp_rev_user' => 'revision_actor_temp',
|
|
'temp_rev_comment' => 'revision_comment_temp',
|
|
'actor_rev_user' => 'actor',
|
|
'comment_rev_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( false ),
|
|
$this->getPageQueryFields(),
|
|
$this->getUserQueryFields(),
|
|
$this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
|
|
$this->getNewCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
'user' => [
|
|
'LEFT JOIN',
|
|
[ 'actor_rev_user.actor_user != 0', 'user_id = actor_rev_user.actor_user' ],
|
|
],
|
|
'comment_rev_comment' => [
|
|
'JOIN',
|
|
'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id',
|
|
],
|
|
'actor_rev_user' => [
|
|
'JOIN',
|
|
'actor_rev_user.actor_id = temp_rev_user.revactor_actor',
|
|
],
|
|
'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
|
|
'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
|
|
],
|
|
]
|
|
];
|
|
yield 'MCR read-new, page, user, comment, actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
|
|
],
|
|
[ 'page', 'user' ],
|
|
[
|
|
'tables' => [
|
|
'revision',
|
|
'page',
|
|
'user',
|
|
'temp_rev_user' => 'revision_actor_temp',
|
|
'temp_rev_comment' => 'revision_comment_temp',
|
|
'actor_rev_user' => 'actor',
|
|
'comment_rev_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( false ),
|
|
$this->getPageQueryFields(),
|
|
$this->getUserQueryFields(),
|
|
$this->getCompatActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
|
|
$this->getCompatCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => array_merge(
|
|
[
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
'user' => [
|
|
'LEFT JOIN',
|
|
[
|
|
'COALESCE( actor_rev_user.actor_user, rev_user ) != 0',
|
|
'user_id = COALESCE( actor_rev_user.actor_user, rev_user )'
|
|
]
|
|
],
|
|
],
|
|
$this->getCompatActorJoins( 'rev' ),
|
|
$this->getCompatCommentJoins( 'rev' )
|
|
),
|
|
]
|
|
];
|
|
yield 'MCR read-new' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_NEW,
|
|
],
|
|
[ 'page', 'user' ],
|
|
[
|
|
'tables' => [
|
|
'revision',
|
|
'page',
|
|
'user',
|
|
'temp_rev_user' => 'revision_actor_temp',
|
|
'temp_rev_comment' => 'revision_comment_temp',
|
|
'actor_rev_user' => 'actor',
|
|
'comment_rev_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( false ),
|
|
$this->getPageQueryFields(),
|
|
$this->getUserQueryFields(),
|
|
$this->getCompatActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
|
|
$this->getCompatCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => array_merge(
|
|
[
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
'user' => [
|
|
'LEFT JOIN',
|
|
[
|
|
'COALESCE( actor_rev_user.actor_user, rev_user ) != 0',
|
|
'user_id = COALESCE( actor_rev_user.actor_user, rev_user )'
|
|
]
|
|
],
|
|
],
|
|
$this->getCompatActorJoins( 'rev' ),
|
|
$this->getCompatCommentJoins( 'rev' )
|
|
),
|
|
]
|
|
];
|
|
yield 'MCR write-both/read-old' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
],
|
|
[],
|
|
[
|
|
'tables' => [
|
|
'revision',
|
|
'temp_rev_user' => 'revision_actor_temp',
|
|
'temp_rev_comment' => 'revision_comment_temp',
|
|
'actor_rev_user' => 'actor',
|
|
'comment_rev_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getContentHandlerQueryFields( 'rev' ),
|
|
$this->getCompatActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
|
|
$this->getCompatCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => array_merge(
|
|
$this->getCompatActorJoins( 'rev' ),
|
|
$this->getCompatCommentJoins( 'rev' )
|
|
),
|
|
]
|
|
];
|
|
yield 'MCR write-both/read-old, page, user' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
],
|
|
[ 'page', 'user' ],
|
|
[
|
|
'tables' => [
|
|
'revision',
|
|
'page',
|
|
'user',
|
|
'temp_rev_user' => 'revision_actor_temp',
|
|
'temp_rev_comment' => 'revision_comment_temp',
|
|
'actor_rev_user' => 'actor',
|
|
'comment_rev_comment' => 'comment',
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getContentHandlerQueryFields( 'rev' ),
|
|
$this->getUserQueryFields(),
|
|
$this->getPageQueryFields(),
|
|
$this->getCompatActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
|
|
$this->getCompatCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => array_merge(
|
|
[
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
'user' => [
|
|
'LEFT JOIN',
|
|
[
|
|
'COALESCE( actor_rev_user.actor_user, rev_user ) != 0',
|
|
'user_id = COALESCE( actor_rev_user.actor_user, rev_user )'
|
|
]
|
|
],
|
|
],
|
|
$this->getCompatActorJoins( 'rev' ),
|
|
$this->getCompatCommentJoins( 'rev' )
|
|
),
|
|
]
|
|
];
|
|
yield 'pre-MCR' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[],
|
|
[
|
|
'tables' => [ 'revision' ],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getContentHandlerQueryFields( 'rev' ),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'pre-MCR, page, user' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[ 'page', 'user' ],
|
|
[
|
|
'tables' => [ 'revision', 'page', 'user' ],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getContentHandlerQueryFields( 'rev' ),
|
|
$this->getPageQueryFields(),
|
|
$this->getUserQueryFields(),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
'user' => [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
|
|
],
|
|
]
|
|
];
|
|
yield 'pre-MCR, no model' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[],
|
|
[
|
|
'tables' => [ 'revision' ],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [],
|
|
],
|
|
];
|
|
yield 'pre-MCR, no model, page' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[ 'page' ],
|
|
[
|
|
'tables' => [ 'revision', 'page' ],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getPageQueryFields(),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [
|
|
'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ], ],
|
|
],
|
|
],
|
|
];
|
|
yield 'pre-MCR, no model, user' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[ 'user' ],
|
|
[
|
|
'tables' => [ 'revision', 'user' ],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getUserQueryFields(),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [
|
|
'user' => [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
|
|
],
|
|
],
|
|
];
|
|
yield 'pre-MCR, no model, text' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[ 'text' ],
|
|
[
|
|
'tables' => [ 'revision', 'text' ],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getTextQueryFields(),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [
|
|
'text' => [ 'INNER JOIN', [ 'rev_text_id=old_id' ] ],
|
|
],
|
|
],
|
|
];
|
|
yield 'pre-MCR, no model, text, page, user' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_OLD,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
[ 'text', 'page', 'user' ],
|
|
[
|
|
'tables' => [
|
|
'revision', 'page', 'user', 'text'
|
|
],
|
|
'fields' => array_merge(
|
|
$this->getRevisionQueryFields( true ),
|
|
$this->getPageQueryFields(),
|
|
$this->getUserQueryFields(),
|
|
$this->getTextQueryFields(),
|
|
$this->getOldActorQueryFields( 'rev' ),
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
'joins' => [
|
|
'page' => [
|
|
'INNER JOIN',
|
|
[ 'page_id = rev_page' ],
|
|
],
|
|
'user' => [
|
|
'LEFT JOIN',
|
|
[
|
|
'rev_user != 0',
|
|
'user_id = rev_user',
|
|
],
|
|
],
|
|
'text' => [
|
|
'INNER JOIN',
|
|
[ 'rev_text_id=old_id' ],
|
|
],
|
|
],
|
|
],
|
|
];
|
|
}
|
|
|
|
public function provideSlotsQueryInfo() {
|
|
yield 'MCR, no options' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
|
|
],
|
|
[],
|
|
[
|
|
'tables' => [
|
|
'slots'
|
|
],
|
|
'fields' => [
|
|
'slot_revision_id',
|
|
'slot_content_id',
|
|
'slot_origin',
|
|
'slot_role_id',
|
|
],
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'MCR, role option' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
|
|
],
|
|
[ '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 'MCR read-new, content option' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
|
|
],
|
|
[ '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 'MCR read-new, content and model options' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
|
|
],
|
|
[ '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' ] ],
|
|
],
|
|
]
|
|
];
|
|
|
|
$db = wfGetDB( DB_REPLICA );
|
|
|
|
yield 'MCR write-both/read-old' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
|
|
],
|
|
[],
|
|
[
|
|
'tables' => [
|
|
'slots' => 'revision',
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'slot_revision_id' => 'slots.rev_id',
|
|
'slot_content_id' => 'NULL',
|
|
'slot_origin' => 'slots.rev_id',
|
|
'role_name' => $db->addQuotes( 'main' ),
|
|
]
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'MCR write-both/read-old, content' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
|
|
],
|
|
[ 'content' ],
|
|
[
|
|
'tables' => [
|
|
'slots' => 'revision',
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'slot_revision_id' => 'slots.rev_id',
|
|
'slot_content_id' => 'NULL',
|
|
'slot_origin' => 'slots.rev_id',
|
|
'role_name' => $db->addQuotes( 'main' ),
|
|
'content_size' => 'slots.rev_len',
|
|
'content_sha1' => 'slots.rev_sha1',
|
|
'content_address' => $db->buildConcat( [
|
|
$db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
|
|
'model_name' => 'slots.rev_content_model',
|
|
]
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'MCR write-both/read-old, content, model, role' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
|
|
],
|
|
[ 'content', 'model', 'role' ],
|
|
[
|
|
'tables' => [
|
|
'slots' => 'revision',
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'slot_revision_id' => 'slots.rev_id',
|
|
'slot_content_id' => 'NULL',
|
|
'slot_origin' => 'slots.rev_id',
|
|
'role_name' => $db->addQuotes( 'main' ),
|
|
'content_size' => 'slots.rev_len',
|
|
'content_sha1' => 'slots.rev_sha1',
|
|
'content_address' => $db->buildConcat( [
|
|
$db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
|
|
'model_name' => 'slots.rev_content_model',
|
|
]
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'pre-MCR' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_OLD,
|
|
],
|
|
[],
|
|
[
|
|
'tables' => [
|
|
'slots' => 'revision',
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'slot_revision_id' => 'slots.rev_id',
|
|
'slot_content_id' => 'NULL',
|
|
'slot_origin' => 'slots.rev_id',
|
|
'role_name' => $db->addQuotes( 'main' ),
|
|
]
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
yield 'pre-MCR, content' => [
|
|
[
|
|
'wgMultiContentRevisionSchemaMigrationStage'
|
|
=> SCHEMA_COMPAT_OLD,
|
|
],
|
|
[ 'content' ],
|
|
[
|
|
'tables' => [
|
|
'slots' => 'revision',
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'slot_revision_id' => 'slots.rev_id',
|
|
'slot_content_id' => 'NULL',
|
|
'slot_origin' => 'slots.rev_id',
|
|
'role_name' => $db->addQuotes( 'main' ),
|
|
'content_size' => 'slots.rev_len',
|
|
'content_sha1' => 'slots.rev_sha1',
|
|
'content_address' =>
|
|
$db->buildConcat( [ $db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
|
|
'model_name' => 'slots.rev_content_model',
|
|
]
|
|
),
|
|
'joins' => [],
|
|
]
|
|
];
|
|
}
|
|
|
|
public function provideSelectFields() {
|
|
yield 'with model, comment, and actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'rev_id',
|
|
'rev_page',
|
|
'rev_text_id',
|
|
'rev_timestamp',
|
|
'rev_user_text',
|
|
'rev_user',
|
|
'rev_actor' => 'NULL',
|
|
'rev_minor_edit',
|
|
'rev_deleted',
|
|
'rev_len',
|
|
'rev_parent_id',
|
|
'rev_sha1',
|
|
],
|
|
$this->getContentHandlerQueryFields( 'rev' ),
|
|
[
|
|
'rev_comment_old' => 'rev_comment',
|
|
'rev_comment_pk' => 'rev_id',
|
|
]
|
|
),
|
|
];
|
|
yield 'no mode, no comment, no actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'rev_id',
|
|
'rev_page',
|
|
'rev_text_id',
|
|
'rev_timestamp',
|
|
'rev_user_text',
|
|
'rev_user',
|
|
'rev_actor' => 'NULL',
|
|
'rev_minor_edit',
|
|
'rev_deleted',
|
|
'rev_len',
|
|
'rev_parent_id',
|
|
'rev_sha1',
|
|
],
|
|
$this->getOldCommentQueryFields( 'rev' )
|
|
),
|
|
];
|
|
}
|
|
|
|
public function provideSelectArchiveFields() {
|
|
yield 'with model, comment, and actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => true,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_WRITE_BOTH,
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'ar_id',
|
|
'ar_page_id',
|
|
'ar_rev_id',
|
|
'ar_text_id',
|
|
'ar_timestamp',
|
|
'ar_user_text',
|
|
'ar_user',
|
|
'ar_actor' => 'NULL',
|
|
'ar_minor_edit',
|
|
'ar_deleted',
|
|
'ar_len',
|
|
'ar_parent_id',
|
|
'ar_sha1',
|
|
],
|
|
$this->getContentHandlerQueryFields( 'ar' ),
|
|
[
|
|
'ar_comment_old' => 'ar_comment',
|
|
'ar_comment_id' => 'ar_comment_id',
|
|
]
|
|
),
|
|
];
|
|
yield 'no mode, no comment, no actor' => [
|
|
[
|
|
'wgContentHandlerUseDB' => false,
|
|
'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
'wgActorTableSchemaMigrationStage' => MIGRATION_OLD,
|
|
],
|
|
'fields' => array_merge(
|
|
[
|
|
'ar_id',
|
|
'ar_page_id',
|
|
'ar_rev_id',
|
|
'ar_text_id',
|
|
'ar_timestamp',
|
|
'ar_user_text',
|
|
'ar_user',
|
|
'ar_actor' => 'NULL',
|
|
'ar_minor_edit',
|
|
'ar_deleted',
|
|
'ar_len',
|
|
'ar_parent_id',
|
|
'ar_sha1',
|
|
],
|
|
$this->getOldCommentQueryFields( 'ar' )
|
|
),
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideSelectFields
|
|
* @covers Revision::selectFields
|
|
*/
|
|
public function testRevisionSelectFields( $migrationStageSettings, $expected ) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$this->hideDeprecated( 'Revision::selectFields' );
|
|
$this->assertArrayEqualsIgnoringIntKeyOrder( $expected, Revision::selectFields() );
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideSelectArchiveFields
|
|
* @covers Revision::selectArchiveFields
|
|
*/
|
|
public function testRevisionSelectArchiveFields( $migrationStageSettings, $expected ) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$this->hideDeprecated( 'Revision::selectArchiveFields' );
|
|
$this->assertArrayEqualsIgnoringIntKeyOrder( $expected, Revision::selectArchiveFields() );
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::userJoinCond
|
|
*/
|
|
public function testRevisionUserJoinCond() {
|
|
$this->hideDeprecated( 'Revision::userJoinCond' );
|
|
$this->setMwGlobals( 'wgActorTableSchemaMigrationStage', MIGRATION_OLD );
|
|
$this->overrideMwServices();
|
|
$this->assertEquals(
|
|
[ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ],
|
|
Revision::userJoinCond()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::pageJoinCond
|
|
*/
|
|
public function testRevisionPageJoinCond() {
|
|
$this->hideDeprecated( 'Revision::pageJoinCond' );
|
|
$this->assertEquals(
|
|
[ 'INNER JOIN', [ 'page_id = rev_page' ] ],
|
|
Revision::pageJoinCond()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::selectTextFields
|
|
*/
|
|
public function testRevisionSelectTextFields() {
|
|
$this->hideDeprecated( 'Revision::selectTextFields' );
|
|
$this->assertEquals(
|
|
$this->getTextQueryFields(),
|
|
Revision::selectTextFields()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::selectPageFields
|
|
*/
|
|
public function testRevisionSelectPageFields() {
|
|
$this->hideDeprecated( 'Revision::selectPageFields' );
|
|
$this->assertEquals(
|
|
$this->getPageQueryFields(),
|
|
Revision::selectPageFields()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::selectUserFields
|
|
*/
|
|
public function testRevisionSelectUserFields() {
|
|
$this->hideDeprecated( 'Revision::selectUserFields' );
|
|
$this->assertEquals(
|
|
$this->getUserQueryFields(),
|
|
Revision::selectUserFields()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::getArchiveQueryInfo
|
|
* @dataProvider provideArchiveQueryInfo
|
|
*/
|
|
public function testRevisionGetArchiveQueryInfo( $migrationStageSettings, $expected ) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$queryInfo = Revision::getArchiveQueryInfo();
|
|
$this->assertQueryInfoEquals( $expected, $queryInfo );
|
|
}
|
|
|
|
/**
|
|
* @covers Revision::getQueryInfo
|
|
* @dataProvider provideQueryInfo
|
|
*/
|
|
public function testRevisionGetQueryInfo( $migrationStageSettings, $options, $expected ) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$queryInfo = Revision::getQueryInfo( $options );
|
|
$this->assertQueryInfoEquals( $expected, $queryInfo );
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideQueryInfo
|
|
* @covers \MediaWiki\Storage\RevisionStore::getQueryInfo
|
|
*/
|
|
public function testRevisionStoreGetQueryInfo( $migrationStageSettings, $options, $expected ) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
|
|
$queryInfo = $store->getQueryInfo( $options );
|
|
$this->assertQueryInfoEquals( $expected, $queryInfo );
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideSlotsQueryInfo
|
|
* @covers \MediaWiki\Storage\RevisionStore::getSlotsQueryInfo
|
|
*/
|
|
public function testRevisionStoreGetSlotsQueryInfo(
|
|
$migrationStageSettings,
|
|
$options,
|
|
$expected
|
|
) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
|
|
$queryInfo = $store->getSlotsQueryInfo( $options );
|
|
$this->assertQueryInfoEquals( $expected, $queryInfo );
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideArchiveQueryInfo
|
|
* @covers \MediaWiki\Storage\RevisionStore::getArchiveQueryInfo
|
|
*/
|
|
public function testRevisionStoreGetArchiveQueryInfo( $migrationStageSettings, $expected ) {
|
|
$this->setMwGlobals( $migrationStageSettings );
|
|
$this->overrideMwServices();
|
|
|
|
$store = MediaWikiServices::getInstance()->getRevisionStore();
|
|
|
|
$queryInfo = $store->getArchiveQueryInfo();
|
|
$this->assertQueryInfoEquals( $expected, $queryInfo );
|
|
}
|
|
|
|
private function assertQueryInfoEquals( $expected, $queryInfo ) {
|
|
$this->assertArrayEqualsIgnoringIntKeyOrder(
|
|
$expected['tables'],
|
|
$queryInfo['tables'],
|
|
'tables'
|
|
);
|
|
$this->assertArrayEqualsIgnoringIntKeyOrder(
|
|
$expected['fields'],
|
|
$queryInfo['fields'],
|
|
'fields'
|
|
);
|
|
$this->assertArrayEqualsIgnoringIntKeyOrder(
|
|
$expected['joins'],
|
|
$queryInfo['joins'],
|
|
'joins'
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Assert that the two arrays passed are equal, ignoring the order of the values that integer
|
|
* keys.
|
|
*
|
|
* Note: Failures of this assertion can be slightly confusing as the arrays are actually
|
|
* split into a string key array and an int key array before assertions occur.
|
|
*
|
|
* @param array $expected
|
|
* @param array $actual
|
|
*/
|
|
private function assertArrayEqualsIgnoringIntKeyOrder(
|
|
array $expected,
|
|
array $actual,
|
|
$message = null
|
|
) {
|
|
$this->objectAssociativeSort( $expected );
|
|
$this->objectAssociativeSort( $actual );
|
|
|
|
// Separate the int key values from the string key values so that assertion failures are
|
|
// easier to understand.
|
|
$expectedIntKeyValues = [];
|
|
$actualIntKeyValues = [];
|
|
|
|
// Remove all int keys and re add them at the end after sorting by value
|
|
// This will result in all int keys being in the same order with same ints at the end of
|
|
// the array
|
|
foreach ( $expected as $key => $value ) {
|
|
if ( is_int( $key ) ) {
|
|
unset( $expected[$key] );
|
|
$expectedIntKeyValues[] = $value;
|
|
}
|
|
}
|
|
foreach ( $actual as $key => $value ) {
|
|
if ( is_int( $key ) ) {
|
|
unset( $actual[$key] );
|
|
$actualIntKeyValues[] = $value;
|
|
}
|
|
}
|
|
|
|
$this->objectAssociativeSort( $expected );
|
|
$this->objectAssociativeSort( $actual );
|
|
|
|
$this->objectAssociativeSort( $expectedIntKeyValues );
|
|
$this->objectAssociativeSort( $actualIntKeyValues );
|
|
|
|
$this->assertEquals( $expected, $actual, $message );
|
|
$this->assertEquals( $expectedIntKeyValues, $actualIntKeyValues, $message );
|
|
}
|
|
|
|
}
|