upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Remove the need for the transaction in the database locking backend

Browse source
This commit is contained in:
Robin Appelman 2015-09-16 17:29:34 +02:00 committed by Thomas Müller
parent c9397dffea
commit 7c66328381
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/private/lock/dblockingprovider.php
View file

@ -76,11 +76,10 @@ class DBLockingProvider extends AbstractLockingProvider {
* @throws \OCP\Lock\LockedException
*/
public function acquireLock($path, $type) {
if ($this->connection->inTransaction()){
if ($this->connection->inTransaction()) {
$this->logger->warning("Trying to acquire a lock for '$path' while inside a transition");
}
$this->connection->beginTransaction();
$this->initLockField($path);
if ($type === self::LOCK_SHARED) {
$result = $this->connection->executeUpdate(
@ -93,7 +92,6 @@ class DBLockingProvider extends AbstractLockingProvider {
[$path]
);
}
$this->connection->commit();
if ($result !== 1) {
throw new LockedException($path);
}
@ -146,17 +144,4 @@ class DBLockingProvider extends AbstractLockingProvider {
}
$this->markChange($path, $targetType);
}
/**
* cleanup empty locks
*/
public function cleanEmptyLocks() {
$this->connection->executeUpdate(
'DELETE FROM `*PREFIX*file_locks` WHERE `lock` = 0'
);
}
public function __destruct() {
$this->cleanEmptyLocks();
}
}