nextcloud / server

lib/private/Files/Cache/StorageGlobal.php

Indentation +66 added lines, -66 removed lines

@@ -38,81 +38,81 @@
  * @package OC\Files\Cache
  */
 class StorageGlobal {
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var array<string, array> */
-	private $cache = [];
-	/** @var array<int, array> */
-	private $numericIdCache = [];
+    /** @var array<string, array> */
+    private $cache = [];
+    /** @var array<int, array> */
+    private $numericIdCache = [];
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	/**
-	 * @param string[] $storageIds
-	 */
-	public function loadForStorageIds(array $storageIds) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
-			->from('storages')
-			->where($builder->expr()->in('id', $builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)));
+    /**
+     * @param string[] $storageIds
+     */
+    public function loadForStorageIds(array $storageIds) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
+            ->from('storages')
+            ->where($builder->expr()->in('id', $builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)));
 
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$this->cache[$row['id']] = $row;
-		}
-		$result->closeCursor();
-	}
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $this->cache[$row['id']] = $row;
+        }
+        $result->closeCursor();
+    }
 
-	/**
-	 * @param string $storageId
-	 * @return array|null
-	 */
-	public function getStorageInfo(string $storageId): ?array {
-		if (!isset($this->cache[$storageId])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
-				->from('storages')
-				->where($builder->expr()->eq('id', $builder->createNamedParameter($storageId)));
+    /**
+     * @param string $storageId
+     * @return array|null
+     */
+    public function getStorageInfo(string $storageId): ?array {
+        if (!isset($this->cache[$storageId])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
+                ->from('storages')
+                ->where($builder->expr()->eq('id', $builder->createNamedParameter($storageId)));
 
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
 
-			if ($row) {
-				$this->cache[$storageId] = $row;
-				$this->numericIdCache[(int)$row['numeric_id']] = $row;
-			}
-		}
-		return $this->cache[$storageId] ?? null;
-	}
+            if ($row) {
+                $this->cache[$storageId] = $row;
+                $this->numericIdCache[(int)$row['numeric_id']] = $row;
+            }
+        }
+        return $this->cache[$storageId] ?? null;
+    }
 
-	/**
-	 * @param int $numericId
-	 * @return array|null
-	 */
-	public function getStorageInfoByNumericId(int $numericId): ?array {
-		if (!isset($this->numericIdCache[$numericId])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
-				->from('storages')
-				->where($builder->expr()->eq('numeric_id', $builder->createNamedParameter($numericId)));
+    /**
+     * @param int $numericId
+     * @return array|null
+     */
+    public function getStorageInfoByNumericId(int $numericId): ?array {
+        if (!isset($this->numericIdCache[$numericId])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
+                ->from('storages')
+                ->where($builder->expr()->eq('numeric_id', $builder->createNamedParameter($numericId)));
 
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
 
-			if ($row) {
-				$this->numericIdCache[$numericId] = $row;
-				$this->cache[$row['id']] = $row;
-			}
-		}
-		return $this->numericIdCache[$numericId] ?? null;
-	}
+            if ($row) {
+                $this->numericIdCache[$numericId] = $row;
+                $this->cache[$row['id']] = $row;
+            }
+        }
+        return $this->numericIdCache[$numericId] ?? null;
+    }
 
-	public function clearCache() {
-		$this->cache = [];
-	}
+    public function clearCache() {
+        $this->cache = [];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 
 			if ($row) {
 				$this->cache[$storageId] = $row;
-				$this->numericIdCache[(int)$row['numeric_id']] = $row;
+				$this->numericIdCache[(int) $row['numeric_id']] = $row;
 			}
 		}
 		return $this->cache[$storageId] ?? null;

lib/private/Files/Cache/Storage.php

Indentation +207 added lines, -207 removed lines

@@ -45,211 +45,211 @@
  * @package OC\Files\Cache
  */
 class Storage {
-	/** @var StorageGlobal|null */
-	private static $globalCache = null;
-	private $storageId;
-	private $numericId;
-
-	/**
-	 * @return StorageGlobal
-	 */
-	public static function getGlobalCache() {
-		if (is_null(self::$globalCache)) {
-			self::$globalCache = new StorageGlobal(\OC::$server->getDatabaseConnection());
-		}
-		return self::$globalCache;
-	}
-
-	/**
-	 * @param \OC\Files\Storage\Storage|string $storage
-	 * @param bool $isAvailable
-	 * @throws \RuntimeException
-	 */
-	public function __construct($storage, $isAvailable = true) {
-		if ($storage instanceof IStorage) {
-			$this->storageId = $storage->getId();
-		} else {
-			$this->storageId = $storage;
-		}
-		$this->storageId = self::adjustStorageId($this->storageId);
-
-		if ($row = self::getStorageById($this->storageId)) {
-			$this->numericId = (int)$row['numeric_id'];
-		} else {
-			$connection = \OC::$server->getDatabaseConnection();
-			$available = $isAvailable ? 1 : 0;
-			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
-				$this->numericId = $connection->lastInsertId('*PREFIX*storages');
-			} else {
-				if ($row = self::getStorageById($this->storageId)) {
-					$this->numericId = (int)$row['numeric_id'];
-				} else {
-					throw new \RuntimeException('Storage could neither be inserted nor be selected from the database: ' . $this->storageId);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $storageId
-	 * @return array
-	 */
-	public static function getStorageById($storageId) {
-		return self::getGlobalCache()->getStorageInfo($storageId);
-	}
-
-	/**
-	 * Adjusts the storage id to use md5 if too long
-	 * @param string $storageId storage id
-	 * @return string unchanged $storageId if its length is less than 64 characters,
-	 * else returns the md5 of $storageId
-	 */
-	public static function adjustStorageId($storageId) {
-		if (strlen($storageId) > 64) {
-			return md5($storageId);
-		}
-		return $storageId;
-	}
-
-	/**
-	 * Get the numeric id for the storage
-	 *
-	 * @return int
-	 */
-	public function getNumericId() {
-		return $this->numericId;
-	}
-
-	/**
-	 * Get the string id for the storage
-	 *
-	 * @param int $numericId
-	 * @return string|null either the storage id string or null if the numeric id is not known
-	 */
-	public static function getStorageId(int $numericId): ?string {
-		$storage = self::getGlobalCache()->getStorageInfoByNumericId($numericId);
-		return $storage['id'] ?? null;
-	}
-
-	/**
-	 * Get the numeric of the storage with the provided string id
-	 *
-	 * @param $storageId
-	 * @return int|null either the numeric storage id or null if the storage id is not knwon
-	 */
-	public static function getNumericStorageId($storageId) {
-		$storageId = self::adjustStorageId($storageId);
-
-		if ($row = self::getStorageById($storageId)) {
-			return (int)$row['numeric_id'];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return array [ available, last_checked ]
-	 */
-	public function getAvailability() {
-		if ($row = self::getStorageById($this->storageId)) {
-			return [
-				'available' => (int)$row['available'] === 1,
-				'last_checked' => $row['last_checked']
-			];
-		} else {
-			return [
-				'available' => true,
-				'last_checked' => time(),
-			];
-		}
-	}
-
-	/**
-	 * @param bool $isAvailable
-	 * @param int $delay amount of seconds to delay reconsidering that storage further
-	 */
-	public function setAvailability($isAvailable, int $delay = 0) {
-		$available = $isAvailable ? 1 : 0;
-		if (!$isAvailable) {
-			\OC::$server->get(LoggerInterface::class)->info('Storage with ' . $this->storageId . ' marked as unavailable', ['app' => 'lib']);
-		}
-
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$query->update('storages')
-			->set('available', $query->createNamedParameter($available))
-			->set('last_checked', $query->createNamedParameter(time() + $delay))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
-		$query->execute();
-	}
-
-	/**
-	 * Check if a string storage id is known
-	 *
-	 * @param string $storageId
-	 * @return bool
-	 */
-	public static function exists($storageId) {
-		return !is_null(self::getNumericStorageId($storageId));
-	}
-
-	/**
-	 * remove the entry for the storage
-	 *
-	 * @param string $storageId
-	 */
-	public static function remove($storageId) {
-		$storageId = self::adjustStorageId($storageId);
-		$numericId = self::getNumericStorageId($storageId);
-
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$query->delete('storages')
-			->where($query->expr()->eq('id', $query->createNamedParameter($storageId)));
-		$query->execute();
-
-		if (!is_null($numericId)) {
-			$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-			$query->delete('filecache')
-				->where($query->expr()->eq('storage', $query->createNamedParameter($numericId)));
-			$query->execute();
-		}
-	}
-
-	/**
-	 * remove the entry for the storage by the mount id
-	 *
-	 * @param int $mountId
-	 */
-	public static function cleanByMountId(int $mountId) {
-		$db = \OC::$server->getDatabaseConnection();
-
-		try {
-			$db->beginTransaction();
-
-			$query = $db->getQueryBuilder();
-			$query->select('storage_id')
-				->from('mounts')
-				->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-			$storageIds = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-
-			$query = $db->getQueryBuilder();
-			$query->delete('filecache')
-				->where($query->expr()->in('storage', $query->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY)));
-			$query->executeStatement();
-
-			$query = $db->getQueryBuilder();
-			$query->delete('storages')
-				->where($query->expr()->eq('numeric_id', $query->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY)));
-			$query->executeStatement();
-
-			$query = $db->getQueryBuilder();
-			$query->delete('mounts')
-				->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-			$query->executeStatement();
-
-			$db->commit();
-		} catch (\Exception $e) {
-			$db->rollBack();
-			throw $e;
-		}
-	}
+    /** @var StorageGlobal|null */
+    private static $globalCache = null;
+    private $storageId;
+    private $numericId;
+
+    /**
+     * @return StorageGlobal
+     */
+    public static function getGlobalCache() {
+        if (is_null(self::$globalCache)) {
+            self::$globalCache = new StorageGlobal(\OC::$server->getDatabaseConnection());
+        }
+        return self::$globalCache;
+    }
+
+    /**
+     * @param \OC\Files\Storage\Storage|string $storage
+     * @param bool $isAvailable
+     * @throws \RuntimeException
+     */
+    public function __construct($storage, $isAvailable = true) {
+        if ($storage instanceof IStorage) {
+            $this->storageId = $storage->getId();
+        } else {
+            $this->storageId = $storage;
+        }
+        $this->storageId = self::adjustStorageId($this->storageId);
+
+        if ($row = self::getStorageById($this->storageId)) {
+            $this->numericId = (int)$row['numeric_id'];
+        } else {
+            $connection = \OC::$server->getDatabaseConnection();
+            $available = $isAvailable ? 1 : 0;
+            if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
+                $this->numericId = $connection->lastInsertId('*PREFIX*storages');
+            } else {
+                if ($row = self::getStorageById($this->storageId)) {
+                    $this->numericId = (int)$row['numeric_id'];
+                } else {
+                    throw new \RuntimeException('Storage could neither be inserted nor be selected from the database: ' . $this->storageId);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $storageId
+     * @return array
+     */
+    public static function getStorageById($storageId) {
+        return self::getGlobalCache()->getStorageInfo($storageId);
+    }
+
+    /**
+     * Adjusts the storage id to use md5 if too long
+     * @param string $storageId storage id
+     * @return string unchanged $storageId if its length is less than 64 characters,
+     * else returns the md5 of $storageId
+     */
+    public static function adjustStorageId($storageId) {
+        if (strlen($storageId) > 64) {
+            return md5($storageId);
+        }
+        return $storageId;
+    }
+
+    /**
+     * Get the numeric id for the storage
+     *
+     * @return int
+     */
+    public function getNumericId() {
+        return $this->numericId;
+    }
+
+    /**
+     * Get the string id for the storage
+     *
+     * @param int $numericId
+     * @return string|null either the storage id string or null if the numeric id is not known
+     */
+    public static function getStorageId(int $numericId): ?string {
+        $storage = self::getGlobalCache()->getStorageInfoByNumericId($numericId);
+        return $storage['id'] ?? null;
+    }
+
+    /**
+     * Get the numeric of the storage with the provided string id
+     *
+     * @param $storageId
+     * @return int|null either the numeric storage id or null if the storage id is not knwon
+     */
+    public static function getNumericStorageId($storageId) {
+        $storageId = self::adjustStorageId($storageId);
+
+        if ($row = self::getStorageById($storageId)) {
+            return (int)$row['numeric_id'];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @return array [ available, last_checked ]
+     */
+    public function getAvailability() {
+        if ($row = self::getStorageById($this->storageId)) {
+            return [
+                'available' => (int)$row['available'] === 1,
+                'last_checked' => $row['last_checked']
+            ];
+        } else {
+            return [
+                'available' => true,
+                'last_checked' => time(),
+            ];
+        }
+    }
+
+    /**
+     * @param bool $isAvailable
+     * @param int $delay amount of seconds to delay reconsidering that storage further
+     */
+    public function setAvailability($isAvailable, int $delay = 0) {
+        $available = $isAvailable ? 1 : 0;
+        if (!$isAvailable) {
+            \OC::$server->get(LoggerInterface::class)->info('Storage with ' . $this->storageId . ' marked as unavailable', ['app' => 'lib']);
+        }
+
+        $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $query->update('storages')
+            ->set('available', $query->createNamedParameter($available))
+            ->set('last_checked', $query->createNamedParameter(time() + $delay))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->storageId)));
+        $query->execute();
+    }
+
+    /**
+     * Check if a string storage id is known
+     *
+     * @param string $storageId
+     * @return bool
+     */
+    public static function exists($storageId) {
+        return !is_null(self::getNumericStorageId($storageId));
+    }
+
+    /**
+     * remove the entry for the storage
+     *
+     * @param string $storageId
+     */
+    public static function remove($storageId) {
+        $storageId = self::adjustStorageId($storageId);
+        $numericId = self::getNumericStorageId($storageId);
+
+        $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $query->delete('storages')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($storageId)));
+        $query->execute();
+
+        if (!is_null($numericId)) {
+            $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+            $query->delete('filecache')
+                ->where($query->expr()->eq('storage', $query->createNamedParameter($numericId)));
+            $query->execute();
+        }
+    }
+
+    /**
+     * remove the entry for the storage by the mount id
+     *
+     * @param int $mountId
+     */
+    public static function cleanByMountId(int $mountId) {
+        $db = \OC::$server->getDatabaseConnection();
+
+        try {
+            $db->beginTransaction();
+
+            $query = $db->getQueryBuilder();
+            $query->select('storage_id')
+                ->from('mounts')
+                ->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+            $storageIds = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+
+            $query = $db->getQueryBuilder();
+            $query->delete('filecache')
+                ->where($query->expr()->in('storage', $query->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY)));
+            $query->executeStatement();
+
+            $query = $db->getQueryBuilder();
+            $query->delete('storages')
+                ->where($query->expr()->eq('numeric_id', $query->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY)));
+            $query->executeStatement();
+
+            $query = $db->getQueryBuilder();
+            $query->delete('mounts')
+                ->where($query->expr()->eq('mount_id', $query->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+            $query->executeStatement();
+
+            $db->commit();
+        } catch (\Exception $e) {
+            $db->rollBack();
+            throw $e;
+        }
+    }
 }