Merge "Replace wfGetLBFactory"

diff --combined maintenance/storage/orphanStats.php
index 9c1b538,9e3138e..219b47c
--- 1/maintenance/storage/orphanStats.php
--- 2/maintenance/storage/orphanStats.php
+++ b/maintenance/storage/orphanStats.php
@@@ -23,6 -23,8 +23,8 @@@
  
  require_once __DIR__ . '/../Maintenance.php';
  
+ use MediaWiki\MediaWikiServices;
+ 
  /**
   * Maintenance script that shows some statistics on the blob_orphans table,
   * created with trackBlobs.php.
@@@ -37,7 -39,8 +39,8 @@@ class OrphanStats extends Maintenance 
        }
  
        protected function &getDB( $cluster, $groups = [], $wiki = false ) {
-               $lb = wfGetLBFactory()->getExternalLB( $cluster );
+               $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+               $lb = $lbFactory->getExternalLB( $cluster );
  
                return $lb->getConnection( DB_REPLICA );
        }
@@@ -47,7 -50,7 +50,7 @@@
                if ( !$dbr->tableExists( 'blob_orphans' ) ) {
                        $this->fatalError( "blob_orphans doesn't seem to exist, need to run trackBlobs.php first" );
                }
 -              $res = $dbr->select( 'blob_orphans', '*', false, __METHOD__ );
 +              $res = $dbr->select( 'blob_orphans', '*', '', __METHOD__ );
  
                $num = 0;
                $totalSize = 0;

diff --combined maintenance/storage/trackBlobs.php
index ae6d2ff,7fe91bc..a1e157d
--- 1/maintenance/storage/trackBlobs.php
--- 2/maintenance/storage/trackBlobs.php
+++ b/maintenance/storage/trackBlobs.php
@@@ -22,6 -22,7 +22,7 @@@
   * @see wfWaitForSlaves()
   */
  
+ use MediaWiki\MediaWikiServices;
  use Wikimedia\Rdbms\DBConnectionError;
  
  require __DIR__ . '/../commandLine.inc';
@@@ -153,7 -154,7 +154,7 @@@ class TrackBlobs 
  
                $textClause = $this->getTextClause();
                $startId = 0;
 -              $endId = $dbr->selectField( 'revision', 'MAX(rev_id)', false, __METHOD__ );
 +              $endId = $dbr->selectField( 'revision', 'MAX(rev_id)', '', __METHOD__ );
                $batchesDone = 0;
                $rowsInserted = 0;
  
@@@ -229,7 -230,7 +230,7 @@@
  
                $textClause = $this->getTextClause( $this->clusters );
                $startId = 0;
 -              $endId = $dbr->selectField( 'text', 'MAX(old_id)', false, __METHOD__ );
 +              $endId = $dbr->selectField( 'text', 'MAX(old_id)', '', __METHOD__ );
                $rowsInserted = 0;
                $batchesDone = 0;
  
@@@ -317,7 -318,8 +318,8 @@@
  
                foreach ( $this->clusters as $cluster ) {
                        echo "Searching for orphan blobs in $cluster...\n";
-                       $lb = wfGetLBFactory()->getExternalLB( $cluster );
+                       $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+                       $lb = $lbFactory->getExternalLB( $cluster );
                        try {
                                $extDB = $lb->getConnection( DB_REPLICA );
                        } catch ( DBConnectionError $e ) {
@@@ -339,7 -341,7 +341,7 @@@
                        $startId = 0;
                        $batchesDone = 0;
                        $actualBlobs = gmp_init( 0 );
 -                      $endId = $extDB->selectField( $table, 'MAX(blob_id)', false, __METHOD__ );
 +                      $endId = $extDB->selectField( $table, 'MAX(blob_id)', '', __METHOD__ );
  
                        // Build a bitmap of actual blob rows
                        while ( true ) {