Merge "Remove un-needed cast for array key in WatchedItemStore"

diff --combined includes/WatchedItemStore.php
index 2180b2d,9e21f14..fcf6d3b
--- 1/includes/WatchedItemStore.php
--- 2/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@@ -1,7 -1,5 +1,7 @@@
  <?php
  
 +use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 +use MediaWiki\Linker\LinkTarget;
  use Wikimedia\Assert\Assert;
  
  /**
@@@ -12,10 -10,7 +12,10 @@@
   *
   * @since 1.27
   */
 -class WatchedItemStore {
 +class WatchedItemStore implements StatsdAwareInterface {
 +
 +      const SORT_DESC = 'DESC';
 +      const SORT_ASC = 'ASC';
  
        /**
         * @var LoadBalancer
@@@ -45,11 -40,6 +45,11 @@@
         */
        private $revisionGetTimestampFromIdCallback;
  
 +      /**
 +       * @var StatsdDataFactoryInterface
 +       */
 +      private $stats;
 +
        /**
         * @var self|null
         */
@@@ -65,15 -55,10 +65,15 @@@
        ) {
                $this->loadBalancer = $loadBalancer;
                $this->cache = $cache;
 +              $this->stats = new NullStatsdDataFactory();
                $this->deferredUpdatesAddCallableUpdateCallback = [ 'DeferredUpdates', 'addCallableUpdate' ];
                $this->revisionGetTimestampFromIdCallback = [ 'Revision', 'getTimestampFromId' ];
        }
  
 +      public function setStatsdDataFactory( StatsdDataFactoryInterface $stats ) {
 +              $this->stats = $stats;
 +      }
 +
        /**
         * Overrides the DeferredUpdates::addCallableUpdate callback
         * This is intended for use while testing and will fail if MW_PHPUNIT_TEST is not defined.
@@@ -160,7 -145,6 +160,7 @@@
                                wfGetLB(),
                                new HashBagOStuff( [ 'maxKeys' => 100 ] )
                        );
 +                      self::$instance->setStatsdDataFactory( RequestContext::getMain()->getStats() );
                }
                return self::$instance;
        }
@@@ -179,22 -163,18 +179,22 @@@
                $key = $this->getCacheKey( $user, $target );
                $this->cache->set( $key, $item );
                $this->cacheIndex[$target->getNamespace()][$target->getDBkey()][$user->getId()] = $key;
 +              $this->stats->increment( 'WatchedItemStore.cache' );
        }
  
        private function uncache( User $user, LinkTarget $target ) {
                $this->cache->delete( $this->getCacheKey( $user, $target ) );
                unset( $this->cacheIndex[$target->getNamespace()][$target->getDBkey()][$user->getId()] );
 +              $this->stats->increment( 'WatchedItemStore.uncache' );
        }
  
        private function uncacheLinkTarget( LinkTarget $target ) {
                if ( !isset( $this->cacheIndex[$target->getNamespace()][$target->getDBkey()] ) ) {
                        return;
                }
 +              $this->stats->increment( 'WatchedItemStore.uncacheLinkTarget' );
                foreach ( $this->cacheIndex[$target->getNamespace()][$target->getDBkey()] as $key ) {
 +                      $this->stats->increment( 'WatchedItemStore.uncacheLinkTarget.items' );
                        $this->cache->delete( $key );
                }
        }
@@@ -468,10 -448,8 +468,10 @@@
  
                $cached = $this->getCached( $user, $target );
                if ( $cached ) {
 +                      $this->stats->increment( 'WatchedItemStore.getWatchedItem.cached' );
                        return $cached;
                }
 +              $this->stats->increment( 'WatchedItemStore.getWatchedItem.load' );
                return $this->loadWatchedItem( $user, $target );
        }
  
@@@ -516,34 -494,18 +516,34 @@@
         * @param User $user
         * @param array $options Allowed keys:
         *        'forWrite' => bool defaults to false
 +       *        'sort' => string optional sorting by namespace ID and title
 +       *                     one of the self::SORT_* constants
         *
         * @return WatchedItem[]
         */
        public function getWatchedItemsForUser( User $user, array $options = [] ) {
                $options += [ 'forWrite' => false ];
  
 +              $dbOptions = [];
 +              if ( array_key_exists( 'sort', $options ) ) {
 +                      Assert::parameter(
 +                              ( in_array( $options['sort'], [ self::SORT_ASC, self::SORT_DESC ] ) ),
 +                              '$options[\'sort\']',
 +                              'must be SORT_ASC or SORT_DESC'
 +                      );
 +                      $dbOptions['ORDER BY'] = [
 +                              "wl_namespace {$options['sort']}",
 +                              "wl_title {$options['sort']}"
 +                      ];
 +              }
                $db = $this->getConnection( $options['forWrite'] ? DB_MASTER : DB_SLAVE );
 +
                $res = $db->select(
                        'watchlist',
                        [ 'wl_namespace', 'wl_title', 'wl_notificationtimestamp' ],
                        [ 'wl_user' => $user->getId() ],
 -                      __METHOD__
 +                      __METHOD__,
 +                      $dbOptions
                );
                $this->reuseConnection( $db );
  
@@@ -621,7 -583,7 +621,7 @@@
                $this->reuseConnection( $dbr );
  
                foreach ( $res as $row ) {
-                       $timestamps[(int)$row->wl_namespace][$row->wl_title] = $row->wl_notificationtimestamp;
+                       $timestamps[$row->wl_namespace][$row->wl_title] = $row->wl_notificationtimestamp;
                }
  
                return $timestamps;
@@@ -634,30 -596,30 +634,30 @@@
         * @param LinkTarget $target
         */
        public function addWatch( User $user, LinkTarget $target ) {
 -              $this->addWatchBatch( [ [ $user, $target ] ] );
 +              $this->addWatchBatchForUser( $user, [ $target ] );
        }
  
        /**
 -       * @param array[] $userTargetCombinations array of arrays containing [0] => User [1] => LinkTarget
 +       * @param User $user
 +       * @param LinkTarget[] $targets
         *
         * @return bool success
         */
 -      public function addWatchBatch( array $userTargetCombinations ) {
 +      public function addWatchBatchForUser( User $user, array $targets ) {
                if ( $this->loadBalancer->getReadOnlyReason() !== false ) {
                        return false;
                }
 +              // Only loggedin user can have a watchlist
 +              if ( $user->isAnon() ) {
 +                      return false;
 +              }
 +
 +              if ( !$targets ) {
 +                      return true;
 +              }
  
                $rows = [];
 -              foreach ( $userTargetCombinations as list( $user, $target ) ) {
 -                      /**
 -                       * @var User $user
 -                       * @var LinkTarget $target
 -                       */
 -
 -                      // Only loggedin user can have a watchlist
 -                      if ( $user->isAnon() ) {
 -                              continue;
 -                      }
 +              foreach ( $targets as $target ) {
                        $rows[] = [
                                'wl_user' => $user->getId(),
                                'wl_namespace' => $target->getNamespace(),
@@@ -667,6 -629,10 +667,6 @@@
                        $this->uncache( $user, $target );
                }
  
 -              if ( !$rows ) {
 -                      return false;
 -              }
 -
                $dbw = $this->getConnection( DB_MASTER );
                foreach ( array_chunk( $rows, 100 ) as $toInsert ) {
                        // Use INSERT IGNORE to avoid overwriting the notification timestamp
@@@ -906,8 -872,12 +906,8 @@@
         * @param LinkTarget $newTarget
         */
        public function duplicateAllAssociatedEntries( LinkTarget $oldTarget, LinkTarget $newTarget ) {
 -              if ( !$oldTarget instanceof Title ) {
 -                      $oldTarget = Title::newFromLinkTarget( $oldTarget );
 -              }
 -              if ( !$newTarget instanceof Title ) {
 -                      $newTarget = Title::newFromLinkTarget( $newTarget );
 -              }
 +              $oldTarget = Title::newFromLinkTarget( $oldTarget );
 +              $newTarget = Title::newFromLinkTarget( $newTarget );
  
                $this->duplicateEntry( $oldTarget->getSubjectPage(), $newTarget->getSubjectPage() );
                $this->duplicateEntry( $oldTarget->getTalkPage(), $newTarget->getTalkPage() );