Merge "Do not run ipblocks cleanup randomly, just do it all the time"

diff --combined includes/Block.php
index e23a8ff,e0b63ff..4e878d1
--- 1/includes/Block.php
--- 2/includes/Block.php
+++ b/includes/Block.php
@@@ -206,25 -206,12 +206,25 @@@ class Block 
         * @return array
         */
        public static function selectFields() {
 +              global $wgActorTableSchemaMigrationStage;
 +
 +              if ( $wgActorTableSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
 +                      // If code is using this instead of self::getQueryInfo(), there's a
 +                      // decent chance it's going to try to directly access
 +                      // $row->ipb_by or $row->ipb_by_text and we can't give it
 +                      // useful values here once those aren't being written anymore.
 +                      throw new BadMethodCallException(
 +                              'Cannot use ' . __METHOD__ . ' when $wgActorTableSchemaMigrationStage > MIGRATION_WRITE_BOTH'
 +                      );
 +              }
 +
                wfDeprecated( __METHOD__, '1.31' );
                return [
                        'ipb_id',
                        'ipb_address',
                        'ipb_by',
                        'ipb_by_text',
 +                      'ipb_by_actor' => $wgActorTableSchemaMigrationStage > MIGRATION_OLD ? 'ipb_by_actor' : null,
                        'ipb_timestamp',
                        'ipb_auto',
                        'ipb_anon_only',
@@@ -249,12 -236,13 +249,12 @@@
         */
        public static function getQueryInfo() {
                $commentQuery = CommentStore::getStore()->getJoin( 'ipb_reason' );
 +              $actorQuery = ActorMigration::newMigration()->getJoin( 'ipb_by' );
                return [
 -                      'tables' => [ 'ipblocks' ] + $commentQuery['tables'],
 +                      'tables' => [ 'ipblocks' ] + $commentQuery['tables'] + $actorQuery['tables'],
                        'fields' => [
                                'ipb_id',
                                'ipb_address',
 -                              'ipb_by',
 -                              'ipb_by_text',
                                'ipb_timestamp',
                                'ipb_auto',
                                'ipb_anon_only',
@@@ -265,8 -253,8 +265,8 @@@
                                'ipb_block_email',
                                'ipb_allow_usertalk',
                                'ipb_parent_block_id',
 -                      ] + $commentQuery['fields'],
 -                      'joins' => $commentQuery['joins'],
 +                      ] + $commentQuery['fields'] + $actorQuery['fields'],
 +                      'joins' => $commentQuery['joins'] + $actorQuery['joins'],
                ];
        }
  
@@@ -457,9 -445,11 +457,9 @@@
         */
        protected function initFromRow( $row ) {
                $this->setTarget( $row->ipb_address );
 -              if ( $row->ipb_by ) { // local user
 -                      $this->setBlocker( User::newFromId( $row->ipb_by ) );
 -              } else { // foreign user
 -                      $this->setBlocker( $row->ipb_by_text );
 -              }
 +              $this->setBlocker( User::newFromAnyId(
 +                      $row->ipb_by, $row->ipb_by_text, isset( $row->ipb_by_actor ) ? $row->ipb_by_actor : null
 +              ) );
  
                $this->mTimestamp = wfTimestamp( TS_MW, $row->ipb_timestamp );
                $this->mAuto = $row->ipb_auto;
@@@ -529,9 -519,6 +529,9 @@@
                if ( $this->getSystemBlockType() !== null ) {
                        throw new MWException( 'Cannot insert a system block into the database' );
                }
 +              if ( !$this->getBlocker() || $this->getBlocker()->getName() === '' ) {
 +                      throw new MWException( 'Cannot insert a block without a blocker set' );
 +              }
  
                wfDebug( "Block::insert; timestamp {$this->mTimestamp}\n" );
  
@@@ -539,10 -526,7 +539,7 @@@
                        $dbw = wfGetDB( DB_MASTER );
                }
  
-               # Periodic purge via commit hooks
-               if ( mt_rand( 0, 9 ) == 0 ) {
-                       self::purgeExpired();
-               }
+               self::purgeExpired();
  
                $row = $this->getDatabaseArray( $dbw );
  
@@@ -653,6 -637,8 +650,6 @@@
                $a = [
                        'ipb_address'          => (string)$this->target,
                        'ipb_user'             => $uid,
 -                      'ipb_by'               => $this->getBy(),
 -                      'ipb_by_text'          => $this->getByName(),
                        'ipb_timestamp'        => $dbw->timestamp( $this->mTimestamp ),
                        'ipb_auto'             => $this->mAuto,
                        'ipb_anon_only'        => !$this->isHardblock(),
@@@ -665,8 -651,7 +662,8 @@@
                        'ipb_block_email'      => $this->prevents( 'sendemail' ),
                        'ipb_allow_usertalk'   => !$this->prevents( 'editownusertalk' ),
                        'ipb_parent_block_id'  => $this->mParentBlockId
 -              ] + CommentStore::getStore()->insert( $dbw, 'ipb_reason', $this->mReason );
 +              ] + CommentStore::getStore()->insert( $dbw, 'ipb_reason', $this->mReason )
 +                      + ActorMigration::newMigration()->getInsertValues( $dbw, 'ipb_by', $this->getBlocker() );
  
                return $a;
        }
@@@ -677,11 -662,12 +674,11 @@@
         */
        protected function getAutoblockUpdateArray( IDatabase $dbw ) {
                return [
 -                      'ipb_by'               => $this->getBy(),
 -                      'ipb_by_text'          => $this->getByName(),
                        'ipb_create_account'   => $this->prevents( 'createaccount' ),
                        'ipb_deleted'          => (int)$this->mHideName, // typecast required for SQLite
                        'ipb_allow_usertalk'   => !$this->prevents( 'editownusertalk' ),
 -              ] + CommentStore::getStore()->insert( $dbw, 'ipb_reason', $this->mReason );
 +              ] + CommentStore::getStore()->insert( $dbw, 'ipb_reason', $this->mReason )
 +                      + ActorMigration::newMigration()->getInsertValues( $dbw, 'ipb_by', $this->getBlocker() );
        }
  
        /**
@@@ -721,27 -707,16 +718,27 @@@
                        return;
                }
  
 +              $target = $block->getTarget();
 +              if ( is_string( $target ) ) {
 +                      $target = User::newFromName( $target, false );
 +              }
 +
                $dbr = wfGetDB( DB_REPLICA );
 +              $rcQuery = ActorMigration::newMigration()->getWhere( $dbr, 'rc_user', $target, false );
  
                $options = [ 'ORDER BY' => 'rc_timestamp DESC' ];
 -              $conds = [ 'rc_user_text' => (string)$block->getTarget() ];
  
                // Just the last IP used.
                $options['LIMIT'] = 1;
  
 -              $res = $dbr->select( 'recentchanges', [ 'rc_ip' ], $conds,
 -                      __METHOD__, $options );
 +              $res = $dbr->select(
 +                      [ 'recentchanges' ] + $rcQuery['tables'],
 +                      [ 'rc_ip' ],
 +                      $rcQuery['conds'],
 +                      __METHOD__,
 +                      $options,
 +                      $rcQuery['joins']
 +              );
  
                if ( !$res->numRows() ) {
                        # No results, don't autoblock anything
@@@ -1141,11 -1116,14 +1138,14 @@@
                        wfGetDB( DB_MASTER ),
                        __METHOD__,
                        function ( IDatabase $dbw, $fname ) {
-                               $dbw->delete(
-                                       'ipblocks',
+                               $ids = $dbw->selectFieldValues( 'ipblocks',
+                                       'ipb_id',
                                        [ 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ],
                                        $fname
                                );
+                               if ( $ids ) {
+                                       $dbw->delete( 'ipblocks', [ 'ipb_id' => $ids ], $fname );
+                               }
                        }
                ) );
        }
@@@ -1493,7 -1471,7 +1493,7 @@@
  
        /**
         * Get the user who implemented this block
 -       * @return User|string Local User object or string for a foreign user
 +       * @return User User object. May name a foreign user.
         */
        public function getBlocker() {
                return $this->blocker;