Made preloadFileStat/preloadCache actually work for FileBackendMultiWrite

* Previously the path substitution did not take place

Change-Id: I58ad3e2aa44a2b08f4c6bad1a783fb92ea79dbf4

diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php
index 716ab6e..c759725 100644 (file)
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -1196,8 +1196,7 @@ abstract class FileBackend {
         *
         * @param array $paths Storage paths
         */
-       public function preloadCache( array $paths ) {
-       }
+       abstract public function preloadCache( array $paths );
 
        /**
         * Invalidate any in-process file stat and property cache.
@@ -1207,8 +1206,7 @@ abstract class FileBackend {
         *
         * @param array $paths Storage paths (optional)
         */
-       public function clearCache( array $paths = null ) {
-       }
+       abstract public function clearCache( array $paths = null );
 
        /**
         * Preload file stat information (concurrently if possible) into in-process cache.

diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php
index f00ef65..c39bbaf 100644 (file)
--- a/includes/filebackend/FileBackendMultiWrite.php
+++ b/includes/filebackend/FileBackendMultiWrite.php
@@ -662,8 +662,14 @@ class FileBackendMultiWrite extends FileBackend {
                }
        }
 
+       public function preloadCache( array $paths ) {
+               $realPaths = $this->substPaths( $paths, $this->backends[$this->masterIndex] );
+               $this->backends[$this->masterIndex]->preloadCache( $realPaths );
+       }
+
        public function preloadFileStat( array $params ) {
-               $this->backends[$this->masterIndex]->preloadFileStat( $params );
+               $realParams = $this->substOpPaths( $params, $this->backends[$this->masterIndex] );
+               $this->backends[$this->masterIndex]->preloadFileStat( $realParams );
        }
 
        public function getScopedLocksForOps( array $ops, Status $status ) {