Merge "Migrate Api modules from tag_summary table to change_tag"

diff --combined includes/api/ApiQueryAllDeletedRevisions.php
index 70a77ad,066a644..7a1c461
--- 1/includes/api/ApiQueryAllDeletedRevisions.php
--- 2/includes/api/ApiQueryAllDeletedRevisions.php
+++ b/includes/api/ApiQueryAllDeletedRevisions.php
@@@ -43,6 -43,8 +43,6 @@@ class ApiQueryAllDeletedRevisions exten
         * @return void
         */
        protected function run( ApiPageSet $resultPageSet = null ) {
 -              global $wgChangeTagsSchemaMigrationStage;
 -
                // Before doing anything at all, let's check permissions
                $this->checkUserRightsAny( 'deletedhistory' );
  
@@@ -125,11 -127,7 +125,7 @@@
                }
  
                if ( $this->fld_tags ) {
-                       $this->addTables( 'tag_summary' );
-                       $this->addJoinConds(
-                               [ 'tag_summary' => [ 'LEFT JOIN', [ 'ar_rev_id=ts_rev_id' ] ] ]
-                       );
-                       $this->addFields( 'ts_tags' );
+                       $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'archive' ) ] );
                }
  
                if ( !is_null( $params['tag'] ) ) {
@@@ -137,12 -135,16 +133,12 @@@
                        $this->addJoinConds(
                                [ 'change_tag' => [ 'INNER JOIN', [ 'ar_rev_id=ct_rev_id' ] ] ]
                        );
 -                      if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 -                              $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 -                              try {
 -                                      $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 -                              } catch ( NameTableAccessException $exception ) {
 -                                      // Return nothing.
 -                                      $this->addWhere( '1=0' );
 -                              }
 -                      } else {
 -                              $this->addWhereFld( 'ct_tag', $params['tag'] );
 +                      $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 +                      try {
 +                              $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 +                      } catch ( NameTableAccessException $exception ) {
 +                              // Return nothing.
 +                              $this->addWhere( '1=0' );
                        }
                }
  

diff --combined includes/api/ApiQueryDeletedRevisions.php
index e7d710d,518c428..9275a7c
--- 1/includes/api/ApiQueryDeletedRevisions.php
--- 2/includes/api/ApiQueryDeletedRevisions.php
+++ b/includes/api/ApiQueryDeletedRevisions.php
@@@ -39,6 -39,8 +39,6 @@@ class ApiQueryDeletedRevisions extends 
        }
  
        protected function run( ApiPageSet $resultPageSet = null ) {
 -              global $wgChangeTagsSchemaMigrationStage;
 -
                $user = $this->getUser();
                // Before doing anything at all, let's check permissions
                $this->checkUserRightsAny( 'deletedhistory' );
@@@ -77,11 -79,7 +77,7 @@@
                }
  
                if ( $this->fld_tags ) {
-                       $this->addTables( 'tag_summary' );
-                       $this->addJoinConds(
-                               [ 'tag_summary' => [ 'LEFT JOIN', [ 'ar_rev_id=ts_rev_id' ] ] ]
-                       );
-                       $this->addFields( 'ts_tags' );
+                       $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'archive' ) ] );
                }
  
                if ( !is_null( $params['tag'] ) ) {
@@@ -89,12 -87,16 +85,12 @@@
                        $this->addJoinConds(
                                [ 'change_tag' => [ 'INNER JOIN', [ 'ar_rev_id=ct_rev_id' ] ] ]
                        );
 -                      if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 -                              $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 -                              try {
 -                                      $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 -                              } catch ( NameTableAccessException $exception ) {
 -                                      // Return nothing.
 -                                      $this->addWhere( '1=0' );
 -                              }
 -                      } else {
 -                              $this->addWhereFld( 'ct_tag', $params['tag'] );
 +                      $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 +                      try {
 +                              $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 +                      } catch ( NameTableAccessException $exception ) {
 +                              // Return nothing.
 +                              $this->addWhere( '1=0' );
                        }
                }
  

diff --combined includes/api/ApiQueryDeletedrevs.php
index 1da252e,856653e..8540190
--- 1/includes/api/ApiQueryDeletedrevs.php
--- 2/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@@ -36,6 -36,8 +36,6 @@@ class ApiQueryDeletedrevs extends ApiQu
        }
  
        public function execute() {
 -              global $wgChangeTagsSchemaMigrationStage;
 -
                // Before doing anything at all, let's check permissions
                $this->checkUserRightsAny( 'deletedhistory' );
  
@@@ -131,11 -133,7 +131,7 @@@
                }
  
                if ( $fld_tags ) {
-                       $this->addTables( 'tag_summary' );
-                       $this->addJoinConds(
-                               [ 'tag_summary' => [ 'LEFT JOIN', [ 'ar_rev_id=ts_rev_id' ] ] ]
-                       );
-                       $this->addFields( 'ts_tags' );
+                       $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'archive' ) ] );
                }
  
                if ( !is_null( $params['tag'] ) ) {
@@@ -143,12 -141,16 +139,12 @@@
                        $this->addJoinConds(
                                [ 'change_tag' => [ 'INNER JOIN', [ 'ar_rev_id=ct_rev_id' ] ] ]
                        );
 -                      if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 -                              $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 -                              try {
 -                                      $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 -                              } catch ( NameTableAccessException $exception ) {
 -                                      // Return nothing.
 -                                      $this->addWhere( '1=0' );
 -                              }
 -                      } else {
 -                              $this->addWhereFld( 'ct_tag', $params['tag'] );
 +                      $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 +                      try {
 +                              $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 +                      } catch ( NameTableAccessException $exception ) {
 +                              // Return nothing.
 +                              $this->addWhere( '1=0' );
                        }
                }
  

diff --combined includes/api/ApiQueryRecentChanges.php
index e33df5c,303668e..7c6b463
--- 1/includes/api/ApiQueryRecentChanges.php
--- 2/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@@ -143,6 -143,8 +143,6 @@@ class ApiQueryRecentChanges extends Api
         * @param ApiPageSet|null $resultPageSet
         */
        public function run( $resultPageSet = null ) {
 -              global $wgChangeTagsSchemaMigrationStage;
 -
                $user = $this->getUser();
                /* Get the parameters of the request. */
                $params = $this->extractRequestParams();
@@@ -337,9 -339,7 +337,7 @@@
                        $resultPageSet && $params['generaterevisions'] );
  
                if ( $this->fld_tags ) {
-                       $this->addTables( 'tag_summary' );
-                       $this->addJoinConds( [ 'tag_summary' => [ 'LEFT JOIN', [ 'rc_id=ts_rc_id' ] ] ] );
-                       $this->addFields( 'ts_tags' );
+                       $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'recentchanges' ) ] );
                }
  
                if ( $this->fld_sha1 ) {
@@@ -363,12 -363,16 +361,12 @@@
                if ( !is_null( $params['tag'] ) ) {
                        $this->addTables( 'change_tag' );
                        $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN', [ 'rc_id=ct_rc_id' ] ] ] );
 -                      if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 -                              $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 -                              try {
 -                                      $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 -                              } catch ( NameTableAccessException $exception ) {
 -                                      // Return nothing.
 -                                      $this->addWhere( '1=0' );
 -                              }
 -                      } else {
 -                              $this->addWhereFld( 'ct_tag', $params['tag'] );
 +                      $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 +                      try {
 +                              $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 +                      } catch ( NameTableAccessException $exception ) {
 +                              // Return nothing.
 +                              $this->addWhere( '1=0' );
                        }
                }
  

diff --combined includes/api/ApiQueryRevisions.php
index a6bf58a,825e23d..cb2f616
--- 1/includes/api/ApiQueryRevisions.php
--- 2/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@@ -84,7 -84,7 +84,7 @@@ class ApiQueryRevisions extends ApiQuer
        }
  
        protected function run( ApiPageSet $resultPageSet = null ) {
 -              global $wgActorTableSchemaMigrationStage, $wgChangeTagsSchemaMigrationStage;
 +              global $wgActorTableSchemaMigrationStage;
  
                $params = $this->extractRequestParams( false );
                $revisionStore = MediaWikiServices::getInstance()->getRevisionStore();
@@@ -185,11 -185,7 +185,7 @@@
                }
  
                if ( $this->fld_tags ) {
-                       $this->addTables( 'tag_summary' );
-                       $this->addJoinConds(
-                               [ 'tag_summary' => [ 'LEFT JOIN', [ 'rev_id=ts_rev_id' ] ] ]
-                       );
-                       $this->addFields( 'ts_tags' );
+                       $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'revision' ) ] );
                }
  
                if ( $params['tag'] !== null ) {
@@@ -197,12 -193,16 +193,12 @@@
                        $this->addJoinConds(
                                [ 'change_tag' => [ 'INNER JOIN', [ 'rev_id=ct_rev_id' ] ] ]
                        );
 -                      if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 -                              $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 -                              try {
 -                                      $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 -                              } catch ( NameTableAccessException $exception ) {
 -                                      // Return nothing.
 -                                      $this->addWhere( '1=0' );
 -                              }
 -                      } else {
 -                              $this->addWhereFld( 'ct_tag', $params['tag'] );
 +                      $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 +                      try {
 +                              $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
 +                      } catch ( NameTableAccessException $exception ) {
 +                              // Return nothing.
 +                              $this->addWhere( '1=0' );
                        }
                }
  

diff --combined includes/api/ApiQueryUserContribs.php
index ae7c580,95315f3..ed83130
--- 1/includes/api/ApiQueryUserContribs.php
--- 2/includes/api/ApiQueryUserContribs.php
+++ b/includes/api/ApiQueryUserContribs.php
@@@ -321,7 -321,7 +321,7 @@@ class ApiQueryUserContribs extends ApiQ
         * @param int $limit
         */
        private function prepareQuery( array $users, $limit ) {
 -              global $wgActorTableSchemaMigrationStage, $wgChangeTagsSchemaMigrationStage;
 +              global $wgActorTableSchemaMigrationStage;
  
                $this->resetQueryParams();
                $db = $this->getDB();
@@@ -478,11 -478,7 +478,7 @@@
                $this->addFieldsIf( 'rc_patrolled', $this->fld_patrolled );
  
                if ( $this->fld_tags ) {
-                       $this->addTables( 'tag_summary' );
-                       $this->addJoinConds(
-                               [ 'tag_summary' => [ 'LEFT JOIN', [ $idField . ' = ts_rev_id' ] ] ]
-                       );
-                       $this->addFields( 'ts_tags' );
+                       $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'revision' ) ] );
                }
  
                if ( isset( $this->params['tag'] ) ) {
@@@ -490,12 -486,16 +486,12 @@@
                        $this->addJoinConds(
                                [ 'change_tag' => [ 'INNER JOIN', [ $idField . ' = ct_rev_id' ] ] ]
                        );
 -                      if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 -                              $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 -                              try {
 -                                      $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $this->params['tag'] ) );
 -                              } catch ( NameTableAccessException $exception ) {
 -                                      // Return nothing.
 -                                      $this->addWhere( '1=0' );
 -                              }
 -                      } else {
 -                              $this->addWhereFld( 'ct_tag', $this->params['tag'] );
 +                      $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
 +                      try {
 +                              $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $this->params['tag'] ) );
 +                      } catch ( NameTableAccessException $exception ) {
 +                              // Return nothing.
 +                              $this->addWhere( '1=0' );
                        }
                }
        }