nextcloud / server

apps/contactsinteraction/composer/composer/autoload_real.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -26,7 +26,7 @@ 
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitContactsInteraction', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
+        require __DIR__.'/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInitContactsInteraction::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);

apps/encryption/composer/composer/autoload_real.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -26,7 +26,7 @@ 
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitEncryption', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
+        require __DIR__.'/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInitEncryption::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);

apps/files_trashbin/composer/composer/autoload_real.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -26,7 +26,7 @@ 
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitFiles_Trashbin', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
+        require __DIR__.'/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Trashbin::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);

apps/theming/lib/Themes/DyslexiaFont.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		$originalFontFace = $variables['--font-face'];
 
 		$variables = [
-			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
+			'--font-face' => 'OpenDyslexic, '.$originalFontFace
 		];
 
 		return $variables;

Indentation +28 added lines, -28 removed lines

@@ -11,42 +11,42 @@ 
 
 class DyslexiaFont extends DefaultTheme implements ITheme {
 
-	public function getId(): string {
-		return 'opendyslexic';
-	}
+    public function getId(): string {
+        return 'opendyslexic';
+    }
 
-	public function getType(): int {
-		return ITheme::TYPE_FONT;
-	}
+    public function getType(): int {
+        return ITheme::TYPE_FONT;
+    }
 
-	public function getTitle(): string {
-		return $this->l->t('Dyslexia font');
-	}
+    public function getTitle(): string {
+        return $this->l->t('Dyslexia font');
+    }
 
-	public function getEnableLabel(): string {
-		return $this->l->t('Enable dyslexia font');
-	}
+    public function getEnableLabel(): string {
+        return $this->l->t('Enable dyslexia font');
+    }
 
-	public function getDescription(): string {
-		return $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.');
-	}
+    public function getDescription(): string {
+        return $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.');
+    }
 
-	public function getCSSVariables(): array {
-		$variables = parent::getCSSVariables();
-		$originalFontFace = $variables['--font-face'];
+    public function getCSSVariables(): array {
+        $variables = parent::getCSSVariables();
+        $originalFontFace = $variables['--font-face'];
 
-		$variables = [
-			'--font-face' => 'OpenDyslexic, ' . $originalFontFace
-		];
+        $variables = [
+            '--font-face' => 'OpenDyslexic, ' . $originalFontFace
+        ];
 
-		return $variables;
-	}
+        return $variables;
+    }
 
-	public function getCustomCss(): string {
-		$fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf');
-		$boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf');
+    public function getCustomCss(): string {
+        $fontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Regular.otf');
+        $boldFontPathOtf = $this->urlGenerator->linkTo('theming', 'fonts/OpenDyslexic-Bold.otf');
 
-		return "
+        return "
 			@font-face {
 				font-family: 'OpenDyslexic';
 				font-style: normal;
@@ -61,5 +61,5 @@ 
 				src: url('$boldFontPathOtf') format('opentype');
 			}
 		";
-	}
+    }
 }

core/Migrations/Version24000Date20220425072957.php

Indentation +16 added lines, -16 removed lines

@@ -32,22 +32,22 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20220425072957 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('mounts');
-		if (!$table->hasIndex('mount_user_storage')) {
-			$table->addIndex(['storage_id', 'user_id'], 'mount_user_storage');
-			return $schema;
-		}
+        $table = $schema->getTable('mounts');
+        if (!$table->hasIndex('mount_user_storage')) {
+            $table->addIndex(['storage_id', 'user_id'], 'mount_user_storage');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

lib/public/IEmojiHelper.php

Indentation +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@
  * @since 24.0.0
  */
 interface IEmojiHelper {
-	/**
-	 * @since 24.0.0
-	 */
-	public function doesPlatformSupportEmoji(): bool;
+    /**
+     * @since 24.0.0
+     */
+    public function doesPlatformSupportEmoji(): bool;
 
-	/**
-	 * @since 24.0.0
-	 */
-	public function isValidSingleEmoji(string $emoji): bool;
+    /**
+     * @since 24.0.0
+     */
+    public function isValidSingleEmoji(string $emoji): bool;
 }

lib/public/Lock/ILockingProvider.php

Indentation +38 added lines, -38 removed lines

@@ -36,47 +36,47 @@
  * @since 8.1.0
  */
 interface ILockingProvider {
-	/**
-	 * @since 8.1.0
-	 */
-	public const LOCK_SHARED = 1;
-	/**
-	 * @since 8.1.0
-	 */
-	public const LOCK_EXCLUSIVE = 2;
+    /**
+     * @since 8.1.0
+     */
+    public const LOCK_SHARED = 1;
+    /**
+     * @since 8.1.0
+     */
+    public const LOCK_EXCLUSIVE = 2;
 
-	/**
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
-	 * @since 8.1.0
-	 */
-	public function isLocked(string $path, int $type): bool;
+    /**
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
+     * @since 8.1.0
+     */
+    public function isLocked(string $path, int $type): bool;
 
-	/**
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
-	 * @param ?string $readablePath A human-readable path to use in error messages, since 20.0.0
-	 * @throws LockedException
-	 * @since 8.1.0
-	 */
-	public function acquireLock(string $path, int $type, ?string $readablePath = null): void;
+    /**
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
+     * @param ?string $readablePath A human-readable path to use in error messages, since 20.0.0
+     * @throws LockedException
+     * @since 8.1.0
+     */
+    public function acquireLock(string $path, int $type, ?string $readablePath = null): void;
 
-	/**
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
-	 * @since 8.1.0
-	 */
-	public function releaseLock(string $path, int $type): void;
+    /**
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $type
+     * @since 8.1.0
+     */
+    public function releaseLock(string $path, int $type): void;
 
-	/**
-	 * Change the target type of an existing lock
-	 *
-	 * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $targetType
-	 * @throws LockedException
-	 * @since 8.1.0
-	 */
-	public function changeLock(string $path, int $targetType): void;
+    /**
+     * Change the target type of an existing lock
+     *
+     * @psalm-param self::LOCK_SHARED|self::LOCK_EXCLUSIVE $targetType
+     * @throws LockedException
+     * @since 8.1.0
+     */
+    public function changeLock(string $path, int $targetType): void;
 
-	/**
-	 * Release all lock acquired by this instance
-	 * @since 8.1.0
-	 */
-	public function releaseAll(): void;
+    /**
+     * Release all lock acquired by this instance
+     * @since 8.1.0
+     */
+    public function releaseAll(): void;
 }

lib/private/Lock/DBLockingProvider.php

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 			->from('file_locks')
 			->where($query->expr()->eq('key', $query->createNamedParameter($path)));
 		$result = $query->executeQuery();
-		$lockValue = (int)$result->fetchOne();
+		$lockValue = (int) $result->fetchOne();
 		if ($type === self::LOCK_SHARED) {
 			if ($this->isLocallyLocked($path)) {
 				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
@@ -247,7 +247,7 @@ 
 		}
 		// since we keep shared locks we need to manually clean those
 		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
+		$lockedPaths = array_filter($lockedPaths, function($path) {
 			return $this->sharedLocks[$path];
 		});
 

Indentation +219 added lines, -219 removed lines

@@ -18,223 +18,223 @@
  * Locking provider that stores the locks in the database
  */
 class DBLockingProvider extends AbstractLockingProvider {
-	private array $sharedLocks = [];
-
-	public function __construct(
-		private IDBConnection $connection,
-		private ITimeFactory $timeFactory,
-		int $ttl = 3600,
-		private bool $cacheSharedLocks = true,
-	) {
-		parent::__construct($ttl);
-	}
-
-	/**
-	 * Check if we have an open shared lock for a path
-	 */
-	protected function isLocallyLocked(string $path): bool {
-		return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
-	}
-
-	/** @inheritDoc */
-	protected function markAcquire(string $path, int $targetType): void {
-		parent::markAcquire($path, $targetType);
-		if ($this->cacheSharedLocks) {
-			if ($targetType === self::LOCK_SHARED) {
-				$this->sharedLocks[$path] = true;
-			}
-		}
-	}
-
-	/**
-	 * Change the type of an existing tracked lock
-	 */
-	protected function markChange(string $path, int $targetType): void {
-		parent::markChange($path, $targetType);
-		if ($this->cacheSharedLocks) {
-			if ($targetType === self::LOCK_SHARED) {
-				$this->sharedLocks[$path] = true;
-			} elseif ($targetType === self::LOCK_EXCLUSIVE) {
-				$this->sharedLocks[$path] = false;
-			}
-		}
-	}
-
-	/**
-	 * Insert a file locking row if it does not exists.
-	 */
-	protected function initLockField(string $path, int $lock = 0): int {
-		$expire = $this->getExpireTime();
-		return $this->connection->insertIgnoreConflict('file_locks', [
-			'key' => $path,
-			'lock' => $lock,
-			'ttl' => $expire
-		]);
-	}
-
-	protected function getExpireTime(): int {
-		return $this->timeFactory->getTime() + $this->ttl;
-	}
-
-	/** @inheritDoc */
-	public function isLocked(string $path, int $type): bool {
-		if ($this->hasAcquiredLock($path, $type)) {
-			return true;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('lock')
-			->from('file_locks')
-			->where($query->expr()->eq('key', $query->createNamedParameter($path)));
-		$result = $query->executeQuery();
-		$lockValue = (int)$result->fetchOne();
-		if ($type === self::LOCK_SHARED) {
-			if ($this->isLocallyLocked($path)) {
-				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
-				return $lockValue > 1;
-			} else {
-				return $lockValue > 0;
-			}
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === -1;
-		} else {
-			return false;
-		}
-	}
-
-	/** @inheritDoc */
-	public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
-		$expire = $this->getExpireTime();
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->isLocallyLocked($path)) {
-				$result = $this->initLockField($path, 1);
-				if ($result <= 0) {
-					$query = $this->connection->getQueryBuilder();
-					$query->update('file_locks')
-						->set('lock', $query->func()->add('lock', $query->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
-						->set('ttl', $query->createNamedParameter($expire))
-						->where($query->expr()->eq('key', $query->createNamedParameter($path)))
-						->andWhere($query->expr()->gte('lock', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-					$result = $query->executeStatement();
-				}
-			} else {
-				$result = 1;
-			}
-		} else {
-			$existing = 0;
-			if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
-				$existing = 1;
-			}
-			$result = $this->initLockField($path, -1);
-			if ($result <= 0) {
-				$query = $this->connection->getQueryBuilder();
-				$query->update('file_locks')
-					->set('lock', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-					->set('ttl', $query->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
-					->where($query->expr()->eq('key', $query->createNamedParameter($path)))
-					->andWhere($query->expr()->eq('lock', $query->createNamedParameter($existing)));
-				$result = $query->executeStatement();
-			}
-		}
-		if ($result !== 1) {
-			throw new LockedException($path, null, null, $readablePath);
-		}
-		$this->markAcquire($path, $type);
-	}
-
-	/** @inheritDoc */
-	public function releaseLock(string $path, int $type): void {
-		$this->markRelease($path, $type);
-
-		// we keep shared locks till the end of the request so we can re-use them
-		if ($type === self::LOCK_EXCLUSIVE) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->update('file_locks')
-				->set('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-				->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
-				->andWhere($qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT)));
-			$qb->executeStatement();
-		} elseif (!$this->cacheSharedLocks) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->update('file_locks')
-				->set('lock', $qb->func()->subtract('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
-				->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
-				->andWhere($qb->expr()->gt('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-			$qb->executeStatement();
-		}
-	}
-
-	/** @inheritDoc */
-	public function changeLock(string $path, int $targetType): void {
-		$expire = $this->getExpireTime();
-		if ($targetType === self::LOCK_SHARED) {
-			$qb = $this->connection->getQueryBuilder();
-			$result = $qb->update('file_locks')
-				->set('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
-				->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
-				->where($qb->expr()->andX(
-					$qb->expr()->eq('key', $qb->createNamedParameter($path)),
-					$qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-				))->executeStatement();
-		} else {
-			// since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
-			if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
-				throw new LockedException($path);
-			}
-			$qb = $this->connection->getQueryBuilder();
-			$result = $qb->update('file_locks')
-				->set('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
-				->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
-				->where($qb->expr()->andX(
-					$qb->expr()->eq('key', $qb->createNamedParameter($path)),
-					$qb->expr()->eq('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
-				))->executeStatement();
-		}
-		if ($result !== 1) {
-			throw new LockedException($path);
-		}
-		$this->markChange($path, $targetType);
-	}
-
-	/** @inheritDoc */
-	public function cleanExpiredLocks(): void {
-		$expire = $this->timeFactory->getTime();
-		try {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('file_locks')
-				->where($qb->expr()->lt('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT)))
-				->executeStatement();
-		} catch (\Exception $e) {
-			// If the table is missing, the clean up was successful
-			if ($this->connection->tableExists('file_locks')) {
-				throw $e;
-			}
-		}
-	}
-
-	/** @inheritDoc */
-	public function releaseAll(): void {
-		parent::releaseAll();
-
-		if (!$this->cacheSharedLocks) {
-			return;
-		}
-		// since we keep shared locks we need to manually clean those
-		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
-			return $this->sharedLocks[$path];
-		});
-
-		$chunkedPaths = array_chunk($lockedPaths, 100);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('file_locks')
-			->set('lock', $qb->func()->subtract('lock', $qb->expr()->literal(1)))
-			->where($qb->expr()->in('key', $qb->createParameter('chunk')))
-			->andWhere($qb->expr()->gt('lock', new Literal(0)));
-
-		foreach ($chunkedPaths as $chunk) {
-			$qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$qb->executeStatement();
-		}
-	}
+    private array $sharedLocks = [];
+
+    public function __construct(
+        private IDBConnection $connection,
+        private ITimeFactory $timeFactory,
+        int $ttl = 3600,
+        private bool $cacheSharedLocks = true,
+    ) {
+        parent::__construct($ttl);
+    }
+
+    /**
+     * Check if we have an open shared lock for a path
+     */
+    protected function isLocallyLocked(string $path): bool {
+        return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
+    }
+
+    /** @inheritDoc */
+    protected function markAcquire(string $path, int $targetType): void {
+        parent::markAcquire($path, $targetType);
+        if ($this->cacheSharedLocks) {
+            if ($targetType === self::LOCK_SHARED) {
+                $this->sharedLocks[$path] = true;
+            }
+        }
+    }
+
+    /**
+     * Change the type of an existing tracked lock
+     */
+    protected function markChange(string $path, int $targetType): void {
+        parent::markChange($path, $targetType);
+        if ($this->cacheSharedLocks) {
+            if ($targetType === self::LOCK_SHARED) {
+                $this->sharedLocks[$path] = true;
+            } elseif ($targetType === self::LOCK_EXCLUSIVE) {
+                $this->sharedLocks[$path] = false;
+            }
+        }
+    }
+
+    /**
+     * Insert a file locking row if it does not exists.
+     */
+    protected function initLockField(string $path, int $lock = 0): int {
+        $expire = $this->getExpireTime();
+        return $this->connection->insertIgnoreConflict('file_locks', [
+            'key' => $path,
+            'lock' => $lock,
+            'ttl' => $expire
+        ]);
+    }
+
+    protected function getExpireTime(): int {
+        return $this->timeFactory->getTime() + $this->ttl;
+    }
+
+    /** @inheritDoc */
+    public function isLocked(string $path, int $type): bool {
+        if ($this->hasAcquiredLock($path, $type)) {
+            return true;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('lock')
+            ->from('file_locks')
+            ->where($query->expr()->eq('key', $query->createNamedParameter($path)));
+        $result = $query->executeQuery();
+        $lockValue = (int)$result->fetchOne();
+        if ($type === self::LOCK_SHARED) {
+            if ($this->isLocallyLocked($path)) {
+                // if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
+                return $lockValue > 1;
+            } else {
+                return $lockValue > 0;
+            }
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === -1;
+        } else {
+            return false;
+        }
+    }
+
+    /** @inheritDoc */
+    public function acquireLock(string $path, int $type, ?string $readablePath = null): void {
+        $expire = $this->getExpireTime();
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->isLocallyLocked($path)) {
+                $result = $this->initLockField($path, 1);
+                if ($result <= 0) {
+                    $query = $this->connection->getQueryBuilder();
+                    $query->update('file_locks')
+                        ->set('lock', $query->func()->add('lock', $query->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
+                        ->set('ttl', $query->createNamedParameter($expire))
+                        ->where($query->expr()->eq('key', $query->createNamedParameter($path)))
+                        ->andWhere($query->expr()->gte('lock', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+                    $result = $query->executeStatement();
+                }
+            } else {
+                $result = 1;
+            }
+        } else {
+            $existing = 0;
+            if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
+                $existing = 1;
+            }
+            $result = $this->initLockField($path, -1);
+            if ($result <= 0) {
+                $query = $this->connection->getQueryBuilder();
+                $query->update('file_locks')
+                    ->set('lock', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+                    ->set('ttl', $query->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
+                    ->where($query->expr()->eq('key', $query->createNamedParameter($path)))
+                    ->andWhere($query->expr()->eq('lock', $query->createNamedParameter($existing)));
+                $result = $query->executeStatement();
+            }
+        }
+        if ($result !== 1) {
+            throw new LockedException($path, null, null, $readablePath);
+        }
+        $this->markAcquire($path, $type);
+    }
+
+    /** @inheritDoc */
+    public function releaseLock(string $path, int $type): void {
+        $this->markRelease($path, $type);
+
+        // we keep shared locks till the end of the request so we can re-use them
+        if ($type === self::LOCK_EXCLUSIVE) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->update('file_locks')
+                ->set('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+                ->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
+                ->andWhere($qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT)));
+            $qb->executeStatement();
+        } elseif (!$this->cacheSharedLocks) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->update('file_locks')
+                ->set('lock', $qb->func()->subtract('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)))
+                ->where($qb->expr()->eq('key', $qb->createNamedParameter($path)))
+                ->andWhere($qb->expr()->gt('lock', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+            $qb->executeStatement();
+        }
+    }
+
+    /** @inheritDoc */
+    public function changeLock(string $path, int $targetType): void {
+        $expire = $this->getExpireTime();
+        if ($targetType === self::LOCK_SHARED) {
+            $qb = $this->connection->getQueryBuilder();
+            $result = $qb->update('file_locks')
+                ->set('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
+                ->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
+                ->where($qb->expr()->andX(
+                    $qb->expr()->eq('key', $qb->createNamedParameter($path)),
+                    $qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+                ))->executeStatement();
+        } else {
+            // since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
+            if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
+                throw new LockedException($path);
+            }
+            $qb = $this->connection->getQueryBuilder();
+            $result = $qb->update('file_locks')
+                ->set('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
+                ->set('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT))
+                ->where($qb->expr()->andX(
+                    $qb->expr()->eq('key', $qb->createNamedParameter($path)),
+                    $qb->expr()->eq('lock', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT))
+                ))->executeStatement();
+        }
+        if ($result !== 1) {
+            throw new LockedException($path);
+        }
+        $this->markChange($path, $targetType);
+    }
+
+    /** @inheritDoc */
+    public function cleanExpiredLocks(): void {
+        $expire = $this->timeFactory->getTime();
+        try {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('file_locks')
+                ->where($qb->expr()->lt('ttl', $qb->createNamedParameter($expire, IQueryBuilder::PARAM_INT)))
+                ->executeStatement();
+        } catch (\Exception $e) {
+            // If the table is missing, the clean up was successful
+            if ($this->connection->tableExists('file_locks')) {
+                throw $e;
+            }
+        }
+    }
+
+    /** @inheritDoc */
+    public function releaseAll(): void {
+        parent::releaseAll();
+
+        if (!$this->cacheSharedLocks) {
+            return;
+        }
+        // since we keep shared locks we need to manually clean those
+        $lockedPaths = array_keys($this->sharedLocks);
+        $lockedPaths = array_filter($lockedPaths, function ($path) {
+            return $this->sharedLocks[$path];
+        });
+
+        $chunkedPaths = array_chunk($lockedPaths, 100);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('file_locks')
+            ->set('lock', $qb->func()->subtract('lock', $qb->expr()->literal(1)))
+            ->where($qb->expr()->in('key', $qb->createParameter('chunk')))
+            ->andWhere($qb->expr()->gt('lock', new Literal(0)));
+
+        foreach ($chunkedPaths as $chunk) {
+            $qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $qb->executeStatement();
+        }
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	public function stopQuery() {
 		if ($this->activated && $this->activeQuery) {
 			$this->activeQuery->end(microtime(true));
-			$this->queries[(string)$this->index] = $this->activeQuery;
+			$this->queries[(string) $this->index] = $this->activeQuery;
 			$this->index++;
 			$this->activeQuery = null;
 		}

Indentation +52 added lines, -52 removed lines

@@ -11,64 +11,64 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	protected int $index = 0;
-	protected ?Query $activeQuery = null;
-	/** @var CappedMemoryCache<Query> */
-	protected CappedMemoryCache $queries;
+    protected int $index = 0;
+    protected ?Query $activeQuery = null;
+    /** @var CappedMemoryCache<Query> */
+    protected CappedMemoryCache $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, ?array $params = null, ?array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, ?array $params = null, ?array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[(string)$this->index] = $this->activeQuery;
-			$this->index++;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[(string)$this->index] = $this->activeQuery;
+            $this->index++;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }