3 files changed, 59 insertions, 33 deletions

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index c5e118946e5..f00177d9c5b 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -435,32 +435,57 @@ class Cache {
 	 * @param string $target
 	 */
 	public function move($source, $target) {
+		$this->moveFromCache($this, $source, $target);
+	}
+
+	/**
+	 * Get the storage id and path needed for a move
+	 *
+	 * @param string $path
+	 * @return array [$storageId, $internalPath]
+	 */
+	protected function getMoveInfo($path) {
+		return [$this->getNumericStorageId(), $path];
+	}
+
+	/**
+	 * Move a file or folder in the cache
+	 *
+	 * @param \OC\Files\Cache\Cache $sourceCache
+	 * @param string $sourcePath
+	 * @param string $targetPath
+	 * @throws \OC\DatabaseException
+	 */
+	public function moveFromCache(Cache $sourceCache, $sourcePath, $targetPath) {
 		// normalize source and target
-		$source = $this->normalize($source);
-		$target = $this->normalize($target);
+		$sourcePath = $this->normalize($sourcePath);
+		$targetPath = $this->normalize($targetPath);
 
-		$sourceData = $this->get($source);
+		$sourceData = $sourceCache->get($sourcePath);
 		$sourceId = $sourceData['fileid'];
-		$newParentId = $this->getParentId($target);
+		$newParentId = $this->getParentId($targetPath);
+
+		list($sourceStorageId, $sourcePath) = $sourceCache->getMoveInfo($sourcePath);
+		list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
 
 		if ($sourceData['mimetype'] === 'httpd/unix-directory') {
 			//find all child entries
 			$sql = 'SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path` LIKE ?';
-			$result = \OC_DB::executeAudited($sql, array($this->getNumericStorageId(), $source . '/%'));
+			$result = \OC_DB::executeAudited($sql, [$sourceStorageId, $sourcePath . '/%']);
 			$childEntries = $result->fetchAll();
-			$sourceLength = strlen($source);
+			$sourceLength = strlen($sourcePath);
 			\OC_DB::beginTransaction();
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `storage` = ?, `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
 
 			foreach ($childEntries as $child) {
-				$targetPath = $target . substr($child['path'], $sourceLength);
-				\OC_DB::executeAudited($query, array($targetPath, md5($targetPath), $child['fileid']));
+				$newTargetPath = $targetPath . substr($child['path'], $sourceLength);
+				\OC_DB::executeAudited($query, [$targetStorageId, $newTargetPath, md5($newTargetPath), $child['fileid']]);
 			}
 			\OC_DB::commit();
 		}
 
-		$sql = 'UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =? WHERE `fileid` = ?';
-		\OC_DB::executeAudited($sql, array($target, md5($target), basename($target), $newParentId, $sourceId));
+		$sql = 'UPDATE `*PREFIX*filecache` SET `storage` =  ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` =? WHERE `fileid` = ?';
+		\OC_DB::executeAudited($sql, [$targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId]);
 	}
 
 	/**
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index 5d2ac608cfd..14aecf01220 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -144,30 +144,29 @@ class Updater {
 		list($targetStorage, $targetInternalPath) = $this->view->resolvePath($target);
 
 		if ($sourceStorage && $targetStorage) {
+			$targetCache = $targetStorage->getCache($sourceInternalPath);
+			if ($targetCache->inCache($targetInternalPath)) {
+				$targetCache->remove($targetInternalPath);
+			}
 			if ($sourceStorage === $targetStorage) {
-				$cache = $sourceStorage->getCache($sourceInternalPath);
-				if ($cache->inCache($targetInternalPath)) {
-					$cache->remove($targetInternalPath);
-				}
-				$cache->move($sourceInternalPath, $targetInternalPath);
-
-				if (pathinfo($sourceInternalPath, PATHINFO_EXTENSION) !== pathinfo($targetInternalPath, PATHINFO_EXTENSION)) {
-					// handle mime type change
-					$mimeType = $sourceStorage->getMimeType($targetInternalPath);
-					$fileId = $cache->getId($targetInternalPath);
-					$cache->update($fileId, array('mimetype' => $mimeType));
-				}
-
-				$cache->correctFolderSize($sourceInternalPath);
-				$cache->correctFolderSize($targetInternalPath);
-				$this->correctParentStorageMtime($sourceStorage, $sourceInternalPath);
-				$this->correctParentStorageMtime($targetStorage, $targetInternalPath);
-				$this->propagator->addChange($source);
-				$this->propagator->addChange($target);
+				$targetCache->move($sourceInternalPath, $targetInternalPath);
 			} else {
-				$this->remove($source);
-				$this->update($target);
+				$targetCache->moveFromCache($sourceStorage->getCache(), $sourceInternalPath, $targetInternalPath);
+			}
+
+			if (pathinfo($sourceInternalPath, PATHINFO_EXTENSION) !== pathinfo($targetInternalPath, PATHINFO_EXTENSION)) {
+				// handle mime type change
+				$mimeType = $sourceStorage->getMimeType($targetInternalPath);
+				$fileId = $targetCache->getId($targetInternalPath);
+				$targetCache->update($fileId, array('mimetype' => $mimeType));
 			}
+
+			$targetCache->correctFolderSize($sourceInternalPath);
+			$targetCache->correctFolderSize($targetInternalPath);
+			$this->correctParentStorageMtime($sourceStorage, $sourceInternalPath);
+			$this->correctParentStorageMtime($targetStorage, $targetInternalPath);
+			$this->propagator->addChange($source);
+			$this->propagator->addChange($target);
 			$this->propagator->propagateChanges();
 		}
 	}
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index ab7a7d3db9a..be14521990a 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -677,7 +677,9 @@ class View {
 						$this->emit_file_hooks_post($exists, $path2);
 					}
 				} elseif ($result) {
-					$this->updater->rename($path1, $path2);
+					if ($internalPath1 !== '') { // dont do a cache update for moved mounts
+						$this->updater->rename($path1, $path2);
+					}
 					if ($this->shouldEmitHooks($path1) and $this->shouldEmitHooks($path2)) {
 						\OC_Hook::emit(
 							Filesystem::CLASSNAME,