diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-11-13 17:03:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 17:03:51 +0300 |
commit | 204466c71429b99f15649dd1e2afed60011f2168 (patch) | |
tree | 4388be90cd4e5f00e7f950539f221a95bd9be132 | |
parent | 413121dea1378777b1a717a268cea906010a7c81 (diff) | |
parent | 243516d785a6d1c22600cd4cdd4c5cf9cd21b0d2 (diff) |
Merge pull request #12434 from nextcloud/backport/12411-12413/unique-constraint-fix-13
[stable13] Unique contraint and deadlock fixes for filecache and file_locks
-rw-r--r-- | lib/private/Files/Cache/Cache.php | 25 | ||||
-rw-r--r-- | lib/private/Lock/DBLockingProvider.php | 13 |
2 files changed, 30 insertions, 8 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index cf017c73960..947dd11b4f4 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -37,6 +37,7 @@ namespace OC\Files\Cache; +use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OCP\DB\QueryBuilder\IQueryBuilder; use Doctrine\DBAL\Driver\Statement; use OCP\Files\Cache\ICache; @@ -239,6 +240,8 @@ class Cache implements ICache { * * @return int file id * @throws \RuntimeException + * + * @suppress SqlInjectionChecker */ public function insert($file, array $data) { // normalize file @@ -269,12 +272,20 @@ class Cache implements ICache { 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'); + + try { + $builder = $this->connection->getQueryBuilder(); + $builder->insert('filecache'); + + foreach ($values as $column => $value) { + $builder->setValue($column, $builder->createNamedParameter($value)); + } + + if ($builder->execute()) { + return (int)$this->connection->lastInsertId('*PREFIX*filecache'); + } + } catch(UniqueConstraintViolationException $e) { + // entry exists already } // The file was created in the mean time @@ -282,7 +293,7 @@ class Cache implements ICache { $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.'); + throw new \RuntimeException('File entry could not be inserted but could also not be selected with getId() in order to perform an update. Please try again.'); } } diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php index 9de1098a466..f5d92675076 100644 --- a/lib/private/Lock/DBLockingProvider.php +++ b/lib/private/Lock/DBLockingProvider.php @@ -26,6 +26,7 @@ namespace OC\Lock; +use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OC\DB\QueryBuilder\Literal; use OCP\AppFramework\Utility\ITimeFactory; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -116,7 +117,17 @@ class DBLockingProvider extends AbstractLockingProvider { protected function initLockField($path, $lock = 0) { $expire = $this->getExpireTime(); - return $this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire], ['key']); + + try { + $builder = $this->connection->getQueryBuilder(); + return $builder->insert('file_locks') + ->setValue('key', $builder->createNamedParameter($path)) + ->setValue('lock', $builder->createNamedParameter($lock)) + ->setValue('ttl', $builder->createNamedParameter($expire)) + ->execute(); + } catch(UniqueConstraintViolationException $e) { + return 0; + } } /** |