nextcloud / server

lib/private/Files/Cache/Propagator.php

Indentation +195 added lines, -195 removed lines

@@ -36,199 +36,199 @@
  * Propagate etags and mtimes within the storage
  */
 class Propagator implements IPropagator {
-	public const MAX_RETRIES = 3;
-	private $inBatch = false;
-
-	private $batch = [];
-
-	/**
-	 * @var \OC\Files\Storage\Storage
-	 */
-	protected $storage;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @var array
-	 */
-	private $ignore = [];
-
-	public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection, array $ignore = []) {
-		$this->storage = $storage;
-		$this->connection = $connection;
-		$this->ignore = $ignore;
-	}
-
-
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference number of bytes the file has grown
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		// Do not propagate changes in ignored paths
-		foreach ($this->ignore as $ignore) {
-			if (strpos($internalPath, $ignore) === 0) {
-				return;
-			}
-		}
-
-		$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->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT)))
-			->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->in('path_hash', $hashParams));
-		if (!$this->storage->instanceOfStorage(IReliableEtagStorage::class)) {
-			$builder->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR));
-		}
-
-		if ($sizeDifference !== 0) {
-			$hasCalculatedSize = $builder->expr()->gt('size', $builder->expr()->literal(-1, IQUeryBuilder::PARAM_INT));
-			$sizeColumn = $builder->getColumnName('size');
-			$newSize = $builder->func()->greatest(
-				$builder->func()->add('size', $builder->createNamedParameter($sizeDifference)),
-				$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
-			);
-
-			// Only update if row had a previously calculated size
-			$builder->set('size', $builder->createFunction("CASE WHEN $hasCalculatedSize THEN $newSize ELSE $sizeColumn END"));
-
-			if ($this->storage->instanceOfStorage(Encryption::class)) {
-				// in case of encryption being enabled after some files are already uploaded, some entries will have an unencrypted_size of 0 and a non-zero size
-				$hasUnencryptedSize = $builder->expr()->neq('unencrypted_size', $builder->expr()->literal(0, IQueryBuilder::PARAM_INT));
-				$sizeColumn = $builder->getColumnName('size');
-				$unencryptedSizeColumn = $builder->getColumnName('unencrypted_size');
-				$newUnencryptedSize = $builder->func()->greatest(
-					$builder->func()->add(
-						$builder->createFunction("CASE WHEN $hasUnencryptedSize THEN $unencryptedSizeColumn ELSE $sizeColumn END"),
-						$builder->createNamedParameter($sizeDifference)
-					),
-					$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
-				);
-
-				// Only update if row had a previously calculated size
-				$builder->set('unencrypted_size', $builder->createFunction("CASE WHEN $hasCalculatedSize THEN $newUnencryptedSize ELSE $unencryptedSizeColumn END"));
-			}
-		}
-
-		for ($i = 0; $i < self::MAX_RETRIES; $i++) {
-			try {
-				$builder->executeStatement();
-				break;
-			} catch (DbalException $e) {
-				if (!$e->isRetryable()) {
-					throw $e;
-				}
-
-				/** @var LoggerInterface $loggerInterface */
-				$loggerInterface = \OCP\Server::get(LoggerInterface::class);
-				$loggerInterface->warning('Retrying propagation query after retryable exception.', [ 'exception' => $e ]);
-			}
-		}
-	}
-
-	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
-	 */
-	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->func()->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->func()->add('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();
-	}
+    public const MAX_RETRIES = 3;
+    private $inBatch = false;
+
+    private $batch = [];
+
+    /**
+     * @var \OC\Files\Storage\Storage
+     */
+    protected $storage;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @var array
+     */
+    private $ignore = [];
+
+    public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection, array $ignore = []) {
+        $this->storage = $storage;
+        $this->connection = $connection;
+        $this->ignore = $ignore;
+    }
+
+
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference number of bytes the file has grown
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        // Do not propagate changes in ignored paths
+        foreach ($this->ignore as $ignore) {
+            if (strpos($internalPath, $ignore) === 0) {
+                return;
+            }
+        }
+
+        $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->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT)))
+            ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->in('path_hash', $hashParams));
+        if (!$this->storage->instanceOfStorage(IReliableEtagStorage::class)) {
+            $builder->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR));
+        }
+
+        if ($sizeDifference !== 0) {
+            $hasCalculatedSize = $builder->expr()->gt('size', $builder->expr()->literal(-1, IQUeryBuilder::PARAM_INT));
+            $sizeColumn = $builder->getColumnName('size');
+            $newSize = $builder->func()->greatest(
+                $builder->func()->add('size', $builder->createNamedParameter($sizeDifference)),
+                $builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
+            );
+
+            // Only update if row had a previously calculated size
+            $builder->set('size', $builder->createFunction("CASE WHEN $hasCalculatedSize THEN $newSize ELSE $sizeColumn END"));
+
+            if ($this->storage->instanceOfStorage(Encryption::class)) {
+                // in case of encryption being enabled after some files are already uploaded, some entries will have an unencrypted_size of 0 and a non-zero size
+                $hasUnencryptedSize = $builder->expr()->neq('unencrypted_size', $builder->expr()->literal(0, IQueryBuilder::PARAM_INT));
+                $sizeColumn = $builder->getColumnName('size');
+                $unencryptedSizeColumn = $builder->getColumnName('unencrypted_size');
+                $newUnencryptedSize = $builder->func()->greatest(
+                    $builder->func()->add(
+                        $builder->createFunction("CASE WHEN $hasUnencryptedSize THEN $unencryptedSizeColumn ELSE $sizeColumn END"),
+                        $builder->createNamedParameter($sizeDifference)
+                    ),
+                    $builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
+                );
+
+                // Only update if row had a previously calculated size
+                $builder->set('unencrypted_size', $builder->createFunction("CASE WHEN $hasCalculatedSize THEN $newUnencryptedSize ELSE $unencryptedSizeColumn END"));
+            }
+        }
+
+        for ($i = 0; $i < self::MAX_RETRIES; $i++) {
+            try {
+                $builder->executeStatement();
+                break;
+            } catch (DbalException $e) {
+                if (!$e->isRetryable()) {
+                    throw $e;
+                }
+
+                /** @var LoggerInterface $loggerInterface */
+                $loggerInterface = \OCP\Server::get(LoggerInterface::class);
+                $loggerInterface->warning('Retrying propagation query after retryable exception.', [ 'exception' => $e ]);
+            }
+        }
+    }
+
+    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
+     */
+    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->func()->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->func()->add('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 +6 added lines, -6 removed lines

@@ -76,7 +76,7 @@ 
 			}
 		}
 
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
+		$storageId = (int) $this->storage->getStorageCache()->getNumericId();
 
 		$parents = $this->getParents($internalPath);
 
@@ -91,12 +91,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->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT)))
+			->set('mtime', $builder->func()->greatest('mtime', $builder->createNamedParameter((int) $time, IQueryBuilder::PARAM_INT)))
 			->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
 			->andWhere($builder->expr()->in('path_hash', $hashParams));
 		if (!$this->storage->instanceOfStorage(IReliableEtagStorage::class)) {
@@ -143,7 +143,7 @@ 
 
 				/** @var LoggerInterface $loggerInterface */
 				$loggerInterface = \OCP\Server::get(LoggerInterface::class);
-				$loggerInterface->warning('Retrying propagation query after retryable exception.', [ 'exception' => $e ]);
+				$loggerInterface->warning('Retrying propagation query after retryable exception.', ['exception' => $e]);
 			}
 		}
 	}
@@ -154,7 +154,7 @@ 
 		$parents = [];
 		foreach ($parts as $part) {
 			$parents[] = $parent;
-			$parent = trim($parent . '/' . $part, '/');
+			$parent = trim($parent.'/'.$part, '/');
 		}
 		return $parents;
 	}
@@ -198,7 +198,7 @@ 
 		$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->func()->greatest('mtime', $query->createParameter('time')))

lib/private/DB/Exceptions/DbalException.php

Indentation +81 added lines, -81 removed lines

@@ -50,92 +50,92 @@
  * @psalm-immutable
  */
 class DbalException extends Exception {
-	/** @var \Doctrine\DBAL\Exception */
-	private $original;
+    /** @var \Doctrine\DBAL\Exception */
+    private $original;
 
-	/**
-	 * @param \Doctrine\DBAL\Exception $original
-	 * @param int $code
-	 * @param string $message
-	 */
-	private function __construct(\Doctrine\DBAL\Exception $original, int $code, string $message) {
-		parent::__construct(
-			$message,
-			$code,
-			$original
-		);
-		$this->original = $original;
-	}
+    /**
+     * @param \Doctrine\DBAL\Exception $original
+     * @param int $code
+     * @param string $message
+     */
+    private function __construct(\Doctrine\DBAL\Exception $original, int $code, string $message) {
+        parent::__construct(
+            $message,
+            $code,
+            $original
+        );
+        $this->original = $original;
+    }
 
-	public static function wrap(\Doctrine\DBAL\Exception $original, string $message = ''): self {
-		return new self(
-			$original,
-			is_int($original->getCode()) ? $original->getCode() : 0,
-			empty($message) ? $original->getMessage() : $message
-		);
-	}
+    public static function wrap(\Doctrine\DBAL\Exception $original, string $message = ''): self {
+        return new self(
+            $original,
+            is_int($original->getCode()) ? $original->getCode() : 0,
+            empty($message) ? $original->getMessage() : $message
+        );
+    }
 
-	public function isRetryable(): bool {
-		return $this->original instanceof RetryableException;
-	}
+    public function isRetryable(): bool {
+        return $this->original instanceof RetryableException;
+    }
 
-	public function getReason(): ?int {
-		/**
-		 * Constraint errors
-		 */
-		if ($this->original instanceof ForeignKeyConstraintViolationException) {
-			return parent::REASON_FOREIGN_KEY_VIOLATION;
-		}
-		if ($this->original instanceof NotNullConstraintViolationException) {
-			return parent::REASON_NOT_NULL_CONSTRAINT_VIOLATION;
-		}
-		if ($this->original instanceof UniqueConstraintViolationException) {
-			return parent::REASON_UNIQUE_CONSTRAINT_VIOLATION;
-		}
-		// The base exception comes last
-		if ($this->original instanceof ConstraintViolationException) {
-			return parent::REASON_CONSTRAINT_VIOLATION;
-		}
+    public function getReason(): ?int {
+        /**
+         * Constraint errors
+         */
+        if ($this->original instanceof ForeignKeyConstraintViolationException) {
+            return parent::REASON_FOREIGN_KEY_VIOLATION;
+        }
+        if ($this->original instanceof NotNullConstraintViolationException) {
+            return parent::REASON_NOT_NULL_CONSTRAINT_VIOLATION;
+        }
+        if ($this->original instanceof UniqueConstraintViolationException) {
+            return parent::REASON_UNIQUE_CONSTRAINT_VIOLATION;
+        }
+        // The base exception comes last
+        if ($this->original instanceof ConstraintViolationException) {
+            return parent::REASON_CONSTRAINT_VIOLATION;
+        }
 
-		/**
-		 * Other server errors
-		 */
-		if ($this->original instanceof DatabaseObjectExistsException) {
-			return parent::REASON_DATABASE_OBJECT_EXISTS;
-		}
-		if ($this->original instanceof DatabaseObjectNotFoundException) {
-			return parent::REASON_DATABASE_OBJECT_NOT_FOUND;
-		}
-		if ($this->original instanceof DeadlockException) {
-			return parent::REASON_DEADLOCK;
-		}
-		if ($this->original instanceof InvalidFieldNameException) {
-			return parent::REASON_INVALID_FIELD_NAME;
-		}
-		if ($this->original instanceof NonUniqueFieldNameException) {
-			return parent::REASON_NON_UNIQUE_FIELD_NAME;
-		}
-		if ($this->original instanceof SyntaxErrorException) {
-			return parent::REASON_SYNTAX_ERROR;
-		}
-		// The base server exception class comes last
-		if ($this->original instanceof ServerException) {
-			return parent::REASON_SERVER;
-		}
+        /**
+         * Other server errors
+         */
+        if ($this->original instanceof DatabaseObjectExistsException) {
+            return parent::REASON_DATABASE_OBJECT_EXISTS;
+        }
+        if ($this->original instanceof DatabaseObjectNotFoundException) {
+            return parent::REASON_DATABASE_OBJECT_NOT_FOUND;
+        }
+        if ($this->original instanceof DeadlockException) {
+            return parent::REASON_DEADLOCK;
+        }
+        if ($this->original instanceof InvalidFieldNameException) {
+            return parent::REASON_INVALID_FIELD_NAME;
+        }
+        if ($this->original instanceof NonUniqueFieldNameException) {
+            return parent::REASON_NON_UNIQUE_FIELD_NAME;
+        }
+        if ($this->original instanceof SyntaxErrorException) {
+            return parent::REASON_SYNTAX_ERROR;
+        }
+        // The base server exception class comes last
+        if ($this->original instanceof ServerException) {
+            return parent::REASON_SERVER;
+        }
 
-		/**
-		 * Generic errors
-		 */
-		if ($this->original instanceof ConnectionException) {
-			return parent::REASON_CONNECTION_LOST;
-		}
-		if ($this->original instanceof InvalidArgumentException) {
-			return parent::REASON_INVALID_ARGUMENT;
-		}
-		if ($this->original instanceof DriverException) {
-			return parent::REASON_DRIVER;
-		}
+        /**
+         * Generic errors
+         */
+        if ($this->original instanceof ConnectionException) {
+            return parent::REASON_CONNECTION_LOST;
+        }
+        if ($this->original instanceof InvalidArgumentException) {
+            return parent::REASON_INVALID_ARGUMENT;
+        }
+        if ($this->original instanceof DriverException) {
+            return parent::REASON_DRIVER;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }