nextcloud / server

lib/private/Files/Cache/Propagator.php

Indentation +155 added lines, -155 removed lines

@@ -30,161 +30,161 @@
  * Propagate etags and mtimes within the storage
  */
 class Propagator implements IPropagator {
-	private $inBatch = false;
-
-	private $batch = [];
-
-	/**
-	 * @var \OC\Files\Storage\Storage
-	 */
-	protected $storage;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
-		$this->storage = $storage;
-		$this->connection = $connection;
-	}
-
-
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference number of bytes the file has grown
-	 * @suppress SqlInjectionChecker
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
-
-		$parents = $this->getParents($internalPath);
-
-		if ($this->inBatch) {
-			foreach ($parents as $parent) {
-				$this->addToBatch($parent, $time, $sizeDifference);
-			}
-			return;
-		}
-
-		$parentHashes = array_map('md5', $parents);
-		$etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
-
-		$builder = $this->connection->getQueryBuilder();
-		$hashParams = array_map(function ($hash) use ($builder) {
-			return $builder->expr()->literal($hash);
-		}, $parentHashes);
-
-		$builder->update('filecache')
-			->set('mtime', $builder->createFunction('GREATEST(`mtime`, ' . $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT) . ')'))
-			->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR))
-			->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->in('path_hash', $hashParams));
-
-		$builder->execute();
-
-		if ($sizeDifference !== 0) {
-			// we need to do size separably so we can ignore entries with uncalculated size
-			$builder = $this->connection->getQueryBuilder();
-			$builder->update('filecache')
-				->set('size', $builder->createFunction('`size` + ' . $builder->createNamedParameter($sizeDifference)))
-				->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->in('path_hash', $hashParams))
-				->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
-		}
-
-		$builder->execute();
-	}
-
-	protected function getParents($path) {
-		$parts = explode('/', $path);
-		$parent = '';
-		$parents = [];
-		foreach ($parts as $part) {
-			$parents[] = $parent;
-			$parent = trim($parent . '/' . $part, '/');
-		}
-		return $parents;
-	}
-
-	/**
-	 * Mark the beginning of a propagation batch
-	 *
-	 * Note that not all cache setups support propagation in which case this will be a noop
-	 *
-	 * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
-	 * before the batch is committed.
-	 */
-	public function beginBatch() {
-		$this->inBatch = true;
-	}
-
-	private function addToBatch($internalPath, $time, $sizeDifference) {
-		if (!isset($this->batch[$internalPath])) {
-			$this->batch[$internalPath] = [
-				'hash' => md5($internalPath),
-				'time' => $time,
-				'size' => $sizeDifference
-			];
-		} else {
-			$this->batch[$internalPath]['size'] += $sizeDifference;
-			if ($time > $this->batch[$internalPath]['time']) {
-				$this->batch[$internalPath]['time'] = $time;
-			}
-		}
-	}
-
-	/**
-	 * Commit the active propagation batch
-	 * @suppress SqlInjectionChecker
-	 */
-	public function commitBatch() {
-		if (!$this->inBatch) {
-			throw new \BadMethodCallException('Not in batch');
-		}
-		$this->inBatch = false;
-
-		$this->connection->beginTransaction();
-
-		$query = $this->connection->getQueryBuilder();
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
-
-		$query->update('filecache')
-			->set('mtime', $query->createFunction('GREATEST(`mtime`, ' . $query->createParameter('time') . ')'))
-			->set('etag', $query->expr()->literal(uniqid()))
-			->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')));
-
-		$sizeQuery = $this->connection->getQueryBuilder();
-		$sizeQuery->update('filecache')
-			->set('size', $sizeQuery->createFunction('`size` + ' . $sizeQuery->createParameter('size')))
-			->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')))
-			->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
-
-		foreach ($this->batch as $item) {
-			$query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
-			$query->setParameter('hash', $item['hash']);
-
-			$query->execute();
-
-			if ($item['size']) {
-				$sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
-				$sizeQuery->setParameter('hash', $item['hash']);
-
-				$sizeQuery->execute();
-			}
-		}
-
-		$this->batch = [];
-
-		$this->connection->commit();
-	}
+    private $inBatch = false;
+
+    private $batch = [];
+
+    /**
+     * @var \OC\Files\Storage\Storage
+     */
+    protected $storage;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     * @param IDBConnection $connection
+     */
+    public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
+        $this->storage = $storage;
+        $this->connection = $connection;
+    }
+
+
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference number of bytes the file has grown
+     * @suppress SqlInjectionChecker
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        $storageId = (int)$this->storage->getStorageCache()->getNumericId();
+
+        $parents = $this->getParents($internalPath);
+
+        if ($this->inBatch) {
+            foreach ($parents as $parent) {
+                $this->addToBatch($parent, $time, $sizeDifference);
+            }
+            return;
+        }
+
+        $parentHashes = array_map('md5', $parents);
+        $etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
+
+        $builder = $this->connection->getQueryBuilder();
+        $hashParams = array_map(function ($hash) use ($builder) {
+            return $builder->expr()->literal($hash);
+        }, $parentHashes);
+
+        $builder->update('filecache')
+            ->set('mtime', $builder->createFunction('GREATEST(`mtime`, ' . $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT) . ')'))
+            ->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR))
+            ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->in('path_hash', $hashParams));
+
+        $builder->execute();
+
+        if ($sizeDifference !== 0) {
+            // we need to do size separably so we can ignore entries with uncalculated size
+            $builder = $this->connection->getQueryBuilder();
+            $builder->update('filecache')
+                ->set('size', $builder->createFunction('`size` + ' . $builder->createNamedParameter($sizeDifference)))
+                ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->in('path_hash', $hashParams))
+                ->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
+        }
+
+        $builder->execute();
+    }
+
+    protected function getParents($path) {
+        $parts = explode('/', $path);
+        $parent = '';
+        $parents = [];
+        foreach ($parts as $part) {
+            $parents[] = $parent;
+            $parent = trim($parent . '/' . $part, '/');
+        }
+        return $parents;
+    }
+
+    /**
+     * Mark the beginning of a propagation batch
+     *
+     * Note that not all cache setups support propagation in which case this will be a noop
+     *
+     * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
+     * before the batch is committed.
+     */
+    public function beginBatch() {
+        $this->inBatch = true;
+    }
+
+    private function addToBatch($internalPath, $time, $sizeDifference) {
+        if (!isset($this->batch[$internalPath])) {
+            $this->batch[$internalPath] = [
+                'hash' => md5($internalPath),
+                'time' => $time,
+                'size' => $sizeDifference
+            ];
+        } else {
+            $this->batch[$internalPath]['size'] += $sizeDifference;
+            if ($time > $this->batch[$internalPath]['time']) {
+                $this->batch[$internalPath]['time'] = $time;
+            }
+        }
+    }
+
+    /**
+     * Commit the active propagation batch
+     * @suppress SqlInjectionChecker
+     */
+    public function commitBatch() {
+        if (!$this->inBatch) {
+            throw new \BadMethodCallException('Not in batch');
+        }
+        $this->inBatch = false;
+
+        $this->connection->beginTransaction();
+
+        $query = $this->connection->getQueryBuilder();
+        $storageId = (int)$this->storage->getStorageCache()->getNumericId();
+
+        $query->update('filecache')
+            ->set('mtime', $query->createFunction('GREATEST(`mtime`, ' . $query->createParameter('time') . ')'))
+            ->set('etag', $query->expr()->literal(uniqid()))
+            ->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')));
+
+        $sizeQuery = $this->connection->getQueryBuilder();
+        $sizeQuery->update('filecache')
+            ->set('size', $sizeQuery->createFunction('`size` + ' . $sizeQuery->createParameter('size')))
+            ->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')))
+            ->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
+
+        foreach ($this->batch as $item) {
+            $query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
+            $query->setParameter('hash', $item['hash']);
+
+            $query->execute();
+
+            if ($item['size']) {
+                $sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
+                $sizeQuery->setParameter('hash', $item['hash']);
+
+                $sizeQuery->execute();
+            }
+        }
+
+        $this->batch = [];
+
+        $this->connection->commit();
+    }
 
 
 }

Spacing +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
 	 * @suppress SqlInjectionChecker
 	 */
 	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
+		$storageId = (int) $this->storage->getStorageCache()->getNumericId();
 
 		$parents = $this->getParents($internalPath);
 
@@ -76,12 +76,12 @@ 
 		$etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
 
 		$builder = $this->connection->getQueryBuilder();
-		$hashParams = array_map(function ($hash) use ($builder) {
+		$hashParams = array_map(function($hash) use ($builder) {
 			return $builder->expr()->literal($hash);
 		}, $parentHashes);
 
 		$builder->update('filecache')
-			->set('mtime', $builder->createFunction('GREATEST(`mtime`, ' . $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT) . ')'))
+			->set('mtime', $builder->createFunction('GREATEST(`mtime`, '.$builder->createNamedParameter((int) $time, IQueryBuilder::PARAM_INT).')'))
 			->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR))
 			->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
 			->andWhere($builder->expr()->in('path_hash', $hashParams));
@@ -92,7 +92,7 @@ 
 			// we need to do size separably so we can ignore entries with uncalculated size
 			$builder = $this->connection->getQueryBuilder();
 			$builder->update('filecache')
-				->set('size', $builder->createFunction('`size` + ' . $builder->createNamedParameter($sizeDifference)))
+				->set('size', $builder->createFunction('`size` + '.$builder->createNamedParameter($sizeDifference)))
 				->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
 				->andWhere($builder->expr()->in('path_hash', $hashParams))
 				->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
@@ -107,7 +107,7 @@ 
 		$parents = [];
 		foreach ($parts as $part) {
 			$parents[] = $parent;
-			$parent = trim($parent . '/' . $part, '/');
+			$parent = trim($parent.'/'.$part, '/');
 		}
 		return $parents;
 	}
@@ -152,17 +152,17 @@ 
 		$this->connection->beginTransaction();
 
 		$query = $this->connection->getQueryBuilder();
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
+		$storageId = (int) $this->storage->getStorageCache()->getNumericId();
 
 		$query->update('filecache')
-			->set('mtime', $query->createFunction('GREATEST(`mtime`, ' . $query->createParameter('time') . ')'))
+			->set('mtime', $query->createFunction('GREATEST(`mtime`, '.$query->createParameter('time').')'))
 			->set('etag', $query->expr()->literal(uniqid()))
 			->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')));
 
 		$sizeQuery = $this->connection->getQueryBuilder();
 		$sizeQuery->update('filecache')
-			->set('size', $sizeQuery->createFunction('`size` + ' . $sizeQuery->createParameter('size')))
+			->set('size', $sizeQuery->createFunction('`size` + '.$sizeQuery->createParameter('size')))
 			->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')))
 			->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->expr()->literal(-1, IQueryBuilder::PARAM_INT)));

lib/private/Files/Cache/Cache.php

Indentation +829 added lines, -829 removed lines

@@ -56,843 +56,843 @@
  * - ChangePropagator: updates the mtime and etags of parent folders whenever a change to the cache is made to the cache by the updater
  */
 class Cache implements ICache {
-	use MoveFromCacheTrait {
-		MoveFromCacheTrait::moveFromCache as moveFromCacheFallback;
-	}
-
-	/**
-	 * @var array partial data for the cache
-	 */
-	protected $partial = array();
-
-	/**
-	 * @var string
-	 */
-	protected $storageId;
-
-	/**
-	 * @var Storage $storageCache
-	 */
-	protected $storageCache;
-
-	/** @var IMimeTypeLoader */
-	protected $mimetypeLoader;
-
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
-
-	/** @var QuerySearchHelper */
-	protected $querySearchHelper;
-
-	/**
-	 * @param \OC\Files\Storage\Storage|string $storage
-	 */
-	public function __construct($storage) {
-		if ($storage instanceof \OC\Files\Storage\Storage) {
-			$this->storageId = $storage->getId();
-		} else {
-			$this->storageId = $storage;
-		}
-		if (strlen($this->storageId) > 64) {
-			$this->storageId = md5($this->storageId);
-		}
-
-		$this->storageCache = new Storage($storage);
-		$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->querySearchHelper = new QuerySearchHelper($this->mimetypeLoader);
-	}
-
-	/**
-	 * Get the numeric storage id for this cache's storage
-	 *
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		return $this->storageCache->getNumericId();
-	}
-
-	/**
-	 * get the stored metadata of a file or folder
-	 *
-	 * @param string | int $file either the path of a file or folder or the file id for a file or folder
-	 * @return ICacheEntry|false the cache entry as array of false if the file is not found in the cache
-	 */
-	public function get($file) {
-		if (is_string($file) or $file == '') {
-			// normalize file
-			$file = $this->normalize($file);
-
-			$where = 'WHERE `storage` = ? AND `path_hash` = ?';
-			$params = array($this->getNumericStorageId(), md5($file));
-		} else { //file id
-			$where = 'WHERE `fileid` = ?';
-			$params = array($file);
-		}
-		$sql = 'SELECT `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
+    use MoveFromCacheTrait {
+        MoveFromCacheTrait::moveFromCache as moveFromCacheFallback;
+    }
+
+    /**
+     * @var array partial data for the cache
+     */
+    protected $partial = array();
+
+    /**
+     * @var string
+     */
+    protected $storageId;
+
+    /**
+     * @var Storage $storageCache
+     */
+    protected $storageCache;
+
+    /** @var IMimeTypeLoader */
+    protected $mimetypeLoader;
+
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
+
+    /** @var QuerySearchHelper */
+    protected $querySearchHelper;
+
+    /**
+     * @param \OC\Files\Storage\Storage|string $storage
+     */
+    public function __construct($storage) {
+        if ($storage instanceof \OC\Files\Storage\Storage) {
+            $this->storageId = $storage->getId();
+        } else {
+            $this->storageId = $storage;
+        }
+        if (strlen($this->storageId) > 64) {
+            $this->storageId = md5($this->storageId);
+        }
+
+        $this->storageCache = new Storage($storage);
+        $this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
+        $this->connection = \OC::$server->getDatabaseConnection();
+        $this->querySearchHelper = new QuerySearchHelper($this->mimetypeLoader);
+    }
+
+    /**
+     * Get the numeric storage id for this cache's storage
+     *
+     * @return int
+     */
+    public function getNumericStorageId() {
+        return $this->storageCache->getNumericId();
+    }
+
+    /**
+     * get the stored metadata of a file or folder
+     *
+     * @param string | int $file either the path of a file or folder or the file id for a file or folder
+     * @return ICacheEntry|false the cache entry as array of false if the file is not found in the cache
+     */
+    public function get($file) {
+        if (is_string($file) or $file == '') {
+            // normalize file
+            $file = $this->normalize($file);
+
+            $where = 'WHERE `storage` = ? AND `path_hash` = ?';
+            $params = array($this->getNumericStorageId(), md5($file));
+        } else { //file id
+            $where = 'WHERE `fileid` = ?';
+            $params = array($file);
+        }
+        $sql = 'SELECT `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
 					   `storage_mtime`, `encrypted`, `etag`, `permissions`, `checksum`
 				FROM `*PREFIX*filecache` ' . $where;
-		$result = $this->connection->executeQuery($sql, $params);
-		$data = $result->fetch();
-
-		//FIXME hide this HACK in the next database layer, or just use doctrine and get rid of MDB2 and PDO
-		//PDO returns false, MDB2 returns null, oracle always uses MDB2, so convert null to false
-		if ($data === null) {
-			$data = false;
-		}
-
-		//merge partial data
-		if (!$data and is_string($file)) {
-			if (isset($this->partial[$file])) {
-				$data = $this->partial[$file];
-			}
-			return $data;
-		} else {
-			return self::cacheEntryFromData($data, $this->mimetypeLoader);
-		}
-	}
-
-	/**
-	 * Create a CacheEntry from database row
-	 *
-	 * @param array $data
-	 * @param IMimeTypeLoader $mimetypeLoader
-	 * @return CacheEntry
-	 */
-	public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
-		//fix types
-		$data['fileid'] = (int)$data['fileid'];
-		$data['parent'] = (int)$data['parent'];
-		$data['size'] = 0 + $data['size'];
-		$data['mtime'] = (int)$data['mtime'];
-		$data['storage_mtime'] = (int)$data['storage_mtime'];
-		$data['encryptedVersion'] = (int)$data['encrypted'];
-		$data['encrypted'] = (bool)$data['encrypted'];
-		$data['storage_id'] = $data['storage'];
-		$data['storage'] = (int)$data['storage'];
-		$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
-		$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
-		if ($data['storage_mtime'] == 0) {
-			$data['storage_mtime'] = $data['mtime'];
-		}
-		$data['permissions'] = (int)$data['permissions'];
-		return new CacheEntry($data);
-	}
-
-	/**
-	 * get the metadata of all files stored in $folder
-	 *
-	 * @param string $folder
-	 * @return ICacheEntry[]
-	 */
-	public function getFolderContents($folder) {
-		$fileId = $this->getId($folder);
-		return $this->getFolderContentsById($fileId);
-	}
-
-	/**
-	 * get the metadata of all files stored in $folder
-	 *
-	 * @param int $fileId the file id of the folder
-	 * @return ICacheEntry[]
-	 */
-	public function getFolderContentsById($fileId) {
-		if ($fileId > -1) {
-			$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
+        $result = $this->connection->executeQuery($sql, $params);
+        $data = $result->fetch();
+
+        //FIXME hide this HACK in the next database layer, or just use doctrine and get rid of MDB2 and PDO
+        //PDO returns false, MDB2 returns null, oracle always uses MDB2, so convert null to false
+        if ($data === null) {
+            $data = false;
+        }
+
+        //merge partial data
+        if (!$data and is_string($file)) {
+            if (isset($this->partial[$file])) {
+                $data = $this->partial[$file];
+            }
+            return $data;
+        } else {
+            return self::cacheEntryFromData($data, $this->mimetypeLoader);
+        }
+    }
+
+    /**
+     * Create a CacheEntry from database row
+     *
+     * @param array $data
+     * @param IMimeTypeLoader $mimetypeLoader
+     * @return CacheEntry
+     */
+    public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
+        //fix types
+        $data['fileid'] = (int)$data['fileid'];
+        $data['parent'] = (int)$data['parent'];
+        $data['size'] = 0 + $data['size'];
+        $data['mtime'] = (int)$data['mtime'];
+        $data['storage_mtime'] = (int)$data['storage_mtime'];
+        $data['encryptedVersion'] = (int)$data['encrypted'];
+        $data['encrypted'] = (bool)$data['encrypted'];
+        $data['storage_id'] = $data['storage'];
+        $data['storage'] = (int)$data['storage'];
+        $data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
+        $data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
+        if ($data['storage_mtime'] == 0) {
+            $data['storage_mtime'] = $data['mtime'];
+        }
+        $data['permissions'] = (int)$data['permissions'];
+        return new CacheEntry($data);
+    }
+
+    /**
+     * get the metadata of all files stored in $folder
+     *
+     * @param string $folder
+     * @return ICacheEntry[]
+     */
+    public function getFolderContents($folder) {
+        $fileId = $this->getId($folder);
+        return $this->getFolderContentsById($fileId);
+    }
+
+    /**
+     * get the metadata of all files stored in $folder
+     *
+     * @param int $fileId the file id of the folder
+     * @return ICacheEntry[]
+     */
+    public function getFolderContentsById($fileId) {
+        if ($fileId > -1) {
+            $sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
 						   `storage_mtime`, `encrypted`, `etag`, `permissions`, `checksum`
 					FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC';
-			$result = $this->connection->executeQuery($sql, [$fileId]);
-			$files = $result->fetchAll();
-			return array_map(function (array $data) {
-				return self::cacheEntryFromData($data, $this->mimetypeLoader);;
-			}, $files);
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * insert or update meta data for a file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function put($file, array $data) {
-		if (($id = $this->getId($file)) > -1) {
-			$this->update($id, $data);
-			return $id;
-		} else {
-			return $this->insert($file, $data);
-		}
-	}
-
-	/**
-	 * insert meta data for a new file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function insert($file, array $data) {
-		// normalize file
-		$file = $this->normalize($file);
-
-		if (isset($this->partial[$file])) { //add any saved partial data
-			$data = array_merge($this->partial[$file], $data);
-			unset($this->partial[$file]);
-		}
-
-		$requiredFields = array('size', 'mtime', 'mimetype');
-		foreach ($requiredFields as $field) {
-			if (!isset($data[$field])) { //data not complete save as partial and return
-				$this->partial[$file] = $data;
-				return -1;
-			}
-		}
-
-		$data['path'] = $file;
-		$data['parent'] = $this->getParentId($file);
-		$data['name'] = \OC_Util::basename($file);
-
-		list($queryParts, $params) = $this->buildParts($data);
-		$queryParts[] = '`storage`';
-		$params[] = $this->getNumericStorageId();
-
-		$queryParts = array_map(function ($item) {
-			return trim($item, "`");
-		}, $queryParts);
-		$values = array_combine($queryParts, $params);
-		if (\OC::$server->getDatabaseConnection()->insertIfNotExist('*PREFIX*filecache', $values, [
-			'storage',
-			'path_hash',
-		])
-		) {
-			return (int)$this->connection->lastInsertId('*PREFIX*filecache');
-		}
-
-		// The file was created in the mean time
-		if (($id = $this->getId($file)) > -1) {
-			$this->update($id, $data);
-			return $id;
-		} else {
-			throw new \RuntimeException('File entry could not be inserted with insertIfNotExist() but could also not be selected with getId() in order to perform an update. Please try again.');
-		}
-	}
-
-	/**
-	 * update the metadata of an existing file or folder in the cache
-	 *
-	 * @param int $id the fileid of the existing file or folder
-	 * @param array $data [$key => $value] the metadata to update, only the fields provided in the array will be updated, non-provided values will remain unchanged
-	 */
-	public function update($id, array $data) {
-
-		if (isset($data['path'])) {
-			// normalize path
-			$data['path'] = $this->normalize($data['path']);
-		}
-
-		if (isset($data['name'])) {
-			// normalize path
-			$data['name'] = $this->normalize($data['name']);
-		}
-
-		list($queryParts, $params) = $this->buildParts($data);
-		// duplicate $params because we need the parts twice in the SQL statement
-		// once for the SET part, once in the WHERE clause
-		$params = array_merge($params, $params);
-		$params[] = $id;
-
-		// don't update if the data we try to set is the same as the one in the record
-		// some databases (Postgres) don't like superfluous updates
-		$sql = 'UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=? ' .
-			'WHERE (' .
-			implode(' <> ? OR ', $queryParts) . ' <> ? OR ' .
-			implode(' IS NULL OR ', $queryParts) . ' IS NULL' .
-			') AND `fileid` = ? ';
-		$this->connection->executeQuery($sql, $params);
-
-	}
-
-	/**
-	 * extract query parts and params array from data array
-	 *
-	 * @param array $data
-	 * @return array [$queryParts, $params]
-	 *        $queryParts: string[], the (escaped) column names to be set in the query
-	 *        $params: mixed[], the new values for the columns, to be passed as params to the query
-	 */
-	protected function buildParts(array $data) {
-		$fields = array(
-			'path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted',
-			'etag', 'permissions', 'checksum');
-
-		$doNotCopyStorageMTime = false;
-		if (array_key_exists('mtime', $data) && $data['mtime'] === null) {
-			// this horrific magic tells it to not copy storage_mtime to mtime
-			unset($data['mtime']);
-			$doNotCopyStorageMTime = true;
-		}
-
-		$params = array();
-		$queryParts = array();
-		foreach ($data as $name => $value) {
-			if (array_search($name, $fields) !== false) {
-				if ($name === 'path') {
-					$params[] = md5($value);
-					$queryParts[] = '`path_hash`';
-				} elseif ($name === 'mimetype') {
-					$params[] = $this->mimetypeLoader->getId(substr($value, 0, strpos($value, '/')));
-					$queryParts[] = '`mimepart`';
-					$value = $this->mimetypeLoader->getId($value);
-				} elseif ($name === 'storage_mtime') {
-					if (!$doNotCopyStorageMTime && !isset($data['mtime'])) {
-						$params[] = $value;
-						$queryParts[] = '`mtime`';
-					}
-				} elseif ($name === 'encrypted') {
-					if (isset($data['encryptedVersion'])) {
-						$value = $data['encryptedVersion'];
-					} else {
-						// Boolean to integer conversion
-						$value = $value ? 1 : 0;
-					}
-				}
-				$params[] = $value;
-				$queryParts[] = '`' . $name . '`';
-			}
-		}
-		return array($queryParts, $params);
-	}
-
-	/**
-	 * get the file id for a file
-	 *
-	 * A file id is a numeric id for a file or folder that's unique within an owncloud instance which stays the same for the lifetime of a file
-	 *
-	 * File ids are easiest way for apps to store references to a file since unlike paths they are not affected by renames or sharing
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getId($file) {
-		// normalize file
-		$file = $this->normalize($file);
-
-		$pathHash = md5($file);
-
-		$sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
-		$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
-		if ($row = $result->fetch()) {
-			return $row['fileid'];
-		} else {
-			return -1;
-		}
-	}
-
-	/**
-	 * get the id of the parent folder of a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getParentId($file) {
-		if ($file === '') {
-			return -1;
-		} else {
-			$parent = $this->getParentPath($file);
-			return (int)$this->getId($parent);
-		}
-	}
-
-	private function getParentPath($path) {
-		$parent = dirname($path);
-		if ($parent === '.') {
-			$parent = '';
-		}
-		return $parent;
-	}
-
-	/**
-	 * check if a file is available in the cache
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function inCache($file) {
-		return $this->getId($file) != -1;
-	}
-
-	/**
-	 * remove a file or folder from the cache
-	 *
-	 * when removing a folder from the cache all files and folders inside the folder will be removed as well
-	 *
-	 * @param string $file
-	 */
-	public function remove($file) {
-		$entry = $this->get($file);
-		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?';
-		$this->connection->executeQuery($sql, array($entry['fileid']));
-		if ($entry['mimetype'] === 'httpd/unix-directory') {
-			$this->removeChildren($entry);
-		}
-	}
-
-	/**
-	 * Get all sub folders of a folder
-	 *
-	 * @param array $entry the cache entry of the folder to get the subfolders for
-	 * @return array[] the cache entries for the subfolders
-	 */
-	private function getSubFolders($entry) {
-		$children = $this->getFolderContentsById($entry['fileid']);
-		return array_filter($children, function ($child) {
-			return $child['mimetype'] === 'httpd/unix-directory';
-		});
-	}
-
-	/**
-	 * Recursively remove all children of a folder
-	 *
-	 * @param array $entry the cache entry of the folder to remove the children of
-	 * @throws \OC\DatabaseException
-	 */
-	private function removeChildren($entry) {
-		$subFolders = $this->getSubFolders($entry);
-		foreach ($subFolders as $folder) {
-			$this->removeChildren($folder);
-		}
-		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `parent` = ?';
-		$this->connection->executeQuery($sql, array($entry['fileid']));
-	}
-
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param string $source
-	 * @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 \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 * @throws \OC\DatabaseException
-	 * @throws \Exception if the given storages have an invalid id
-	 * @suppress SqlInjectionChecker
-	 */
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		if ($sourceCache instanceof Cache) {
-			// normalize source and target
-			$sourcePath = $this->normalize($sourcePath);
-			$targetPath = $this->normalize($targetPath);
-
-			$sourceData = $sourceCache->get($sourcePath);
-			$sourceId = $sourceData['fileid'];
-			$newParentId = $this->getParentId($targetPath);
-
-			list($sourceStorageId, $sourcePath) = $sourceCache->getMoveInfo($sourcePath);
-			list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
-
-			if (is_null($sourceStorageId) || $sourceStorageId === false) {
-				throw new \Exception('Invalid source storage id: ' . $sourceStorageId);
-			}
-			if (is_null($targetStorageId) || $targetStorageId === false) {
-				throw new \Exception('Invalid target storage id: ' . $targetStorageId);
-			}
-
-			$this->connection->beginTransaction();
-			if ($sourceData['mimetype'] === 'httpd/unix-directory') {
-				//update all child entries
-				$sourceLength = strlen($sourcePath);
-				$query = $this->connection->getQueryBuilder();
-
-				$fun = $query->func();
-				$newPathFunction = $fun->concat(
-					$query->createNamedParameter($targetPath),
-					$fun->substring('path', $query->createNamedParameter($sourceLength + 1, IQueryBuilder::PARAM_INT))// +1 for the leading slash
-				);
-				$query->update('filecache')
-					->set('storage', $query->createNamedParameter($targetStorageId, IQueryBuilder::PARAM_INT))
-					->set('path_hash', $fun->md5($newPathFunction))
-					->set('path', $newPathFunction)
-					->where($query->expr()->eq('storage', $query->createNamedParameter($sourceStorageId, IQueryBuilder::PARAM_INT)))
-					->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath) . '/%')));
-
-				try {
-					$query->execute();
-				} catch (\OC\DatabaseException $e) {
-					$this->connection->rollBack();
-					throw $e;
-				}
-			}
-
-			$sql = 'UPDATE `*PREFIX*filecache` SET `storage` = ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` = ? WHERE `fileid` = ?';
-			$this->connection->executeQuery($sql, array($targetStorageId, $targetPath, md5($targetPath), \OC_Util::basename($targetPath), $newParentId, $sourceId));
-			$this->connection->commit();
-		} else {
-			$this->moveFromCacheFallback($sourceCache, $sourcePath, $targetPath);
-		}
-	}
-
-	/**
-	 * remove all entries for files that are stored on the storage from the cache
-	 */
-	public function clear() {
-		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `storage` = ?';
-		$this->connection->executeQuery($sql, array($this->getNumericStorageId()));
-
-		$sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
-		$this->connection->executeQuery($sql, array($this->storageId));
-	}
-
-	/**
-	 * Get the scan status of a file
-	 *
-	 * - Cache::NOT_FOUND: File is not in the cache
-	 * - Cache::PARTIAL: File is not stored in the cache but some incomplete data is known
-	 * - Cache::SHALLOW: The folder and it's direct children are in the cache but not all sub folders are fully scanned
-	 * - Cache::COMPLETE: The file or folder, with all it's children) are fully scanned
-	 *
-	 * @param string $file
-	 *
-	 * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
-	 */
-	public function getStatus($file) {
-		// normalize file
-		$file = $this->normalize($file);
-
-		$pathHash = md5($file);
-		$sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
-		$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
-		if ($row = $result->fetch()) {
-			if ((int)$row['size'] === -1) {
-				return self::SHALLOW;
-			} else {
-				return self::COMPLETE;
-			}
-		} else {
-			if (isset($this->partial[$file])) {
-				return self::PARTIAL;
-			} else {
-				return self::NOT_FOUND;
-			}
-		}
-	}
-
-	/**
-	 * search for files matching $pattern
-	 *
-	 * @param string $pattern the search pattern using SQL search syntax (e.g. '%searchstring%')
-	 * @return ICacheEntry[] an array of cache entries where the name matches the search pattern
-	 */
-	public function search($pattern) {
-		// normalize pattern
-		$pattern = $this->normalize($pattern);
-
-		if ($pattern === '%%') {
-			return [];
-		}
-
-
-		$sql = '
+            $result = $this->connection->executeQuery($sql, [$fileId]);
+            $files = $result->fetchAll();
+            return array_map(function (array $data) {
+                return self::cacheEntryFromData($data, $this->mimetypeLoader);;
+            }, $files);
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * insert or update meta data for a file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function put($file, array $data) {
+        if (($id = $this->getId($file)) > -1) {
+            $this->update($id, $data);
+            return $id;
+        } else {
+            return $this->insert($file, $data);
+        }
+    }
+
+    /**
+     * insert meta data for a new file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function insert($file, array $data) {
+        // normalize file
+        $file = $this->normalize($file);
+
+        if (isset($this->partial[$file])) { //add any saved partial data
+            $data = array_merge($this->partial[$file], $data);
+            unset($this->partial[$file]);
+        }
+
+        $requiredFields = array('size', 'mtime', 'mimetype');
+        foreach ($requiredFields as $field) {
+            if (!isset($data[$field])) { //data not complete save as partial and return
+                $this->partial[$file] = $data;
+                return -1;
+            }
+        }
+
+        $data['path'] = $file;
+        $data['parent'] = $this->getParentId($file);
+        $data['name'] = \OC_Util::basename($file);
+
+        list($queryParts, $params) = $this->buildParts($data);
+        $queryParts[] = '`storage`';
+        $params[] = $this->getNumericStorageId();
+
+        $queryParts = array_map(function ($item) {
+            return trim($item, "`");
+        }, $queryParts);
+        $values = array_combine($queryParts, $params);
+        if (\OC::$server->getDatabaseConnection()->insertIfNotExist('*PREFIX*filecache', $values, [
+            'storage',
+            'path_hash',
+        ])
+        ) {
+            return (int)$this->connection->lastInsertId('*PREFIX*filecache');
+        }
+
+        // The file was created in the mean time
+        if (($id = $this->getId($file)) > -1) {
+            $this->update($id, $data);
+            return $id;
+        } else {
+            throw new \RuntimeException('File entry could not be inserted with insertIfNotExist() but could also not be selected with getId() in order to perform an update. Please try again.');
+        }
+    }
+
+    /**
+     * update the metadata of an existing file or folder in the cache
+     *
+     * @param int $id the fileid of the existing file or folder
+     * @param array $data [$key => $value] the metadata to update, only the fields provided in the array will be updated, non-provided values will remain unchanged
+     */
+    public function update($id, array $data) {
+
+        if (isset($data['path'])) {
+            // normalize path
+            $data['path'] = $this->normalize($data['path']);
+        }
+
+        if (isset($data['name'])) {
+            // normalize path
+            $data['name'] = $this->normalize($data['name']);
+        }
+
+        list($queryParts, $params) = $this->buildParts($data);
+        // duplicate $params because we need the parts twice in the SQL statement
+        // once for the SET part, once in the WHERE clause
+        $params = array_merge($params, $params);
+        $params[] = $id;
+
+        // don't update if the data we try to set is the same as the one in the record
+        // some databases (Postgres) don't like superfluous updates
+        $sql = 'UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=? ' .
+            'WHERE (' .
+            implode(' <> ? OR ', $queryParts) . ' <> ? OR ' .
+            implode(' IS NULL OR ', $queryParts) . ' IS NULL' .
+            ') AND `fileid` = ? ';
+        $this->connection->executeQuery($sql, $params);
+
+    }
+
+    /**
+     * extract query parts and params array from data array
+     *
+     * @param array $data
+     * @return array [$queryParts, $params]
+     *        $queryParts: string[], the (escaped) column names to be set in the query
+     *        $params: mixed[], the new values for the columns, to be passed as params to the query
+     */
+    protected function buildParts(array $data) {
+        $fields = array(
+            'path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted',
+            'etag', 'permissions', 'checksum');
+
+        $doNotCopyStorageMTime = false;
+        if (array_key_exists('mtime', $data) && $data['mtime'] === null) {
+            // this horrific magic tells it to not copy storage_mtime to mtime
+            unset($data['mtime']);
+            $doNotCopyStorageMTime = true;
+        }
+
+        $params = array();
+        $queryParts = array();
+        foreach ($data as $name => $value) {
+            if (array_search($name, $fields) !== false) {
+                if ($name === 'path') {
+                    $params[] = md5($value);
+                    $queryParts[] = '`path_hash`';
+                } elseif ($name === 'mimetype') {
+                    $params[] = $this->mimetypeLoader->getId(substr($value, 0, strpos($value, '/')));
+                    $queryParts[] = '`mimepart`';
+                    $value = $this->mimetypeLoader->getId($value);
+                } elseif ($name === 'storage_mtime') {
+                    if (!$doNotCopyStorageMTime && !isset($data['mtime'])) {
+                        $params[] = $value;
+                        $queryParts[] = '`mtime`';
+                    }
+                } elseif ($name === 'encrypted') {
+                    if (isset($data['encryptedVersion'])) {
+                        $value = $data['encryptedVersion'];
+                    } else {
+                        // Boolean to integer conversion
+                        $value = $value ? 1 : 0;
+                    }
+                }
+                $params[] = $value;
+                $queryParts[] = '`' . $name . '`';
+            }
+        }
+        return array($queryParts, $params);
+    }
+
+    /**
+     * get the file id for a file
+     *
+     * A file id is a numeric id for a file or folder that's unique within an owncloud instance which stays the same for the lifetime of a file
+     *
+     * File ids are easiest way for apps to store references to a file since unlike paths they are not affected by renames or sharing
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getId($file) {
+        // normalize file
+        $file = $this->normalize($file);
+
+        $pathHash = md5($file);
+
+        $sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
+        $result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
+        if ($row = $result->fetch()) {
+            return $row['fileid'];
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * get the id of the parent folder of a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getParentId($file) {
+        if ($file === '') {
+            return -1;
+        } else {
+            $parent = $this->getParentPath($file);
+            return (int)$this->getId($parent);
+        }
+    }
+
+    private function getParentPath($path) {
+        $parent = dirname($path);
+        if ($parent === '.') {
+            $parent = '';
+        }
+        return $parent;
+    }
+
+    /**
+     * check if a file is available in the cache
+     *
+     * @param string $file
+     * @return bool
+     */
+    public function inCache($file) {
+        return $this->getId($file) != -1;
+    }
+
+    /**
+     * remove a file or folder from the cache
+     *
+     * when removing a folder from the cache all files and folders inside the folder will be removed as well
+     *
+     * @param string $file
+     */
+    public function remove($file) {
+        $entry = $this->get($file);
+        $sql = 'DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+        $this->connection->executeQuery($sql, array($entry['fileid']));
+        if ($entry['mimetype'] === 'httpd/unix-directory') {
+            $this->removeChildren($entry);
+        }
+    }
+
+    /**
+     * Get all sub folders of a folder
+     *
+     * @param array $entry the cache entry of the folder to get the subfolders for
+     * @return array[] the cache entries for the subfolders
+     */
+    private function getSubFolders($entry) {
+        $children = $this->getFolderContentsById($entry['fileid']);
+        return array_filter($children, function ($child) {
+            return $child['mimetype'] === 'httpd/unix-directory';
+        });
+    }
+
+    /**
+     * Recursively remove all children of a folder
+     *
+     * @param array $entry the cache entry of the folder to remove the children of
+     * @throws \OC\DatabaseException
+     */
+    private function removeChildren($entry) {
+        $subFolders = $this->getSubFolders($entry);
+        foreach ($subFolders as $folder) {
+            $this->removeChildren($folder);
+        }
+        $sql = 'DELETE FROM `*PREFIX*filecache` WHERE `parent` = ?';
+        $this->connection->executeQuery($sql, array($entry['fileid']));
+    }
+
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param string $source
+     * @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 \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     * @throws \OC\DatabaseException
+     * @throws \Exception if the given storages have an invalid id
+     * @suppress SqlInjectionChecker
+     */
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        if ($sourceCache instanceof Cache) {
+            // normalize source and target
+            $sourcePath = $this->normalize($sourcePath);
+            $targetPath = $this->normalize($targetPath);
+
+            $sourceData = $sourceCache->get($sourcePath);
+            $sourceId = $sourceData['fileid'];
+            $newParentId = $this->getParentId($targetPath);
+
+            list($sourceStorageId, $sourcePath) = $sourceCache->getMoveInfo($sourcePath);
+            list($targetStorageId, $targetPath) = $this->getMoveInfo($targetPath);
+
+            if (is_null($sourceStorageId) || $sourceStorageId === false) {
+                throw new \Exception('Invalid source storage id: ' . $sourceStorageId);
+            }
+            if (is_null($targetStorageId) || $targetStorageId === false) {
+                throw new \Exception('Invalid target storage id: ' . $targetStorageId);
+            }
+
+            $this->connection->beginTransaction();
+            if ($sourceData['mimetype'] === 'httpd/unix-directory') {
+                //update all child entries
+                $sourceLength = strlen($sourcePath);
+                $query = $this->connection->getQueryBuilder();
+
+                $fun = $query->func();
+                $newPathFunction = $fun->concat(
+                    $query->createNamedParameter($targetPath),
+                    $fun->substring('path', $query->createNamedParameter($sourceLength + 1, IQueryBuilder::PARAM_INT))// +1 for the leading slash
+                );
+                $query->update('filecache')
+                    ->set('storage', $query->createNamedParameter($targetStorageId, IQueryBuilder::PARAM_INT))
+                    ->set('path_hash', $fun->md5($newPathFunction))
+                    ->set('path', $newPathFunction)
+                    ->where($query->expr()->eq('storage', $query->createNamedParameter($sourceStorageId, IQueryBuilder::PARAM_INT)))
+                    ->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath) . '/%')));
+
+                try {
+                    $query->execute();
+                } catch (\OC\DatabaseException $e) {
+                    $this->connection->rollBack();
+                    throw $e;
+                }
+            }
+
+            $sql = 'UPDATE `*PREFIX*filecache` SET `storage` = ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` = ? WHERE `fileid` = ?';
+            $this->connection->executeQuery($sql, array($targetStorageId, $targetPath, md5($targetPath), \OC_Util::basename($targetPath), $newParentId, $sourceId));
+            $this->connection->commit();
+        } else {
+            $this->moveFromCacheFallback($sourceCache, $sourcePath, $targetPath);
+        }
+    }
+
+    /**
+     * remove all entries for files that are stored on the storage from the cache
+     */
+    public function clear() {
+        $sql = 'DELETE FROM `*PREFIX*filecache` WHERE `storage` = ?';
+        $this->connection->executeQuery($sql, array($this->getNumericStorageId()));
+
+        $sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
+        $this->connection->executeQuery($sql, array($this->storageId));
+    }
+
+    /**
+     * Get the scan status of a file
+     *
+     * - Cache::NOT_FOUND: File is not in the cache
+     * - Cache::PARTIAL: File is not stored in the cache but some incomplete data is known
+     * - Cache::SHALLOW: The folder and it's direct children are in the cache but not all sub folders are fully scanned
+     * - Cache::COMPLETE: The file or folder, with all it's children) are fully scanned
+     *
+     * @param string $file
+     *
+     * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+     */
+    public function getStatus($file) {
+        // normalize file
+        $file = $this->normalize($file);
+
+        $pathHash = md5($file);
+        $sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
+        $result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
+        if ($row = $result->fetch()) {
+            if ((int)$row['size'] === -1) {
+                return self::SHALLOW;
+            } else {
+                return self::COMPLETE;
+            }
+        } else {
+            if (isset($this->partial[$file])) {
+                return self::PARTIAL;
+            } else {
+                return self::NOT_FOUND;
+            }
+        }
+    }
+
+    /**
+     * search for files matching $pattern
+     *
+     * @param string $pattern the search pattern using SQL search syntax (e.g. '%searchstring%')
+     * @return ICacheEntry[] an array of cache entries where the name matches the search pattern
+     */
+    public function search($pattern) {
+        // normalize pattern
+        $pattern = $this->normalize($pattern);
+
+        if ($pattern === '%%') {
+            return [];
+        }
+
+
+        $sql = '
 			SELECT `fileid`, `storage`, `path`, `parent`, `name`,
 				`mimetype`, `storage_mtime`, `mimepart`, `size`, `mtime`,
 				 `encrypted`, `etag`, `permissions`, `checksum`
 			FROM `*PREFIX*filecache`
 			WHERE `storage` = ? AND `name` ILIKE ?';
-		$result = $this->connection->executeQuery($sql,
-			[$this->getNumericStorageId(), $pattern]
-		);
-
-		return $this->searchResultToCacheEntries($result);
-	}
-
-	/**
-	 * @param Statement $result
-	 * @return CacheEntry[]
-	 */
-	private function searchResultToCacheEntries(Statement $result) {
-		$files = $result->fetchAll();
-
-		return array_map(function (array $data) {
-			return self::cacheEntryFromData($data, $this->mimetypeLoader);
-		}, $files);
-	}
-
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string $mimetype either a full mimetype to search ('text/plain') or only the first part of a mimetype ('image')
-	 *        where it will search for all mimetypes in the group ('image/*')
-	 * @return ICacheEntry[] an array of cache entries where the mimetype matches the search
-	 */
-	public function searchByMime($mimetype) {
-		if (strpos($mimetype, '/')) {
-			$where = '`mimetype` = ?';
-		} else {
-			$where = '`mimepart` = ?';
-		}
-		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `storage_mtime`, `mtime`, `encrypted`, `etag`, `permissions`, `checksum`
+        $result = $this->connection->executeQuery($sql,
+            [$this->getNumericStorageId(), $pattern]
+        );
+
+        return $this->searchResultToCacheEntries($result);
+    }
+
+    /**
+     * @param Statement $result
+     * @return CacheEntry[]
+     */
+    private function searchResultToCacheEntries(Statement $result) {
+        $files = $result->fetchAll();
+
+        return array_map(function (array $data) {
+            return self::cacheEntryFromData($data, $this->mimetypeLoader);
+        }, $files);
+    }
+
+    /**
+     * search for files by mimetype
+     *
+     * @param string $mimetype either a full mimetype to search ('text/plain') or only the first part of a mimetype ('image')
+     *        where it will search for all mimetypes in the group ('image/*')
+     * @return ICacheEntry[] an array of cache entries where the mimetype matches the search
+     */
+    public function searchByMime($mimetype) {
+        if (strpos($mimetype, '/')) {
+            $where = '`mimetype` = ?';
+        } else {
+            $where = '`mimepart` = ?';
+        }
+        $sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `storage_mtime`, `mtime`, `encrypted`, `etag`, `permissions`, `checksum`
 				FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
-		$mimetype = $this->mimetypeLoader->getId($mimetype);
-		$result = $this->connection->executeQuery($sql, array($mimetype, $this->getNumericStorageId()));
-
-		return $this->searchResultToCacheEntries($result);
-	}
-
-	public function searchQuery(ISearchQuery $searchQuery) {
-		$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-		$query = $builder->select(['fileid', 'storage', 'path', 'parent', 'name', 'mimetype', 'mimepart', 'size', 'mtime', 'storage_mtime', 'encrypted', 'etag', 'permissions', 'checksum'])
-			->from('filecache', 'file');
-
-		$query->where($builder->expr()->eq('storage', $builder->createNamedParameter($this->getNumericStorageId())));
-
-		if ($this->querySearchHelper->shouldJoinTags($searchQuery->getSearchOperation())) {
-			$query
-				->innerJoin('file', 'vcategory_to_object', 'tagmap', $builder->expr()->eq('file.fileid', 'tagmap.objid'))
-				->innerJoin('tagmap', 'vcategory', 'tag', $builder->expr()->andX(
-					$builder->expr()->eq('tagmap.type', 'tag.type'),
-					$builder->expr()->eq('tagmap.categoryid', 'tag.id')
-				))
-				->andWhere($builder->expr()->eq('tag.type', $builder->createNamedParameter('files')))
-				->andWhere($builder->expr()->eq('tag.uid', $builder->createNamedParameter($searchQuery->getUser()->getUID())));
-		}
-
-		$query->andWhere($this->querySearchHelper->searchOperatorToDBExpr($builder, $searchQuery->getSearchOperation()));
-
-		$this->querySearchHelper->addSearchOrdersToQuery($query, $searchQuery->getOrder());
-
-		if ($searchQuery->getLimit()) {
-			$query->setMaxResults($searchQuery->getLimit());
-		}
-		if ($searchQuery->getOffset()) {
-			$query->setFirstResult($searchQuery->getOffset());
-		}
-
-		$result = $query->execute();
-		return $this->searchResultToCacheEntries($result);
-	}
-
-	/**
-	 * Search for files by tag of a given users.
-	 *
-	 * Note that every user can tag files differently.
-	 *
-	 * @param string|int $tag name or tag id
-	 * @param string $userId owner of the tags
-	 * @return ICacheEntry[] file data
-	 */
-	public function searchByTag($tag, $userId) {
-		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, ' .
-			'`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, ' .
-			'`encrypted`, `etag`, `permissions`, `checksum` ' .
-			'FROM `*PREFIX*filecache` `file`, ' .
-			'`*PREFIX*vcategory_to_object` `tagmap`, ' .
-			'`*PREFIX*vcategory` `tag` ' .
-			// JOIN filecache to vcategory_to_object
-			'WHERE `file`.`fileid` = `tagmap`.`objid` ' .
-			// JOIN vcategory_to_object to vcategory
-			'AND `tagmap`.`type` = `tag`.`type` ' .
-			'AND `tagmap`.`categoryid` = `tag`.`id` ' .
-			// conditions
-			'AND `file`.`storage` = ? ' .
-			'AND `tag`.`type` = \'files\' ' .
-			'AND `tag`.`uid` = ? ';
-		if (is_int($tag)) {
-			$sql .= 'AND `tag`.`id` = ? ';
-		} else {
-			$sql .= 'AND `tag`.`category` = ? ';
-		}
-		$result = $this->connection->executeQuery(
-			$sql,
-			[
-				$this->getNumericStorageId(),
-				$userId,
-				$tag
-			]
-		);
-
-		$files = $result->fetchAll();
-
-		return array_map(function (array $data) {
-			return self::cacheEntryFromData($data, $this->mimetypeLoader);
-		}, $files);
-	}
-
-	/**
-	 * Re-calculate the folder size and the size of all parent folders
-	 *
-	 * @param string|boolean $path
-	 * @param array $data (optional) meta data of the folder
-	 */
-	public function correctFolderSize($path, $data = null) {
-		$this->calculateFolderSize($path, $data);
-		if ($path !== '') {
-			$parent = dirname($path);
-			if ($parent === '.' or $parent === '/') {
-				$parent = '';
-			}
-			$this->correctFolderSize($parent);
-		}
-	}
-
-	/**
-	 * calculate the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array $entry (optional) meta data of the folder
-	 * @return int
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		$totalSize = 0;
-		if (is_null($entry) or !isset($entry['fileid'])) {
-			$entry = $this->get($path);
-		}
-		if (isset($entry['mimetype']) && $entry['mimetype'] === 'httpd/unix-directory') {
-			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2 ' .
-				'FROM `*PREFIX*filecache` ' .
-				'WHERE `parent` = ? AND `storage` = ?';
-			$result = $this->connection->executeQuery($sql, array($id, $this->getNumericStorageId()));
-			if ($row = $result->fetch()) {
-				$result->closeCursor();
-				list($sum, $min) = array_values($row);
-				$sum = 0 + $sum;
-				$min = 0 + $min;
-				if ($min === -1) {
-					$totalSize = $min;
-				} else {
-					$totalSize = $sum;
-				}
-				$update = array();
-				if ($entry['size'] !== $totalSize) {
-					$update['size'] = $totalSize;
-				}
-				if (count($update) > 0) {
-					$this->update($id, $update);
-				}
-			} else {
-				$result->closeCursor();
-			}
-		}
-		return $totalSize;
-	}
-
-	/**
-	 * get all file ids on the files on the storage
-	 *
-	 * @return int[]
-	 */
-	public function getAll() {
-		$sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?';
-		$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId()));
-		$ids = array();
-		while ($row = $result->fetch()) {
-			$ids[] = $row['fileid'];
-		}
-		return $ids;
-	}
-
-	/**
-	 * find a folder in the cache which has not been fully scanned
-	 *
-	 * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
-	 * use the one with the highest id gives the best result with the background scanner, since that is most
-	 * likely the folder where we stopped scanning previously
-	 *
-	 * @return string|bool the path of the folder or false when no folder matched
-	 */
-	public function getIncomplete() {
-		$query = $this->connection->prepare('SELECT `path` FROM `*PREFIX*filecache`'
-			. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC', 1);
-		$query->execute([$this->getNumericStorageId()]);
-		if ($row = $query->fetch()) {
-			return $row['path'];
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get the path of a file on this storage by it's file id
-	 *
-	 * @param int $id the file id of the file or folder to search
-	 * @return string|null the path of the file (relative to the storage) or null if a file with the given id does not exists within this cache
-	 */
-	public function getPathById($id) {
-		$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
-		$result = $this->connection->executeQuery($sql, array($id, $this->getNumericStorageId()));
-		if ($row = $result->fetch()) {
-			// Oracle stores empty strings as null...
-			if ($row['path'] === null) {
-				return '';
-			}
-			return $row['path'];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * get the storage id of the storage for a file and the internal path of the file
-	 * unlike getPathById this does not limit the search to files on this storage and
-	 * instead does a global search in the cache table
-	 *
-	 * @param int $id
-	 * @deprecated use getPathById() instead
-	 * @return array first element holding the storage id, second the path
-	 */
-	static public function getById($id) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$sql = 'SELECT `storage`, `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
-		$result = $connection->executeQuery($sql, array($id));
-		if ($row = $result->fetch()) {
-			$numericId = $row['storage'];
-			$path = $row['path'];
-		} else {
-			return null;
-		}
-
-		if ($id = Storage::getStorageId($numericId)) {
-			return array($id, $path);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * normalize the given path
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function normalize($path) {
-
-		return trim(\OC_Util::normalizeUnicode($path), '/');
-	}
+        $mimetype = $this->mimetypeLoader->getId($mimetype);
+        $result = $this->connection->executeQuery($sql, array($mimetype, $this->getNumericStorageId()));
+
+        return $this->searchResultToCacheEntries($result);
+    }
+
+    public function searchQuery(ISearchQuery $searchQuery) {
+        $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+        $query = $builder->select(['fileid', 'storage', 'path', 'parent', 'name', 'mimetype', 'mimepart', 'size', 'mtime', 'storage_mtime', 'encrypted', 'etag', 'permissions', 'checksum'])
+            ->from('filecache', 'file');
+
+        $query->where($builder->expr()->eq('storage', $builder->createNamedParameter($this->getNumericStorageId())));
+
+        if ($this->querySearchHelper->shouldJoinTags($searchQuery->getSearchOperation())) {
+            $query
+                ->innerJoin('file', 'vcategory_to_object', 'tagmap', $builder->expr()->eq('file.fileid', 'tagmap.objid'))
+                ->innerJoin('tagmap', 'vcategory', 'tag', $builder->expr()->andX(
+                    $builder->expr()->eq('tagmap.type', 'tag.type'),
+                    $builder->expr()->eq('tagmap.categoryid', 'tag.id')
+                ))
+                ->andWhere($builder->expr()->eq('tag.type', $builder->createNamedParameter('files')))
+                ->andWhere($builder->expr()->eq('tag.uid', $builder->createNamedParameter($searchQuery->getUser()->getUID())));
+        }
+
+        $query->andWhere($this->querySearchHelper->searchOperatorToDBExpr($builder, $searchQuery->getSearchOperation()));
+
+        $this->querySearchHelper->addSearchOrdersToQuery($query, $searchQuery->getOrder());
+
+        if ($searchQuery->getLimit()) {
+            $query->setMaxResults($searchQuery->getLimit());
+        }
+        if ($searchQuery->getOffset()) {
+            $query->setFirstResult($searchQuery->getOffset());
+        }
+
+        $result = $query->execute();
+        return $this->searchResultToCacheEntries($result);
+    }
+
+    /**
+     * Search for files by tag of a given users.
+     *
+     * Note that every user can tag files differently.
+     *
+     * @param string|int $tag name or tag id
+     * @param string $userId owner of the tags
+     * @return ICacheEntry[] file data
+     */
+    public function searchByTag($tag, $userId) {
+        $sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, ' .
+            '`mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, ' .
+            '`encrypted`, `etag`, `permissions`, `checksum` ' .
+            'FROM `*PREFIX*filecache` `file`, ' .
+            '`*PREFIX*vcategory_to_object` `tagmap`, ' .
+            '`*PREFIX*vcategory` `tag` ' .
+            // JOIN filecache to vcategory_to_object
+            'WHERE `file`.`fileid` = `tagmap`.`objid` ' .
+            // JOIN vcategory_to_object to vcategory
+            'AND `tagmap`.`type` = `tag`.`type` ' .
+            'AND `tagmap`.`categoryid` = `tag`.`id` ' .
+            // conditions
+            'AND `file`.`storage` = ? ' .
+            'AND `tag`.`type` = \'files\' ' .
+            'AND `tag`.`uid` = ? ';
+        if (is_int($tag)) {
+            $sql .= 'AND `tag`.`id` = ? ';
+        } else {
+            $sql .= 'AND `tag`.`category` = ? ';
+        }
+        $result = $this->connection->executeQuery(
+            $sql,
+            [
+                $this->getNumericStorageId(),
+                $userId,
+                $tag
+            ]
+        );
+
+        $files = $result->fetchAll();
+
+        return array_map(function (array $data) {
+            return self::cacheEntryFromData($data, $this->mimetypeLoader);
+        }, $files);
+    }
+
+    /**
+     * Re-calculate the folder size and the size of all parent folders
+     *
+     * @param string|boolean $path
+     * @param array $data (optional) meta data of the folder
+     */
+    public function correctFolderSize($path, $data = null) {
+        $this->calculateFolderSize($path, $data);
+        if ($path !== '') {
+            $parent = dirname($path);
+            if ($parent === '.' or $parent === '/') {
+                $parent = '';
+            }
+            $this->correctFolderSize($parent);
+        }
+    }
+
+    /**
+     * calculate the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array $entry (optional) meta data of the folder
+     * @return int
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        $totalSize = 0;
+        if (is_null($entry) or !isset($entry['fileid'])) {
+            $entry = $this->get($path);
+        }
+        if (isset($entry['mimetype']) && $entry['mimetype'] === 'httpd/unix-directory') {
+            $id = $entry['fileid'];
+            $sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2 ' .
+                'FROM `*PREFIX*filecache` ' .
+                'WHERE `parent` = ? AND `storage` = ?';
+            $result = $this->connection->executeQuery($sql, array($id, $this->getNumericStorageId()));
+            if ($row = $result->fetch()) {
+                $result->closeCursor();
+                list($sum, $min) = array_values($row);
+                $sum = 0 + $sum;
+                $min = 0 + $min;
+                if ($min === -1) {
+                    $totalSize = $min;
+                } else {
+                    $totalSize = $sum;
+                }
+                $update = array();
+                if ($entry['size'] !== $totalSize) {
+                    $update['size'] = $totalSize;
+                }
+                if (count($update) > 0) {
+                    $this->update($id, $update);
+                }
+            } else {
+                $result->closeCursor();
+            }
+        }
+        return $totalSize;
+    }
+
+    /**
+     * get all file ids on the files on the storage
+     *
+     * @return int[]
+     */
+    public function getAll() {
+        $sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?';
+        $result = $this->connection->executeQuery($sql, array($this->getNumericStorageId()));
+        $ids = array();
+        while ($row = $result->fetch()) {
+            $ids[] = $row['fileid'];
+        }
+        return $ids;
+    }
+
+    /**
+     * find a folder in the cache which has not been fully scanned
+     *
+     * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
+     * use the one with the highest id gives the best result with the background scanner, since that is most
+     * likely the folder where we stopped scanning previously
+     *
+     * @return string|bool the path of the folder or false when no folder matched
+     */
+    public function getIncomplete() {
+        $query = $this->connection->prepare('SELECT `path` FROM `*PREFIX*filecache`'
+            . ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC', 1);
+        $query->execute([$this->getNumericStorageId()]);
+        if ($row = $query->fetch()) {
+            return $row['path'];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get the path of a file on this storage by it's file id
+     *
+     * @param int $id the file id of the file or folder to search
+     * @return string|null the path of the file (relative to the storage) or null if a file with the given id does not exists within this cache
+     */
+    public function getPathById($id) {
+        $sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
+        $result = $this->connection->executeQuery($sql, array($id, $this->getNumericStorageId()));
+        if ($row = $result->fetch()) {
+            // Oracle stores empty strings as null...
+            if ($row['path'] === null) {
+                return '';
+            }
+            return $row['path'];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * get the storage id of the storage for a file and the internal path of the file
+     * unlike getPathById this does not limit the search to files on this storage and
+     * instead does a global search in the cache table
+     *
+     * @param int $id
+     * @deprecated use getPathById() instead
+     * @return array first element holding the storage id, second the path
+     */
+    static public function getById($id) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $sql = 'SELECT `storage`, `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+        $result = $connection->executeQuery($sql, array($id));
+        if ($row = $result->fetch()) {
+            $numericId = $row['storage'];
+            $path = $row['path'];
+        } else {
+            return null;
+        }
+
+        if ($id = Storage::getStorageId($numericId)) {
+            return array($id, $path);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * normalize the given path
+     *
+     * @param string $path
+     * @return string
+     */
+    public function normalize($path) {
+
+        return trim(\OC_Util::normalizeUnicode($path), '/');
+    }
 }

lib/private/Security/Bruteforce/Throttler.php

Indentation +208 added lines, -208 removed lines

@@ -43,212 +43,212 @@
  * @package OC\Security\Bruteforce
  */
 class Throttler {
-	const LOGIN_ACTION = 'login';
-
-	/** @var IDBConnection */
-	private $db;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param ITimeFactory $timeFactory
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db,
-								ITimeFactory $timeFactory,
-								ILogger $logger,
-								IConfig $config) {
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * Convert a number of seconds into the appropriate DateInterval
-	 *
-	 * @param int $expire
-	 * @return \DateInterval
-	 */
-	private function getCutoff($expire) {
-		$d1 = new \DateTime();
-		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
-		return $d2->diff($d1);
-	}
-
-	/**
-	 * Register a failed attempt to bruteforce a security control
-	 *
-	 * @param string $action
-	 * @param string $ip
-	 * @param array $metadata Optional metadata logged to the database
-	 * @suppress SqlInjectionChecker
-	 */
-	public function registerAttempt($action,
-									$ip,
-									array $metadata = []) {
-		// No need to log if the bruteforce protection is disabled
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
-			return;
-		}
-
-		$ipAddress = new IpAddress($ip);
-		$values = [
-			'action' => $action,
-			'occurred' => $this->timeFactory->getTime(),
-			'ip' => (string)$ipAddress,
-			'subnet' => $ipAddress->getSubnet(),
-			'metadata' => json_encode($metadata),
-		];
-
-		$this->logger->notice(
-			sprintf(
-				'Bruteforce attempt from "%s" detected for action "%s".',
-				$ip,
-				$action
-			),
-			[
-				'app' => 'core',
-			]
-		);
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->insert('bruteforce_attempts');
-		foreach($values as $column => $value) {
-			$qb->setValue($column, $qb->createNamedParameter($value));
-		}
-		$qb->execute();
-	}
-
-	/**
-	 * Check if the IP is whitelisted
-	 *
-	 * @param string $ip
-	 * @return bool
-	 */
-	private function isIPWhitelisted($ip) {
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
-			return true;
-		}
-
-		$keys = $this->config->getAppKeys('bruteForce');
-		$keys = array_filter($keys, function($key) {
-			$regex = '/^whitelist_/S';
-			return preg_match($regex, $key) === 1;
-		});
-
-		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-			$type = 4;
-		} else if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-			$type = 6;
-		} else {
-			return false;
-		}
-
-		$ip = inet_pton($ip);
-
-		foreach ($keys as $key) {
-			$cidr = $this->config->getAppValue('bruteForce', $key, null);
-
-			$cx = explode('/', $cidr);
-			$addr = $cx[0];
-			$mask = (int)$cx[1];
-
-			// Do not compare ipv4 to ipv6
-			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
-				($type === 6 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))) {
-				continue;
-			}
-
-			$addr = inet_pton($addr);
-
-			$valid = true;
-			for($i = 0; $i < $mask; $i++) {
-				$part = ord($addr[(int)($i/8)]);
-				$orig = ord($ip[(int)($i/8)]);
-
-				$part = $part & (15 << (1 - ($i % 2)));
-				$orig = $orig & (15 << (1 - ($i % 2)));
-
-				if ($part !== $orig) {
-					$valid = false;
-					break;
-				}
-			}
-
-			if ($valid === true) {
-				return true;
-			}
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Get the throttling delay (in milliseconds)
-	 *
-	 * @param string $ip
-	 * @param string $action optionally filter by action
-	 * @return int
-	 */
-	public function getDelay($ip, $action = '') {
-		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
-			return 0;
-		}
-
-		$cutoffTime = (new \DateTime())
-			->sub($this->getCutoff(43200))
-			->getTimestamp();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from('bruteforce_attempts')
-			->where($qb->expr()->gt('occurred', $qb->createNamedParameter($cutoffTime)))
-			->andWhere($qb->expr()->eq('subnet', $qb->createNamedParameter($ipAddress->getSubnet())));
-
-		if ($action !== '') {
-			$qb->andWhere($qb->expr()->eq('action', $qb->createNamedParameter($action)));
-		}
-
-		$attempts = count($qb->execute()->fetchAll());
-
-		if ($attempts === 0) {
-			return 0;
-		}
-
-		$maxDelay = 30;
-		$firstDelay = 0.1;
-		if ($attempts > (8 * PHP_INT_SIZE - 1))  {
-			// Don't ever overflow. Just assume the maxDelay time:s
-			$firstDelay = $maxDelay;
-		} else {
-			$firstDelay *= pow(2, $attempts);
-			if ($firstDelay > $maxDelay) {
-				$firstDelay = $maxDelay;
-			}
-		}
-		return (int) \ceil($firstDelay * 1000);
-	}
-
-	/**
-	 * Will sleep for the defined amount of time
-	 *
-	 * @param string $ip
-	 * @param string $action optionally filter by action
-	 * @return int the time spent sleeping
-	 */
-	public function sleepDelay($ip, $action = '') {
-		$delay = $this->getDelay($ip, $action);
-		usleep($delay * 1000);
-		return $delay;
-	}
+    const LOGIN_ACTION = 'login';
+
+    /** @var IDBConnection */
+    private $db;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param ITimeFactory $timeFactory
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db,
+                                ITimeFactory $timeFactory,
+                                ILogger $logger,
+                                IConfig $config) {
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * Convert a number of seconds into the appropriate DateInterval
+     *
+     * @param int $expire
+     * @return \DateInterval
+     */
+    private function getCutoff($expire) {
+        $d1 = new \DateTime();
+        $d2 = clone $d1;
+        $d2->sub(new \DateInterval('PT' . $expire . 'S'));
+        return $d2->diff($d1);
+    }
+
+    /**
+     * Register a failed attempt to bruteforce a security control
+     *
+     * @param string $action
+     * @param string $ip
+     * @param array $metadata Optional metadata logged to the database
+     * @suppress SqlInjectionChecker
+     */
+    public function registerAttempt($action,
+                                    $ip,
+                                    array $metadata = []) {
+        // No need to log if the bruteforce protection is disabled
+        if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+            return;
+        }
+
+        $ipAddress = new IpAddress($ip);
+        $values = [
+            'action' => $action,
+            'occurred' => $this->timeFactory->getTime(),
+            'ip' => (string)$ipAddress,
+            'subnet' => $ipAddress->getSubnet(),
+            'metadata' => json_encode($metadata),
+        ];
+
+        $this->logger->notice(
+            sprintf(
+                'Bruteforce attempt from "%s" detected for action "%s".',
+                $ip,
+                $action
+            ),
+            [
+                'app' => 'core',
+            ]
+        );
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->insert('bruteforce_attempts');
+        foreach($values as $column => $value) {
+            $qb->setValue($column, $qb->createNamedParameter($value));
+        }
+        $qb->execute();
+    }
+
+    /**
+     * Check if the IP is whitelisted
+     *
+     * @param string $ip
+     * @return bool
+     */
+    private function isIPWhitelisted($ip) {
+        if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+            return true;
+        }
+
+        $keys = $this->config->getAppKeys('bruteForce');
+        $keys = array_filter($keys, function($key) {
+            $regex = '/^whitelist_/S';
+            return preg_match($regex, $key) === 1;
+        });
+
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            $type = 4;
+        } else if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+            $type = 6;
+        } else {
+            return false;
+        }
+
+        $ip = inet_pton($ip);
+
+        foreach ($keys as $key) {
+            $cidr = $this->config->getAppValue('bruteForce', $key, null);
+
+            $cx = explode('/', $cidr);
+            $addr = $cx[0];
+            $mask = (int)$cx[1];
+
+            // Do not compare ipv4 to ipv6
+            if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
+                ($type === 6 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))) {
+                continue;
+            }
+
+            $addr = inet_pton($addr);
+
+            $valid = true;
+            for($i = 0; $i < $mask; $i++) {
+                $part = ord($addr[(int)($i/8)]);
+                $orig = ord($ip[(int)($i/8)]);
+
+                $part = $part & (15 << (1 - ($i % 2)));
+                $orig = $orig & (15 << (1 - ($i % 2)));
+
+                if ($part !== $orig) {
+                    $valid = false;
+                    break;
+                }
+            }
+
+            if ($valid === true) {
+                return true;
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Get the throttling delay (in milliseconds)
+     *
+     * @param string $ip
+     * @param string $action optionally filter by action
+     * @return int
+     */
+    public function getDelay($ip, $action = '') {
+        $ipAddress = new IpAddress($ip);
+        if ($this->isIPWhitelisted((string)$ipAddress)) {
+            return 0;
+        }
+
+        $cutoffTime = (new \DateTime())
+            ->sub($this->getCutoff(43200))
+            ->getTimestamp();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from('bruteforce_attempts')
+            ->where($qb->expr()->gt('occurred', $qb->createNamedParameter($cutoffTime)))
+            ->andWhere($qb->expr()->eq('subnet', $qb->createNamedParameter($ipAddress->getSubnet())));
+
+        if ($action !== '') {
+            $qb->andWhere($qb->expr()->eq('action', $qb->createNamedParameter($action)));
+        }
+
+        $attempts = count($qb->execute()->fetchAll());
+
+        if ($attempts === 0) {
+            return 0;
+        }
+
+        $maxDelay = 30;
+        $firstDelay = 0.1;
+        if ($attempts > (8 * PHP_INT_SIZE - 1))  {
+            // Don't ever overflow. Just assume the maxDelay time:s
+            $firstDelay = $maxDelay;
+        } else {
+            $firstDelay *= pow(2, $attempts);
+            if ($firstDelay > $maxDelay) {
+                $firstDelay = $maxDelay;
+            }
+        }
+        return (int) \ceil($firstDelay * 1000);
+    }
+
+    /**
+     * Will sleep for the defined amount of time
+     *
+     * @param string $ip
+     * @param string $action optionally filter by action
+     * @return int the time spent sleeping
+     */
+    public function sleepDelay($ip, $action = '') {
+        $delay = $this->getDelay($ip, $action);
+        usleep($delay * 1000);
+        return $delay;
+    }
 }

lib/private/DB/Connection.php

Indentation +401 added lines, -401 removed lines

@@ -42,405 +42,405 @@
 use OCP\PreConditionNotMetException;
 
 class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
-	/**
-	 * @var string $tablePrefix
-	 */
-	protected $tablePrefix;
-
-	/**
-	 * @var \OC\DB\Adapter $adapter
-	 */
-	protected $adapter;
-
-	protected $lockedTable = null;
-
-	public function connect() {
-		try {
-			return parent::connect();
-		} catch (DBALException $e) {
-			// throw a new exception to prevent leaking info from the stacktrace
-			throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
-		}
-	}
-
-	/**
-	 * Returns a QueryBuilder for the connection.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
-	 */
-	public function getQueryBuilder() {
-		return new QueryBuilder(
-			$this,
-			\OC::$server->getSystemConfig(),
-			\OC::$server->getLogger()
-		);
-	}
-
-	/**
-	 * Gets the QueryBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\QueryBuilder
-	 * @deprecated please use $this->getQueryBuilder() instead
-	 */
-	public function createQueryBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		return parent::createQueryBuilder();
-	}
-
-	/**
-	 * Gets the ExpressionBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
-	 * @deprecated please use $this->getQueryBuilder()->expr() instead
-	 */
-	public function getExpressionBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		return parent::getExpressionBuilder();
-	}
-
-	/**
-	 * Get the file and line that called the method where `getCallerBacktrace()` was used
-	 *
-	 * @return string
-	 */
-	protected function getCallerBacktrace() {
-		$traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-
-		// 0 is the method where we use `getCallerBacktrace`
-		// 1 is the target method which uses the method we want to log
-		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrefix() {
-		return $this->tablePrefix;
-	}
-
-	/**
-	 * Initializes a new instance of the Connection class.
-	 *
-	 * @param array $params  The connection parameters.
-	 * @param \Doctrine\DBAL\Driver $driver
-	 * @param \Doctrine\DBAL\Configuration $config
-	 * @param \Doctrine\Common\EventManager $eventManager
-	 * @throws \Exception
-	 */
-	public function __construct(array $params, Driver $driver, Configuration $config = null,
-		EventManager $eventManager = null)
-	{
-		if (!isset($params['adapter'])) {
-			throw new \Exception('adapter not set');
-		}
-		if (!isset($params['tablePrefix'])) {
-			throw new \Exception('tablePrefix not set');
-		}
-		parent::__construct($params, $driver, $config, $eventManager);
-		$this->adapter = new $params['adapter']($this);
-		$this->tablePrefix = $params['tablePrefix'];
-
-		parent::setTransactionIsolation(parent::TRANSACTION_READ_COMMITTED);
-	}
-
-	/**
-	 * Prepares an SQL statement.
-	 *
-	 * @param string $statement The SQL statement to prepare.
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
-	 */
-	public function prepare( $statement, $limit=null, $offset=null ) {
-		if ($limit === -1) {
-			$limit = null;
-		}
-		if (!is_null($limit)) {
-			$platform = $this->getDatabasePlatform();
-			$statement = $platform->modifyLimitQuery($statement, $limit, $offset);
-		}
-		$statement = $this->replaceTablePrefix($statement);
-		$statement = $this->adapter->fixupStatement($statement);
-
-		return parent::prepare($statement);
-	}
-
-	/**
-	 * Executes an, optionally parametrized, SQL query.
-	 *
-	 * If the query is parametrized, a prepared statement is used.
-	 * If an SQLLogger is configured, the execution is logged.
-	 *
-	 * @param string                                      $query  The SQL query to execute.
-	 * @param array                                       $params The parameters to bind to the query, if any.
-	 * @param array                                       $types  The types the previous parameters are in.
-	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
-	 *
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
-	{
-		$query = $this->replaceTablePrefix($query);
-		$query = $this->adapter->fixupStatement($query);
-		return parent::executeQuery($query, $params, $types, $qcp);
-	}
-
-	/**
-	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
-	 * and returns the number of affected rows.
-	 *
-	 * This method supports PDO binding types as well as DBAL mapping types.
-	 *
-	 * @param string $query  The SQL query.
-	 * @param array  $params The query parameters.
-	 * @param array  $types  The parameter types.
-	 *
-	 * @return integer The number of affected rows.
-	 *
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function executeUpdate($query, array $params = array(), array $types = array())
-	{
-		$query = $this->replaceTablePrefix($query);
-		$query = $this->adapter->fixupStatement($query);
-		return parent::executeUpdate($query, $params, $types);
-	}
-
-	/**
-	 * Returns the ID of the last inserted row, or the last value from a sequence object,
-	 * depending on the underlying driver.
-	 *
-	 * Note: This method may not return a meaningful or consistent result across different drivers,
-	 * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
-	 * columns or sequences.
-	 *
-	 * @param string $seqName Name of the sequence object from which the ID should be returned.
-	 * @return string A string representation of the last inserted ID.
-	 */
-	public function lastInsertId($seqName = null) {
-		if ($seqName) {
-			$seqName = $this->replaceTablePrefix($seqName);
-		}
-		return $this->adapter->lastInsertId($seqName);
-	}
-
-	// internal use
-	public function realLastInsertId($seqName = null) {
-		return parent::lastInsertId($seqName);
-	}
-
-	/**
-	 * Insert a row if the matching row does not exists.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		return $this->adapter->insertIfNotExist($table, $input, $compare);
-	}
-
-	private function getType($value) {
-		if (is_bool($value)) {
-			return IQueryBuilder::PARAM_BOOL;
-		} else if (is_int($value)) {
-			return IQueryBuilder::PARAM_INT;
-		} else {
-			return IQueryBuilder::PARAM_STR;
-		}
-	}
-
-	/**
-	 * Insert or update a row value
-	 *
-	 * @param string $table
-	 * @param array $keys (column name => value)
-	 * @param array $values (column name => value)
-	 * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
-	 * @return int number of new rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 * @throws PreConditionNotMetException
-	 * @suppress SqlInjectionChecker
-	 */
-	public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
-		try {
-			$insertQb = $this->getQueryBuilder();
-			$insertQb->insert($table)
-				->values(
-					array_map(function($value) use ($insertQb) {
-						return $insertQb->createNamedParameter($value, $this->getType($value));
-					}, array_merge($keys, $values))
-				);
-			return $insertQb->execute();
-		} catch (ConstraintViolationException $e) {
-			// value already exists, try update
-			$updateQb = $this->getQueryBuilder();
-			$updateQb->update($table);
-			foreach ($values as $name => $value) {
-				$updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
-			}
-			$where = $updateQb->expr()->andX();
-			$whereValues = array_merge($keys, $updatePreconditionValues);
-			foreach ($whereValues as $name => $value) {
-				$where->add($updateQb->expr()->eq(
-					$name,
-					$updateQb->createNamedParameter($value, $this->getType($value)),
-					$this->getType($value)
-				));
-			}
-			$updateQb->where($where);
-			$affected = $updateQb->execute();
-
-			if ($affected === 0 && !empty($updatePreconditionValues)) {
-				throw new PreConditionNotMetException();
-			}
-
-			return 0;
-		}
-	}
-
-	/**
-	 * Create an exclusive read+write lock on a table
-	 *
-	 * @param string $tableName
-	 * @throws \BadMethodCallException When trying to acquire a second lock
-	 * @since 9.1.0
-	 */
-	public function lockTable($tableName) {
-		if ($this->lockedTable !== null) {
-			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
-		}
-
-		$tableName = $this->tablePrefix . $tableName;
-		$this->lockedTable = $tableName;
-		$this->adapter->lockTable($tableName);
-	}
-
-	/**
-	 * Release a previous acquired lock again
-	 *
-	 * @since 9.1.0
-	 */
-	public function unlockTable() {
-		$this->adapter->unlockTable();
-		$this->lockedTable = null;
-	}
-
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 */
-	public function getError() {
-		$msg = $this->errorCode() . ': ';
-		$errorInfo = $this->errorInfo();
-		if (is_array($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
-			$msg .= 'Driver Message = '.$errorInfo[2];
-		}
-		return $msg;
-	}
-
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
-			$schema->dropTable($table);
-		}
-	}
-
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist(array($table));
-	}
-
-	// internal use
-	/**
-	 * @param string $statement
-	 * @return string
-	 */
-	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
-	}
-
-	/**
-	 * Check if a transaction is active
-	 *
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function inTransaction() {
-		return $this->getTransactionNestingLevel() > 0;
-	}
-
-	/**
-	 * Espace a parameter to be used in a LIKE query
-	 *
-	 * @param string $param
-	 * @return string
-	 */
-	public function escapeLikeParameter($param) {
-		return addcslashes($param, '\\_%');
-	}
-
-	/**
-	 * Check whether or not the current database support 4byte wide unicode
-	 *
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function supports4ByteText() {
-		if (!$this->getDatabasePlatform() instanceof MySqlPlatform) {
-			return true;
-		}
-		return $this->getParams()['charset'] === 'utf8mb4';
-	}
-
-
-	/**
-	 * Create the schema of the connected database
-	 *
-	 * @return Schema
-	 */
-	public function createSchema() {
-		$schemaManager = new MDB2SchemaManager($this);
-		$migrator = $schemaManager->getMigrator();
-		return $migrator->createSchema();
-	}
-
-	/**
-	 * Migrate the database to the given schema
-	 *
-	 * @param Schema $toSchema
-	 */
-	public function migrateToSchema(Schema $toSchema) {
-		$schemaManager = new MDB2SchemaManager($this);
-		$migrator = $schemaManager->getMigrator();
-		$migrator->migrate($toSchema);
-	}
+    /**
+     * @var string $tablePrefix
+     */
+    protected $tablePrefix;
+
+    /**
+     * @var \OC\DB\Adapter $adapter
+     */
+    protected $adapter;
+
+    protected $lockedTable = null;
+
+    public function connect() {
+        try {
+            return parent::connect();
+        } catch (DBALException $e) {
+            // throw a new exception to prevent leaking info from the stacktrace
+            throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+        }
+    }
+
+    /**
+     * Returns a QueryBuilder for the connection.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder
+     */
+    public function getQueryBuilder() {
+        return new QueryBuilder(
+            $this,
+            \OC::$server->getSystemConfig(),
+            \OC::$server->getLogger()
+        );
+    }
+
+    /**
+     * Gets the QueryBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\QueryBuilder
+     * @deprecated please use $this->getQueryBuilder() instead
+     */
+    public function createQueryBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        return parent::createQueryBuilder();
+    }
+
+    /**
+     * Gets the ExpressionBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
+     * @deprecated please use $this->getQueryBuilder()->expr() instead
+     */
+    public function getExpressionBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        return parent::getExpressionBuilder();
+    }
+
+    /**
+     * Get the file and line that called the method where `getCallerBacktrace()` was used
+     *
+     * @return string
+     */
+    protected function getCallerBacktrace() {
+        $traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+        // 0 is the method where we use `getCallerBacktrace`
+        // 1 is the target method which uses the method we want to log
+        if (isset($traces[1])) {
+            return $traces[1]['file'] . ':' . $traces[1]['line'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() {
+        return $this->tablePrefix;
+    }
+
+    /**
+     * Initializes a new instance of the Connection class.
+     *
+     * @param array $params  The connection parameters.
+     * @param \Doctrine\DBAL\Driver $driver
+     * @param \Doctrine\DBAL\Configuration $config
+     * @param \Doctrine\Common\EventManager $eventManager
+     * @throws \Exception
+     */
+    public function __construct(array $params, Driver $driver, Configuration $config = null,
+        EventManager $eventManager = null)
+    {
+        if (!isset($params['adapter'])) {
+            throw new \Exception('adapter not set');
+        }
+        if (!isset($params['tablePrefix'])) {
+            throw new \Exception('tablePrefix not set');
+        }
+        parent::__construct($params, $driver, $config, $eventManager);
+        $this->adapter = new $params['adapter']($this);
+        $this->tablePrefix = $params['tablePrefix'];
+
+        parent::setTransactionIsolation(parent::TRANSACTION_READ_COMMITTED);
+    }
+
+    /**
+     * Prepares an SQL statement.
+     *
+     * @param string $statement The SQL statement to prepare.
+     * @param int $limit
+     * @param int $offset
+     * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+     */
+    public function prepare( $statement, $limit=null, $offset=null ) {
+        if ($limit === -1) {
+            $limit = null;
+        }
+        if (!is_null($limit)) {
+            $platform = $this->getDatabasePlatform();
+            $statement = $platform->modifyLimitQuery($statement, $limit, $offset);
+        }
+        $statement = $this->replaceTablePrefix($statement);
+        $statement = $this->adapter->fixupStatement($statement);
+
+        return parent::prepare($statement);
+    }
+
+    /**
+     * Executes an, optionally parametrized, SQL query.
+     *
+     * If the query is parametrized, a prepared statement is used.
+     * If an SQLLogger is configured, the execution is logged.
+     *
+     * @param string                                      $query  The SQL query to execute.
+     * @param array                                       $params The parameters to bind to the query, if any.
+     * @param array                                       $types  The types the previous parameters are in.
+     * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
+     *
+     * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+     *
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
+    {
+        $query = $this->replaceTablePrefix($query);
+        $query = $this->adapter->fixupStatement($query);
+        return parent::executeQuery($query, $params, $types, $qcp);
+    }
+
+    /**
+     * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+     * and returns the number of affected rows.
+     *
+     * This method supports PDO binding types as well as DBAL mapping types.
+     *
+     * @param string $query  The SQL query.
+     * @param array  $params The query parameters.
+     * @param array  $types  The parameter types.
+     *
+     * @return integer The number of affected rows.
+     *
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function executeUpdate($query, array $params = array(), array $types = array())
+    {
+        $query = $this->replaceTablePrefix($query);
+        $query = $this->adapter->fixupStatement($query);
+        return parent::executeUpdate($query, $params, $types);
+    }
+
+    /**
+     * Returns the ID of the last inserted row, or the last value from a sequence object,
+     * depending on the underlying driver.
+     *
+     * Note: This method may not return a meaningful or consistent result across different drivers,
+     * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
+     * columns or sequences.
+     *
+     * @param string $seqName Name of the sequence object from which the ID should be returned.
+     * @return string A string representation of the last inserted ID.
+     */
+    public function lastInsertId($seqName = null) {
+        if ($seqName) {
+            $seqName = $this->replaceTablePrefix($seqName);
+        }
+        return $this->adapter->lastInsertId($seqName);
+    }
+
+    // internal use
+    public function realLastInsertId($seqName = null) {
+        return parent::lastInsertId($seqName);
+    }
+
+    /**
+     * Insert a row if the matching row does not exists.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        return $this->adapter->insertIfNotExist($table, $input, $compare);
+    }
+
+    private function getType($value) {
+        if (is_bool($value)) {
+            return IQueryBuilder::PARAM_BOOL;
+        } else if (is_int($value)) {
+            return IQueryBuilder::PARAM_INT;
+        } else {
+            return IQueryBuilder::PARAM_STR;
+        }
+    }
+
+    /**
+     * Insert or update a row value
+     *
+     * @param string $table
+     * @param array $keys (column name => value)
+     * @param array $values (column name => value)
+     * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
+     * @return int number of new rows
+     * @throws \Doctrine\DBAL\DBALException
+     * @throws PreConditionNotMetException
+     * @suppress SqlInjectionChecker
+     */
+    public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
+        try {
+            $insertQb = $this->getQueryBuilder();
+            $insertQb->insert($table)
+                ->values(
+                    array_map(function($value) use ($insertQb) {
+                        return $insertQb->createNamedParameter($value, $this->getType($value));
+                    }, array_merge($keys, $values))
+                );
+            return $insertQb->execute();
+        } catch (ConstraintViolationException $e) {
+            // value already exists, try update
+            $updateQb = $this->getQueryBuilder();
+            $updateQb->update($table);
+            foreach ($values as $name => $value) {
+                $updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
+            }
+            $where = $updateQb->expr()->andX();
+            $whereValues = array_merge($keys, $updatePreconditionValues);
+            foreach ($whereValues as $name => $value) {
+                $where->add($updateQb->expr()->eq(
+                    $name,
+                    $updateQb->createNamedParameter($value, $this->getType($value)),
+                    $this->getType($value)
+                ));
+            }
+            $updateQb->where($where);
+            $affected = $updateQb->execute();
+
+            if ($affected === 0 && !empty($updatePreconditionValues)) {
+                throw new PreConditionNotMetException();
+            }
+
+            return 0;
+        }
+    }
+
+    /**
+     * Create an exclusive read+write lock on a table
+     *
+     * @param string $tableName
+     * @throws \BadMethodCallException When trying to acquire a second lock
+     * @since 9.1.0
+     */
+    public function lockTable($tableName) {
+        if ($this->lockedTable !== null) {
+            throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
+        }
+
+        $tableName = $this->tablePrefix . $tableName;
+        $this->lockedTable = $tableName;
+        $this->adapter->lockTable($tableName);
+    }
+
+    /**
+     * Release a previous acquired lock again
+     *
+     * @since 9.1.0
+     */
+    public function unlockTable() {
+        $this->adapter->unlockTable();
+        $this->lockedTable = null;
+    }
+
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     */
+    public function getError() {
+        $msg = $this->errorCode() . ': ';
+        $errorInfo = $this->errorInfo();
+        if (is_array($errorInfo)) {
+            $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+            $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+            $msg .= 'Driver Message = '.$errorInfo[2];
+        }
+        return $msg;
+    }
+
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        if($schema->tablesExist(array($table))) {
+            $schema->dropTable($table);
+        }
+    }
+
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     */
+    public function tableExists($table){
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist(array($table));
+    }
+
+    // internal use
+    /**
+     * @param string $statement
+     * @return string
+     */
+    protected function replaceTablePrefix($statement) {
+        return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+    }
+
+    /**
+     * Check if a transaction is active
+     *
+     * @return bool
+     * @since 8.2.0
+     */
+    public function inTransaction() {
+        return $this->getTransactionNestingLevel() > 0;
+    }
+
+    /**
+     * Espace a parameter to be used in a LIKE query
+     *
+     * @param string $param
+     * @return string
+     */
+    public function escapeLikeParameter($param) {
+        return addcslashes($param, '\\_%');
+    }
+
+    /**
+     * Check whether or not the current database support 4byte wide unicode
+     *
+     * @return bool
+     * @since 11.0.0
+     */
+    public function supports4ByteText() {
+        if (!$this->getDatabasePlatform() instanceof MySqlPlatform) {
+            return true;
+        }
+        return $this->getParams()['charset'] === 'utf8mb4';
+    }
+
+
+    /**
+     * Create the schema of the connected database
+     *
+     * @return Schema
+     */
+    public function createSchema() {
+        $schemaManager = new MDB2SchemaManager($this);
+        $migrator = $schemaManager->getMigrator();
+        return $migrator->createSchema();
+    }
+
+    /**
+     * Migrate the database to the given schema
+     *
+     * @param Schema $toSchema
+     */
+    public function migrateToSchema(Schema $toSchema) {
+        $schemaManager = new MDB2SchemaManager($this);
+        $migrator = $schemaManager->getMigrator();
+        $migrator->migrate($toSchema);
+    }
 }

lib/private/Repair/OldGroupMembershipShares.php

Indentation +85 added lines, -85 removed lines

@@ -31,89 +31,89 @@
 
 class OldGroupMembershipShares implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @var array [gid => [uid => (bool)]]
-	 */
-	protected $memberships;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of old group memberships';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 * @suppress SqlInjectionChecker
-	 */
-	public function run(IOutput $output) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
-				->andWhere($query->expr()->isNotNull('s2.id'))
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			if (!$this->isMember($row['group'], $row['user'])) {
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
-					->execute();
-			}
-		}
-		$result->closeCursor();
-
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
-		}
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $uid
-	 * @return bool
-	 */
-	protected function isMember($gid, $uid) {
-		if (isset($this->memberships[$gid][$uid])) {
-			return $this->memberships[$gid][$uid];
-		}
-
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
-		if (!isset($this->memberships[$gid])) {
-			$this->memberships[$gid] = [];
-		}
-		$this->memberships[$gid][$uid] = $isMember;
-
-		return $isMember;
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @var array [gid => [uid => (bool)]]
+     */
+    protected $memberships;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of old group memberships';
+    }
+
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     * @suppress SqlInjectionChecker
+     */
+    public function run(IOutput $output) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
+                ->andWhere($query->expr()->isNotNull('s2.id'))
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            if (!$this->isMember($row['group'], $row['user'])) {
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
+                    ->execute();
+            }
+        }
+        $result->closeCursor();
+
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+        }
+    }
+
+    /**
+     * @param string $gid
+     * @param string $uid
+     * @return bool
+     */
+    protected function isMember($gid, $uid) {
+        if (isset($this->memberships[$gid][$uid])) {
+            return $this->memberships[$gid][$uid];
+        }
+
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
+        if (!isset($this->memberships[$gid])) {
+            $this->memberships[$gid] = [];
+        }
+        $this->memberships[$gid][$uid] = $isMember;
+
+        return $isMember;
+    }
 }

lib/private/Repair/RepairInvalidShares.php

Indentation +86 added lines, -86 removed lines

@@ -33,90 +33,90 @@
  */
 class RepairInvalidShares implements IRepairStep {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 * @suppress SqlInjectionChecker
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     * @suppress SqlInjectionChecker
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

lib/private/Repair/CleanTags.php

Indentation +168 added lines, -168 removed lines

@@ -37,172 +37,172 @@
  */
 class CleanTags implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	protected $deletedTags = 0;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IDBConnection $connection, IUserManager $userManager) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Clean tags and favorites';
-	}
-
-	/**
-	 * Updates the configuration after running an update
-	 */
-	public function run(IOutput $output) {
-		$this->deleteOrphanTags($output);
-		$this->deleteOrphanFileEntries($output);
-		$this->deleteOrphanTagEntries($output);
-		$this->deleteOrphanCategoryEntries($output);
-	}
-
-	/**
-	 * Delete tags for deleted users
-	 */
-	protected function deleteOrphanTags(IOutput $output) {
-		$offset = 0;
-		while ($this->checkTags($offset)) {
-			$offset += 50;
-		}
-
-		$output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
-	}
-
-	protected function checkTags($offset) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('uid')
-			->from('vcategory')
-			->groupBy('uid')
-			->orderBy('uid')
-			->setMaxResults(50)
-			->setFirstResult($offset);
-		$result = $query->execute();
-
-		$users = [];
-		$hadResults = false;
-		while ($row = $result->fetch()) {
-			$hadResults = true;
-			if (!$this->userManager->userExists($row['uid'])) {
-				$users[] = $row['uid'];
-			}
-		}
-		$result->closeCursor();
-
-		if (!$hadResults) {
-			// No more tags, stop looping
-			return false;
-		}
-
-		if (!empty($users)) {
-			$query = $this->connection->getQueryBuilder();
-			$query->delete('vcategory')
-				->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
-			$this->deletedTags += $query->execute();
-		}
-		return true;
-	}
-
-	/**
-	 * Delete tag entries for deleted files
-	 */
-	protected function deleteOrphanFileEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags for delete files have been removed.',
-			'vcategory_to_object', 'objid',
-			'filecache', 'fileid', 'path_hash'
-		);
-	}
-
-	/**
-	 * Delete tag entries for deleted tags
-	 */
-	protected function deleteOrphanTagEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tag entries for deleted tags have been removed.',
-			'vcategory_to_object', 'categoryid',
-			'vcategory', 'id', 'uid'
-		);
-	}
-
-	/**
-	 * Delete tags that have no entries
-	 */
-	protected function deleteOrphanCategoryEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags with no entries have been removed.',
-			'vcategory', 'id',
-			'vcategory_to_object', 'categoryid', 'type'
-		);
-	}
-
-	/**
-	 * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
-	 *
-	 * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
-	 * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
-	 * is being deleted.
-	 *
-	 * @param string $repairInfo
-	 * @param string $deleteTable
-	 * @param string $deleteId
-	 * @param string $sourceTable
-	 * @param string $sourceId
-	 * @param string $sourceNullColumn	If this column is null in the source table,
-	 * 								the entry is deleted in the $deleteTable
-	 * @suppress SqlInjectionChecker
-	 */
-	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('d.' . $deleteId)
-			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
-			->where(
-				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
-			)
-			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
-			);
-		$result = $qb->execute();
-
-		$orphanItems = array();
-		while ($row = $result->fetch()) {
-			$orphanItems[] = (int) $row[$deleteId];
-		}
-
-		if (!empty($orphanItems)) {
-			$orphanItemsBatch = array_chunk($orphanItems, 200);
-			foreach ($orphanItemsBatch as $items) {
-				$qb->delete($deleteTable)
-					->where(
-						$qb->expr()->eq('type', $qb->expr()->literal('files'))
-					)
-					->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
-				$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->execute();
-			}
-		}
-
-		if ($repairInfo) {
-			$output->info(sprintf($repairInfo, sizeof($orphanItems)));
-		}
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    protected $deletedTags = 0;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     */
+    public function __construct(IDBConnection $connection, IUserManager $userManager) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Clean tags and favorites';
+    }
+
+    /**
+     * Updates the configuration after running an update
+     */
+    public function run(IOutput $output) {
+        $this->deleteOrphanTags($output);
+        $this->deleteOrphanFileEntries($output);
+        $this->deleteOrphanTagEntries($output);
+        $this->deleteOrphanCategoryEntries($output);
+    }
+
+    /**
+     * Delete tags for deleted users
+     */
+    protected function deleteOrphanTags(IOutput $output) {
+        $offset = 0;
+        while ($this->checkTags($offset)) {
+            $offset += 50;
+        }
+
+        $output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
+    }
+
+    protected function checkTags($offset) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('uid')
+            ->from('vcategory')
+            ->groupBy('uid')
+            ->orderBy('uid')
+            ->setMaxResults(50)
+            ->setFirstResult($offset);
+        $result = $query->execute();
+
+        $users = [];
+        $hadResults = false;
+        while ($row = $result->fetch()) {
+            $hadResults = true;
+            if (!$this->userManager->userExists($row['uid'])) {
+                $users[] = $row['uid'];
+            }
+        }
+        $result->closeCursor();
+
+        if (!$hadResults) {
+            // No more tags, stop looping
+            return false;
+        }
+
+        if (!empty($users)) {
+            $query = $this->connection->getQueryBuilder();
+            $query->delete('vcategory')
+                ->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
+            $this->deletedTags += $query->execute();
+        }
+        return true;
+    }
+
+    /**
+     * Delete tag entries for deleted files
+     */
+    protected function deleteOrphanFileEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags for delete files have been removed.',
+            'vcategory_to_object', 'objid',
+            'filecache', 'fileid', 'path_hash'
+        );
+    }
+
+    /**
+     * Delete tag entries for deleted tags
+     */
+    protected function deleteOrphanTagEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tag entries for deleted tags have been removed.',
+            'vcategory_to_object', 'categoryid',
+            'vcategory', 'id', 'uid'
+        );
+    }
+
+    /**
+     * Delete tags that have no entries
+     */
+    protected function deleteOrphanCategoryEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags with no entries have been removed.',
+            'vcategory', 'id',
+            'vcategory_to_object', 'categoryid', 'type'
+        );
+    }
+
+    /**
+     * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
+     *
+     * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
+     * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
+     * is being deleted.
+     *
+     * @param string $repairInfo
+     * @param string $deleteTable
+     * @param string $deleteId
+     * @param string $sourceTable
+     * @param string $sourceId
+     * @param string $sourceNullColumn	If this column is null in the source table,
+     * 								the entry is deleted in the $deleteTable
+     * @suppress SqlInjectionChecker
+     */
+    protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('d.' . $deleteId)
+            ->from($deleteTable, 'd')
+            ->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
+            ->where(
+                $qb->expr()->eq('d.type', $qb->expr()->literal('files'))
+            )
+            ->andWhere(
+                $qb->expr()->isNull('s.' . $sourceNullColumn)
+            );
+        $result = $qb->execute();
+
+        $orphanItems = array();
+        while ($row = $result->fetch()) {
+            $orphanItems[] = (int) $row[$deleteId];
+        }
+
+        if (!empty($orphanItems)) {
+            $orphanItemsBatch = array_chunk($orphanItems, 200);
+            foreach ($orphanItemsBatch as $items) {
+                $qb->delete($deleteTable)
+                    ->where(
+                        $qb->expr()->eq('type', $qb->expr()->literal('files'))
+                    )
+                    ->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
+                $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->execute();
+            }
+        }
+
+        if ($repairInfo) {
+            $output->info(sprintf($repairInfo, sizeof($orphanItems)));
+        }
+    }
 }

lib/private/BackgroundJob/JobList.php

Indentation +294 added lines, -294 removed lines

@@ -36,298 +36,298 @@
 
 class JobList implements IJobList {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/**@var IConfig */
-	protected $config;
-
-	/**@var ITimeFactory */
-	protected $timeFactory;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function add($job, $argument = null) {
-		if (!$this->has($job, $argument)) {
-			if ($job instanceof IJob) {
-				$class = get_class($job);
-			} else {
-				$class = $job;
-			}
-
-			$argument = json_encode($argument);
-			if (strlen($argument) > 4000) {
-				throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
-			}
-
-			$query = $this->connection->getQueryBuilder();
-			$query->insert('jobs')
-				->values([
-					'class' => $query->createNamedParameter($class),
-					'argument' => $query->createNamedParameter($argument),
-					'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
-					'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
-				]);
-			$query->execute();
-		}
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function remove($job, $argument = null) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)));
-		if (!is_null($argument)) {
-			$argument = json_encode($argument);
-			$query->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
-		}
-		$query->execute();
-	}
-
-	/**
-	 * @param int $id
-	 */
-	protected function removeById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 * @return bool
-	 */
-	public function has($job, $argument) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-		$argument = json_encode($argument);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)))
-			->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)))
-			->setMaxResults(1);
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool) $row;
-	}
-
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return IJob[]
-	 * @deprecated 9.0.0 - This method is dangerous since it can cause load and
-	 * memory problems when creating too many instances.
-	 */
-	public function getAll() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs');
-		$result = $query->execute();
-
-		$jobs = [];
-		while ($row = $result->fetch()) {
-			$job = $this->buildJob($row);
-			if ($job) {
-				$jobs[] = $job;
-			}
-		}
-		$result->closeCursor();
-
-		return $jobs;
-	}
-
-	/**
-	 * get the next job in the list
-	 *
-	 * @return IJob|null
-	 */
-	public function getNext() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 12 * 3600, IQueryBuilder::PARAM_INT)))
-			->orderBy('last_checked', 'ASC')
-			->setMaxResults(1);
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('jobs')
-			->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
-			->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
-			->where($update->expr()->eq('id', $update->createParameter('jobid')))
-			->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
-			->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			$update->setParameter('jobid', $row['id']);
-			$update->setParameter('reserved_at', $row['reserved_at']);
-			$update->setParameter('last_checked', $row['last_checked']);
-			$count = $update->execute();
-
-			if ($count === 0) {
-				// Background job already executed elsewhere, try again.
-				return $this->getNext();
-			}
-			$job = $this->buildJob($row);
-
-			if ($job === null) {
-				// Background job from disabled app, try again.
-				return $this->getNext();
-			}
-
-			return $job;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param int $id
-	 * @return IJob|null
-	 */
-	public function getById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return $this->buildJob($row);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * get the job object from a row in the db
-	 *
-	 * @param array $row
-	 * @return IJob|null
-	 */
-	private function buildJob($row) {
-		try {
-			try {
-				// Try to load the job as a service
-				/** @var IJob $job */
-				$job = \OC::$server->query($row['class']);
-			} catch (QueryException $e) {
-				if (class_exists($row['class'])) {
-					$class = $row['class'];
-					$job = new $class();
-				} else {
-					// job from disabled app or old version of an app, no need to do anything
-					return null;
-				}
-			}
-
-			$job->setId($row['id']);
-			$job->setLastRun($row['last_run']);
-			$job->setArgument(json_decode($row['argument'], true));
-			return $job;
-		} catch (AutoloadNotAllowedException $e) {
-			// job is from a disabled app, ignore
-			return null;
-		}
-	}
-
-	/**
-	 * set the job that was last ran
-	 *
-	 * @param IJob $job
-	 */
-	public function setLastJob(IJob $job) {
-		$this->unlockJob($job);
-		$this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
-	}
-
-	/**
-	 * Remove the reservation for a job
-	 *
-	 * @param IJob $job
-	 * @suppress SqlInjectionChecker
-	 */
-	public function unlockJob(IJob $job) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * get the id of the last ran job
-	 *
-	 * @return int
-	 * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
-	 *    only tells you which job finished last, but since we now allow multiple
-	 *    executors to run in parallel, it's not used to calculate the next job.
-	 */
-	public function getLastJob() {
-		return (int) $this->config->getAppValue('backgroundjob', 'lastjob', 0);
-	}
-
-	/**
-	 * set the lastRun of $job to now
-	 *
-	 * @param IJob $job
-	 */
-	public function setLastRun(IJob $job) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * @param IJob $job
-	 * @param $timeTaken
-	 */
-	public function setExecutionTime(IJob $job, $timeTaken) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /**@var IConfig */
+    protected $config;
+
+    /**@var ITimeFactory */
+    protected $timeFactory;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function add($job, $argument = null) {
+        if (!$this->has($job, $argument)) {
+            if ($job instanceof IJob) {
+                $class = get_class($job);
+            } else {
+                $class = $job;
+            }
+
+            $argument = json_encode($argument);
+            if (strlen($argument) > 4000) {
+                throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
+            }
+
+            $query = $this->connection->getQueryBuilder();
+            $query->insert('jobs')
+                ->values([
+                    'class' => $query->createNamedParameter($class),
+                    'argument' => $query->createNamedParameter($argument),
+                    'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
+                    'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
+                ]);
+            $query->execute();
+        }
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function remove($job, $argument = null) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)));
+        if (!is_null($argument)) {
+            $argument = json_encode($argument);
+            $query->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
+        }
+        $query->execute();
+    }
+
+    /**
+     * @param int $id
+     */
+    protected function removeById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * check if a job is in the list
+     *
+     * @param IJob|string $job
+     * @param mixed $argument
+     * @return bool
+     */
+    public function has($job, $argument) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+        $argument = json_encode($argument);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)))
+            ->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)))
+            ->setMaxResults(1);
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        return (bool) $row;
+    }
+
+    /**
+     * get all jobs in the list
+     *
+     * @return IJob[]
+     * @deprecated 9.0.0 - This method is dangerous since it can cause load and
+     * memory problems when creating too many instances.
+     */
+    public function getAll() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs');
+        $result = $query->execute();
+
+        $jobs = [];
+        while ($row = $result->fetch()) {
+            $job = $this->buildJob($row);
+            if ($job) {
+                $jobs[] = $job;
+            }
+        }
+        $result->closeCursor();
+
+        return $jobs;
+    }
+
+    /**
+     * get the next job in the list
+     *
+     * @return IJob|null
+     */
+    public function getNext() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 12 * 3600, IQueryBuilder::PARAM_INT)))
+            ->orderBy('last_checked', 'ASC')
+            ->setMaxResults(1);
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('jobs')
+            ->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
+            ->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
+            ->where($update->expr()->eq('id', $update->createParameter('jobid')))
+            ->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
+            ->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            $update->setParameter('jobid', $row['id']);
+            $update->setParameter('reserved_at', $row['reserved_at']);
+            $update->setParameter('last_checked', $row['last_checked']);
+            $count = $update->execute();
+
+            if ($count === 0) {
+                // Background job already executed elsewhere, try again.
+                return $this->getNext();
+            }
+            $job = $this->buildJob($row);
+
+            if ($job === null) {
+                // Background job from disabled app, try again.
+                return $this->getNext();
+            }
+
+            return $job;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param int $id
+     * @return IJob|null
+     */
+    public function getById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return $this->buildJob($row);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * get the job object from a row in the db
+     *
+     * @param array $row
+     * @return IJob|null
+     */
+    private function buildJob($row) {
+        try {
+            try {
+                // Try to load the job as a service
+                /** @var IJob $job */
+                $job = \OC::$server->query($row['class']);
+            } catch (QueryException $e) {
+                if (class_exists($row['class'])) {
+                    $class = $row['class'];
+                    $job = new $class();
+                } else {
+                    // job from disabled app or old version of an app, no need to do anything
+                    return null;
+                }
+            }
+
+            $job->setId($row['id']);
+            $job->setLastRun($row['last_run']);
+            $job->setArgument(json_decode($row['argument'], true));
+            return $job;
+        } catch (AutoloadNotAllowedException $e) {
+            // job is from a disabled app, ignore
+            return null;
+        }
+    }
+
+    /**
+     * set the job that was last ran
+     *
+     * @param IJob $job
+     */
+    public function setLastJob(IJob $job) {
+        $this->unlockJob($job);
+        $this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
+    }
+
+    /**
+     * Remove the reservation for a job
+     *
+     * @param IJob $job
+     * @suppress SqlInjectionChecker
+     */
+    public function unlockJob(IJob $job) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * get the id of the last ran job
+     *
+     * @return int
+     * @deprecated 9.1.0 - The functionality behind the value is deprecated, it
+     *    only tells you which job finished last, but since we now allow multiple
+     *    executors to run in parallel, it's not used to calculate the next job.
+     */
+    public function getLastJob() {
+        return (int) $this->config->getAppValue('backgroundjob', 'lastjob', 0);
+    }
+
+    /**
+     * set the lastRun of $job to now
+     *
+     * @param IJob $job
+     */
+    public function setLastRun(IJob $job) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * @param IJob $job
+     * @param $timeTaken
+     */
+    public function setExecutionTime(IJob $job, $timeTaken) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
 }