Merge "Make internal search methods private for db implementations"

[lhc/web/wiklou.git] / includes / deferred / LinksDeletionUpdate.php

diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksDeletionUpdate.php
index f579a1f..3c86d11 100644 (file)
--- a/includes/deferred/LinksDeletionUpdate.php
+++ b/includes/deferred/LinksDeletionUpdate.php
@@ -91,18 +91,17 @@ class LinksDeletionUpdate extends DataUpdate implements EnqueueableDataUpdate {
                        $this->page->updateCategoryCounts( [], $catBatch, $id );
                        if ( count( $catBatches ) > 1 ) {
                                $lbFactory->commitAndWaitForReplication(
-                                       __METHOD__, $this->ticket, [ 'wiki' => $dbw->getWikiID() ]
+                                       __METHOD__, $this->ticket, [ 'domain' => $dbw->getDomainID() ]
                                );
                        }
                }
 
-               // Refresh the category table entry if it seems to have no pages. Check
-               // master for the most up-to-date cat_pages count.
+               // Refresh counts on categories that should be empty now
                if ( $title->getNamespace() === NS_CATEGORY ) {
                        $row = $dbw->selectRow(
                                'category',
                                [ 'cat_id', 'cat_title', 'cat_pages', 'cat_subcats', 'cat_files' ],
-                               [ 'cat_title' => $title->getDBkey(), 'cat_pages <= 0' ],
+                               [ 'cat_title' => $title->getDBkey(), 'cat_pages <= 100' ],
                                __METHOD__
                        );
                        if ( $row ) {
@@ -187,7 +186,7 @@ class LinksDeletionUpdate extends DataUpdate implements EnqueueableDataUpdate {
                        $dbw->delete( 'recentchanges', [ 'rc_id' => $rcIdBatch ], __METHOD__ );
                        if ( count( $rcIdBatches ) > 1 ) {
                                $lbFactory->commitAndWaitForReplication(
-                                       __METHOD__, $this->ticket, [ 'wiki' => $dbw->getWikiID() ]
+                                       __METHOD__, $this->ticket, [ 'domain' => $dbw->getDomainID() ]
                                );
                        }
                }
@@ -209,7 +208,7 @@ class LinksDeletionUpdate extends DataUpdate implements EnqueueableDataUpdate {
                        if ( count( $pkDeleteConds ) >= $bSize ) {
                                $dbw->delete( $table, $dbw->makeList( $pkDeleteConds, LIST_OR ), __METHOD__ );
                                $lbFactory->commitAndWaitForReplication(
-                                       __METHOD__, $this->ticket, [ 'wiki' => $dbw->getWikiID() ]
+                                       __METHOD__, $this->ticket, [ 'domain' => $dbw->getDomainID() ]
                                );
                                $pkDeleteConds = [];
                        }
@@ -230,7 +229,7 @@ class LinksDeletionUpdate extends DataUpdate implements EnqueueableDataUpdate {
 
        public function getAsJobSpecification() {
                return [
-                       'wiki' => $this->getDB()->getWikiID(),
+                       'wiki' => WikiMap::getWikiIdFromDomain( $this->getDB()->getDomainID() ),
                        'job'  => new JobSpecification(
                                'deleteLinks',
                                [ 'pageId' => $this->pageId, 'timestamp' => $this->timestamp ],