From 918fed0ab54257d848354f262c5f14b85ecbbdfb Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 22 Sep 2015 11:07:47 -0700 Subject: [PATCH] Moved LinksDeletionUpdate to a separate file * Also removed unused updateCategoryCounts() method Change-Id: I25f64d3771a23d18e7993433dab449adec375d9b --- autoload.php | 2 +- includes/deferred/LinksDeletionUpdate.php | 105 ++++++++++++++++++++++ includes/deferred/LinksUpdate.php | 96 -------------------- 3 files changed, 106 insertions(+), 97 deletions(-) create mode 100644 includes/deferred/LinksDeletionUpdate.php diff --git a/autoload.php b/autoload.php index bdcbe5a6e0..4bed0141bf 100644 --- a/autoload.php +++ b/autoload.php @@ -679,7 +679,7 @@ $wgAutoloadLocalClasses = array( 'LinkHolderArray' => __DIR__ . '/includes/parser/LinkHolderArray.php', 'LinkSearchPage' => __DIR__ . '/includes/specials/SpecialLinkSearch.php', 'Linker' => __DIR__ . '/includes/Linker.php', - 'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php', + 'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksDeletionUpdate.php', 'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php', 'ListDuplicatedFilesPage' => __DIR__ . '/includes/specials/SpecialListDuplicatedFiles.php', 'ListVariants' => __DIR__ . '/maintenance/language/listVariants.php', diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksDeletionUpdate.php new file mode 100644 index 0000000000..bbdfcf1705 --- /dev/null +++ b/includes/deferred/LinksDeletionUpdate.php @@ -0,0 +1,105 @@ +mPage = $page; + + if ( !$page->exists() ) { + throw new MWException( "Page ID not known, perhaps the page doesn't exist?" ); + } + } + + /** + * Do some database updates after deletion + */ + public function doUpdate() { + $title = $this->mPage->getTitle(); + $id = $this->mPage->getId(); + + # Delete restrictions for it + $this->mDb->delete( 'page_restrictions', array( 'pr_page' => $id ), __METHOD__ ); + + # Fix category table counts + $cats = array(); + $res = $this->mDb->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ ); + + foreach ( $res as $row ) { + $cats[] = $row->cl_to; + } + + $this->mPage->updateCategoryCounts( array(), $cats ); + + # If using cascading deletes, we can skip some explicit deletes + if ( !$this->mDb->cascadingDeletes() ) { + # Delete outgoing links + $this->mDb->delete( 'pagelinks', array( 'pl_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'imagelinks', array( 'il_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'categorylinks', array( 'cl_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'templatelinks', array( 'tl_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'externallinks', array( 'el_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'langlinks', array( 'll_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'iwlinks', array( 'iwl_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'redirect', array( 'rd_from' => $id ), __METHOD__ ); + $this->mDb->delete( 'page_props', array( 'pp_page' => $id ), __METHOD__ ); + } + + # If using cleanup triggers, we can skip some manual deletes + if ( !$this->mDb->cleanupTriggers() ) { + # Find recentchanges entries to clean up... + $rcIdsForTitle = $this->mDb->selectFieldValues( 'recentchanges', + 'rc_id', + array( + 'rc_type != ' . RC_LOG, + 'rc_namespace' => $title->getNamespace(), + 'rc_title' => $title->getDBkey() + ), + __METHOD__ + ); + $rcIdsForPage = $this->mDb->selectFieldValues( 'recentchanges', + 'rc_id', + array( 'rc_type != ' . RC_LOG, 'rc_cur_id' => $id ), + __METHOD__ + ); + + # T98706: delete PK to avoid lock contention with RC delete log insertions + $rcIds = array_merge( $rcIdsForTitle, $rcIdsForPage ); + if ( $rcIds ) { + $this->mDb->delete( 'recentchanges', array( 'rc_id' => $rcIds ), __METHOD__ ); + } + } + } +} \ No newline at end of file diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php index e9ec7ffa2b..be5aff3b13 100644 --- a/includes/deferred/LinksUpdate.php +++ b/includes/deferred/LinksUpdate.php @@ -935,99 +935,3 @@ class LinksUpdate extends SqlDataUpdate { } } } - -/** - * Update object handling the cleanup of links tables after a page was deleted. - **/ -class LinksDeletionUpdate extends SqlDataUpdate { - /** @var WikiPage The WikiPage that was deleted */ - protected $mPage; - - /** - * Constructor - * - * @param WikiPage $page Page we are updating - * @throws MWException - */ - function __construct( WikiPage $page ) { - parent::__construct( false ); // no implicit transaction - - $this->mPage = $page; - - if ( !$page->exists() ) { - throw new MWException( "Page ID not known, perhaps the page doesn't exist?" ); - } - } - - /** - * Do some database updates after deletion - */ - public function doUpdate() { - $title = $this->mPage->getTitle(); - $id = $this->mPage->getId(); - - # Delete restrictions for it - $this->mDb->delete( 'page_restrictions', array( 'pr_page' => $id ), __METHOD__ ); - - # Fix category table counts - $cats = array(); - $res = $this->mDb->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ ); - - foreach ( $res as $row ) { - $cats[] = $row->cl_to; - } - - $this->mPage->updateCategoryCounts( array(), $cats ); - - # If using cascading deletes, we can skip some explicit deletes - if ( !$this->mDb->cascadingDeletes() ) { - # Delete outgoing links - $this->mDb->delete( 'pagelinks', array( 'pl_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'imagelinks', array( 'il_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'categorylinks', array( 'cl_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'templatelinks', array( 'tl_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'externallinks', array( 'el_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'langlinks', array( 'll_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'iwlinks', array( 'iwl_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'redirect', array( 'rd_from' => $id ), __METHOD__ ); - $this->mDb->delete( 'page_props', array( 'pp_page' => $id ), __METHOD__ ); - } - - # If using cleanup triggers, we can skip some manual deletes - if ( !$this->mDb->cleanupTriggers() ) { - # Find recentchanges entries to clean up... - $rcIdsForTitle = $this->mDb->selectFieldValues( 'recentchanges', - 'rc_id', - array( - 'rc_type != ' . RC_LOG, - 'rc_namespace' => $title->getNamespace(), - 'rc_title' => $title->getDBkey() - ), - __METHOD__ - ); - $rcIdsForPage = $this->mDb->selectFieldValues( 'recentchanges', - 'rc_id', - array( 'rc_type != ' . RC_LOG, 'rc_cur_id' => $id ), - __METHOD__ - ); - - # T98706: delete PK to avoid lock contention with RC delete log insertions - $rcIds = array_merge( $rcIdsForTitle, $rcIdsForPage ); - if ( $rcIds ) { - $this->mDb->delete( 'recentchanges', array( 'rc_id' => $rcIds ), __METHOD__ ); - } - } - } - - /** - * Update all the appropriate counts in the category table. - * @param array $added Associative array of category name => sort key - * @param array $deleted Associative array of category name => sort key - */ - function updateCategoryCounts( $added, $deleted ) { - $a = WikiPage::factory( $this->mTitle ); - $a->updateCategoryCounts( - array_keys( $added ), array_keys( $deleted ) - ); - } -} -- 2.20.1