From: Brion VIBBER <brion@wikimedia.org>
Date: Thu, 24 May 2012 21:08:40 +0000 (+0000)
Subject: Merge "[FileBackend] Added getScopedLocksForOps() function."
X-Git-Tag: 1.31.0-rc.0~23515
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=b47a2148c68b7bc58b12ec77fa3fe159f834e4e7;hp=af16ce7257634e9d5bef5266f8e3c4d84b93d9d2;p=lhc%2Fweb%2Fwiklou.git

Merge "[FileBackend] Added getScopedLocksForOps() function."
---

diff --git a/includes/filerepo/backend/FileBackend.php b/includes/filerepo/backend/FileBackend.php
index 81fbcedda6..42ddcbf812 100644
--- a/includes/filerepo/backend/FileBackend.php
+++ b/includes/filerepo/backend/FileBackend.php
@@ -794,6 +794,24 @@ abstract class FileBackend {
 		return ScopedLock::factory( $this->lockManager, $paths, $type, $status );
 	}
 
+	/**
+	 * Get an array of scoped locks needed for a batch of file operations.
+	 *
+	 * Normally, FileBackend::doOperations() handles locking, unless
+	 * the 'nonLocking' param is passed in. This function is useful if you
+	 * want the files to be locked for a broader scope than just when the
+	 * files are changing. For example, if you need to update DB metadata,
+	 * you may want to keep the files locked until finished.
+	 *
+	 * @see FileBackend::doOperations()
+	 *
+	 * @param $ops Array List of file operations to FileBackend::doOperations()
+	 * @param $status Status Status to update on lock/unlock
+	 * @return Array List of ScopedFileLocks or null values
+	 * @since 1.20
+	 */
+	abstract public function getScopedLocksForOps( array $ops, Status $status );
+
 	/**
 	 * Get the root storage path of this backend.
 	 * All container paths are "subdirectories" of this path.
diff --git a/includes/filerepo/backend/FileBackendMultiWrite.php b/includes/filerepo/backend/FileBackendMultiWrite.php
index 59406d6377..efc6053f40 100644
--- a/includes/filerepo/backend/FileBackendMultiWrite.php
+++ b/includes/filerepo/backend/FileBackendMultiWrite.php
@@ -506,4 +506,20 @@ class FileBackendMultiWrite extends FileBackend {
 			$backend->clearCache( $realPaths );
 		}
 	}
+
+	/**
+	 * @see FileBackend::getScopedLocksForOps()
+	 */
+	public function getScopedLocksForOps( array $ops, Status $status ) {
+		$fileOps = $this->backends[$this->masterIndex]->getOperationsInternal( $ops );
+		// Get the paths to lock from the master backend
+		$paths = $this->backends[$this->masterIndex]->getPathsToLockForOpsInternal( $fileOps );
+		// Get the paths under the proxy backend's name
+		$paths['sh'] = $this->unsubstPaths( $paths['sh'] );
+		$paths['ex'] = $this->unsubstPaths( $paths['ex'] );
+		return array(
+			$this->getScopedFileLocks( $paths['sh'], LockManager::LOCK_UW, $status ),
+			$this->getScopedFileLocks( $paths['ex'], LockManager::LOCK_EX, $status )
+		);
+	}
 }
diff --git a/includes/filerepo/backend/FileBackendStore.php b/includes/filerepo/backend/FileBackendStore.php
index aad4bf7749..f02724f2fa 100644
--- a/includes/filerepo/backend/FileBackendStore.php
+++ b/includes/filerepo/backend/FileBackendStore.php
@@ -894,6 +894,18 @@ abstract class FileBackendStore extends FileBackend {
 		return $paths;
 	}
 
+	/**
+	 * @see FileBackend::getScopedLocksForOps()
+	 * @return Array
+	 */
+	public function getScopedLocksForOps( array $ops, Status $status ) {
+		$paths = $this->getPathsToLockForOpsInternal( $this->getOperationsInternal( $ops ) );
+		return array(
+			$this->getScopedFileLocks( $paths['sh'], LockManager::LOCK_UW, $status ),
+			$this->getScopedFileLocks( $paths['ex'], LockManager::LOCK_EX, $status )
+		);
+	}
+
 	/**
 	 * @see FileBackend::doOperationsInternal()
 	 * @return Status