Merge "Avoid DB_MASTER queries in User::newSystemUser() when possible"

diff --combined includes/user/User.php
index 99610c3,ce6bbc3..4d16594
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -693,19 -693,31 +693,31 @@@ class User implements IDBAccessObject 
                        return null;
                }
  
-               $fields = self::selectFields();
- 
-               $dbw = wfGetDB( DB_MASTER );
-               $row = $dbw->selectRow(
+               $dbr = wfGetDB( DB_REPLICA );
+               $row = $dbr->selectRow(
                        'user',
-                       $fields,
+                       self::selectFields(),
                        [ 'user_name' => $name ],
                        __METHOD__
                );
+               if ( !$row ) {
+                       // Try the master database...
+                       $dbw = wfGetDB( DB_MASTER );
+                       $row = $dbw->selectRow(
+                               'user',
+                               self::selectFields(),
+                               [ 'user_name' => $name ],
+                               __METHOD__
+                       );
+               }
+ 
                if ( !$row ) {
                        // No user. Create it?
-                       return $options['create'] ? self::createNew( $name, [ 'token' => self::INVALID_TOKEN ] ) : null;
+                       return $options['create']
+                               ? self::createNew( $name, [ 'token' => self::INVALID_TOKEN ] )
+                               : null;
                }
+ 
                $user = self::newFromRow( $row );
  
                // A user is considered to exist as a non-system user if it can
@@@ -1941,12 -1953,11 +1953,12 @@@
                $id = $this->getId();
                $userLimit = false;
                $isNewbie = $this->isNewbie();
 +              $cache = ObjectCache::getLocalClusterInstance();
  
                if ( $id == 0 ) {
                        // limits for anons
                        if ( isset( $limits['anon'] ) ) {
 -                              $keys[wfMemcKey( 'limiter', $action, 'anon' )] = $limits['anon'];
 +                              $keys[$cache->makeKey( 'limiter', $action, 'anon' )] = $limits['anon'];
                        }
                } else {
                        // limits for logged-in users
@@@ -1955,7 -1966,7 +1967,7 @@@
                        }
                        // limits for newbie logged-in users
                        if ( $isNewbie && isset( $limits['newbie'] ) ) {
 -                              $keys[wfMemcKey( 'limiter', $action, 'user', $id )] = $limits['newbie'];
 +                              $keys[$cache->makeKey( 'limiter', $action, 'user', $id )] = $limits['newbie'];
                        }
                }
  
@@@ -1992,7 -2003,7 +2004,7 @@@
                if ( $userLimit !== false ) {
                        list( $max, $period ) = $userLimit;
                        wfDebug( __METHOD__ . ": effective user limit: $max in {$period}s\n" );
 -                      $keys[wfMemcKey( 'limiter', $action, 'user', $id )] = $userLimit;
 +                      $keys[$cache->makeKey( 'limiter', $action, 'user', $id )] = $userLimit;
                }
  
                // ip-based limits for all ping-limitable users
@@@ -2019,6 -2030,8 +2031,6 @@@
                        }
                }
  
 -              $cache = ObjectCache::getLocalClusterInstance();
 -
                $triggered = false;
                foreach ( $keys as $key => $limit ) {
                        list( $max, $period ) = $limit;
@@@ -2527,9 -2540,8 +2539,9 @@@
        public function touch() {
                $id = $this->getId();
                if ( $id ) {
 -                      $key = wfMemcKey( 'user-quicktouched', 'id', $id );
 -                      ObjectCache::getMainWANInstance()->touchCheckKey( $key );
 +                      $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 +                      $key = $cache->makeKey( 'user-quicktouched', 'id', $id );
 +                      $cache->touchCheckKey( $key );
                        $this->mQuickTouched = null;
                }
        }
@@@ -2556,8 -2568,8 +2568,8 @@@
  
                if ( $this->mId ) {
                        if ( $this->mQuickTouched === null ) {
 -                              $key = wfMemcKey( 'user-quicktouched', 'id', $this->mId );
 -                              $cache = ObjectCache::getMainWANInstance();
 +                              $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 +                              $key = $cache->makeKey( 'user-quicktouched', 'id', $this->mId );
  
                                $this->mQuickTouched = wfTimestamp( TS_MW, $cache->getCheckKeyTime( $key ) );
                        }
@@@ -4170,10 -4182,6 +4182,10 @@@
                        $this->setToken(); // init token
                }
  
 +              if ( !is_string( $this->mName ) ) {
 +                      throw new RuntimeException( "User name field is not set." );
 +              }
 +
                $this->mTouched = $this->newTouchedTimestamp();
  
                $noPass = PasswordFactory::newInvalidPassword()->toString();