Merge "Remove unused ApiStashEdit variable"

diff --combined includes/api/ApiStashEdit.php
index 701f0a9,6ca9c7c..8822750
--- 1/includes/api/ApiStashEdit.php
--- 2/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@@ -41,8 -41,6 +41,6 @@@ class ApiStashEdit extends ApiBase 
        const ERROR_UNCACHEABLE = 'uncacheable';
  
        public function execute() {
-               $cache = ObjectCache::getLocalClusterInstance();
- 
                $user = $this->getUser();
                $params = $this->extractRequestParams();
  
@@@ -252,7 -250,6 +250,7 @@@
        public static function checkCache( Title $title, Content $content, User $user ) {
                $cache = ObjectCache::getLocalClusterInstance();
                $logger = LoggerFactory::getInstance( 'StashEdit' );
 +              $stats = RequestContext::getMain()->getStats();
  
                $key = self::getStashKey( $title, $content, $user );
                $editInfo = $cache->get( $key );
@@@ -268,20 -265,19 +266,20 @@@
                                $editInfo = $cache->get( $key );
                                $dbw->unlock( $key, __METHOD__ );
                        }
 -                      $sec = microtime( true ) - $start;
 -                      if ( $sec > .01 ) {
 -                              $logger->warning( "Waited $sec seconds on '$key'." );
 -                      }
 +
 +                      $timeMs = 1000 * max( 0, microtime( true ) - $start );
 +                      $stats->timing( 'editstash.lock-wait-time', $timeMs );
                }
  
                if ( !is_object( $editInfo ) || !$editInfo->output ) {
 +                      $stats->increment( 'editstash.cache-misses' );
                        $logger->debug( "No cache value for key '$key'." );
                        return false;
                }
  
                $time = wfTimestamp( TS_UNIX, $editInfo->output->getTimestamp() );
                if ( ( time() - $time ) <= 3 ) {
 +                      $stats->increment( 'editstash.cache-hits' );
                        $logger->debug( "Timestamp-based cache hit for key '$key'." );
                        return $editInfo; // assume nothing changed
                }
@@@ -310,7 -306,6 +308,7 @@@
                        }
  
                        if ( $changed || $res->numRows() != $templateUses ) {
 +                              $stats->increment( 'editstash.cache-misses' );
                                $logger->info( "Stale cache for key '$key'; template changed." );
                                return false;
                        }
@@@ -334,13 -329,11 +332,13 @@@
                        }
  
                        if ( $changed || $res->numRows() != count( $files ) ) {
 +                              $stats->increment( 'editstash.cache-misses' );
                                $logger->info( "Stale cache for key '$key'; file changed." );
                                return false;
                        }
                }
  
 +              $stats->increment( 'editstash.cache-hits' );
                $logger->debug( "Cache hit for key '$key'." );
  
                return $editInfo;