From 7782dee83b16928b413ea68f98856afffd16e67f Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 5 Mar 2015 13:08:41 -0800
Subject: [PATCH] Remove isVolatile/markVolatile logic from LocalFile

* This is obsoleted by the "latest" flag
* Follows-up 5085a4b

Bug: T88506
Change-Id: I808c3a6f0edb3466cb600c06c5e742ab030baf14
---
 includes/filerepo/file/LocalFile.php | 53 ----------------------------
 1 file changed, 53 deletions(-)

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 3056ad8407..e5ce22006b 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -124,14 +124,9 @@ class LocalFile extends File {
 	/** @var bool True if file is not present in file system. Not to be cached in memcached */
 	private $missing;
 
-	/** @var int UNIX timestamp of last markVolatile() call */
-	private $lastMarkedVolatile = 0;
-
 	// @note: higher than IDBAccessObject constants
 	const LOAD_ALL = 16; // integer; load all the lazy fields too (like metadata)
 
-	const VOLATILE_TTL = 300; // integer; seconds
-
 	/**
 	 * Create a LocalFile from a title
 	 * Do not call this except from inside a repo class.
@@ -531,10 +526,6 @@ class LocalFile extends File {
 	function load( $flags = 0 ) {
 		if ( !$this->dataLoaded ) {
 			if ( ( $flags & self::READ_LATEST ) || !$this->loadFromCache() ) {
-				// b/c for now for data consistency
-				if ( $this->isVolatile() ) {
-					$flags |= self::READ_LATEST;
-				}
 				$this->loadFromDB( $flags );
 				$this->saveToCache();
 			}
@@ -1866,8 +1857,6 @@ class LocalFile extends File {
 			} );
 		}
 
-		$this->markVolatile(); // file may change soon
-
 		return $this->lockedOwnTrx;
 	}
 
@@ -1886,48 +1875,6 @@ class LocalFile extends File {
 		}
 	}
 
-	/**
-	 * Mark a file as about to be changed
-	 *
-	 * This sets a cache key that alters master/slave DB loading behavior
-	 *
-	 * @return bool Success
-	 */
-	protected function markVolatile() {
-		global $wgMemc;
-
-		$key = $this->repo->getSharedCacheKey( 'file-volatile', md5( $this->getName() ) );
-		if ( $key ) {
-			$this->lastMarkedVolatile = time();
-			return $wgMemc->set( $key, $this->lastMarkedVolatile, self::VOLATILE_TTL );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if a file is about to be changed or has been changed recently
-	 *
-	 * @see LocalFile::isVolatile()
-	 * @return bool Whether the file is volatile
-	 */
-	protected function isVolatile() {
-		global $wgMemc;
-
-		$key = $this->repo->getSharedCacheKey( 'file-volatile', md5( $this->getName() ) );
-		if ( !$key ) {
-			// repo unavailable; bail.
-			return false;
-		}
-
-		if ( $this->lastMarkedVolatile === 0 ) {
-			$this->lastMarkedVolatile = $wgMemc->get( $key ) ?: 0;
-		}
-
-		$volatileDuration = time() - $this->lastMarkedVolatile;
-		return $volatileDuration <= self::VOLATILE_TTL;
-	}
-
 	/**
 	 * Roll back the DB transaction and mark the image unlocked
 	 */
-- 
2.20.1