Inspection of "Merge pull request #21729 from nextcloud/enh/noid/..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 4a4262...32927f )

by Roeland

created 2020-07-08 12:18 UTC

Status

Indentation +80 added lines, -80 removed lines patch added patch discarded remove patch

@@ -33,84 +33,84 @@
 block discarded – undo
  * Delete all file entries that have no matching entries in the storage table.
  */
 class DeleteOrphanedFiles extends Command {
-	public const CHUNK_SIZE = 200;
-
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('files:cleanup')
-			->setDescription('cleanup filecache');
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('fc.fileid')
-			->from('filecache', 'fc')
-			->where($query->expr()->isNull('s.numeric_id'))
-			->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('filecache')
-			->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		$output->writeln("$deletedEntries orphaned file cache entries deleted");
-
-		$deletedMounts = $this->cleanupOrphanedMounts();
-		$output->writeln("$deletedMounts orphaned mount entries deleted");
-		return 0;
-	}
-
-	private function cleanupOrphanedMounts() {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('m.storage_id')
-			->from('mounts', 'm')
-			->where($query->expr()->isNull('s.numeric_id'))
-			->leftJoin('m', 'storages', 's', $query->expr()->eq('m.storage_id', 's.numeric_id'))
-			->groupBy('storage_id')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('mounts')
-			->where($deleteQuery->expr()->eq('storage_id', $deleteQuery->createParameter('storageid')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('storageid', (int) $row['storage_id'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		return $deletedEntries;
-	}
+    public const CHUNK_SIZE = 200;
+
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files:cleanup')
+            ->setDescription('cleanup filecache');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('fc.fileid')
+            ->from('filecache', 'fc')
+            ->where($query->expr()->isNull('s.numeric_id'))
+            ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('filecache')
+            ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        $output->writeln("$deletedEntries orphaned file cache entries deleted");
+
+        $deletedMounts = $this->cleanupOrphanedMounts();
+        $output->writeln("$deletedMounts orphaned mount entries deleted");
+        return 0;
+    }
+
+    private function cleanupOrphanedMounts() {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('m.storage_id')
+            ->from('mounts', 'm')
+            ->where($query->expr()->isNull('s.numeric_id'))
+            ->leftJoin('m', 'storages', 's', $query->expr()->eq('m.storage_id', 's.numeric_id'))
+            ->groupBy('storage_id')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('mounts')
+            ->where($deleteQuery->expr()->eq('storage_id', $deleteQuery->createParameter('storageid')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('storageid', (int) $row['storage_id'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        return $deletedEntries;
+    }
 }

Please login to merge, or discard this patch.

		@@ -33,84 +33,84 @@
		block discarded – undo
33	33	* Delete all file entries that have no matching entries in the storage table.
34	34	*/
35	35	class DeleteOrphanedFiles extends Command {
36		- public const CHUNK_SIZE = 200;
37		-
38		- /**
39		- * @var IDBConnection
40		- */
41		- protected $connection;
42		-
43		- public function __construct(IDBConnection $connection) {
44		- $this->connection = $connection;
45		- parent::__construct();
46		- }
47		-
48		- protected function configure() {
49		- $this
50		- ->setName('files:cleanup')
51		- ->setDescription('cleanup filecache');
52		- }
53		-
54		- public function execute(InputInterface $input, OutputInterface $output): int {
55		- $deletedEntries = 0;
56		-
57		- $query = $this->connection->getQueryBuilder();
58		- $query->select('fc.fileid')
59		- ->from('filecache', 'fc')
60		- ->where($query->expr()->isNull('s.numeric_id'))
61		- ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
62		- ->setMaxResults(self::CHUNK_SIZE);
63		-
64		- $deleteQuery = $this->connection->getQueryBuilder();
65		- $deleteQuery->delete('filecache')
66		- ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
67		-
68		- $deletedInLastChunk = self::CHUNK_SIZE;
69		- while ($deletedInLastChunk === self::CHUNK_SIZE) {
70		- $deletedInLastChunk = 0;
71		- $result = $query->execute();
72		- while ($row = $result->fetch()) {
73		- $deletedInLastChunk++;
74		- $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
75		- ->execute();
76		- }
77		- $result->closeCursor();
78		- }
79		-
80		- $output->writeln("$deletedEntries orphaned file cache entries deleted");
81		-
82		- $deletedMounts = $this->cleanupOrphanedMounts();
83		- $output->writeln("$deletedMounts orphaned mount entries deleted");
84		- return 0;
85		- }
86		-
87		- private function cleanupOrphanedMounts() {
88		- $deletedEntries = 0;
89		-
90		- $query = $this->connection->getQueryBuilder();
91		- $query->select('m.storage_id')
92		- ->from('mounts', 'm')
93		- ->where($query->expr()->isNull('s.numeric_id'))
94		- ->leftJoin('m', 'storages', 's', $query->expr()->eq('m.storage_id', 's.numeric_id'))
95		- ->groupBy('storage_id')
96		- ->setMaxResults(self::CHUNK_SIZE);
97		-
98		- $deleteQuery = $this->connection->getQueryBuilder();
99		- $deleteQuery->delete('mounts')
100		- ->where($deleteQuery->expr()->eq('storage_id', $deleteQuery->createParameter('storageid')));
101		-
102		- $deletedInLastChunk = self::CHUNK_SIZE;
103		- while ($deletedInLastChunk === self::CHUNK_SIZE) {
104		- $deletedInLastChunk = 0;
105		- $result = $query->execute();
106		- while ($row = $result->fetch()) {
107		- $deletedInLastChunk++;
108		- $deletedEntries += $deleteQuery->setParameter('storageid', (int) $row['storage_id'])
109		- ->execute();
110		- }
111		- $result->closeCursor();
112		- }
113		-
114		- return $deletedEntries;
115		- }
	36	+ public const CHUNK_SIZE = 200;
	37	+
	38	+ /**
	39	+ * @var IDBConnection
	40	+ */
	41	+ protected $connection;
	42	+
	43	+ public function __construct(IDBConnection $connection) {
	44	+ $this->connection = $connection;
	45	+ parent::__construct();
	46	+ }
	47	+
	48	+ protected function configure() {
	49	+ $this
	50	+ ->setName('files:cleanup')
	51	+ ->setDescription('cleanup filecache');
	52	+ }
	53	+
	54	+ public function execute(InputInterface $input, OutputInterface $output): int {
	55	+ $deletedEntries = 0;
	56	+
	57	+ $query = $this->connection->getQueryBuilder();
	58	+ $query->select('fc.fileid')
	59	+ ->from('filecache', 'fc')
	60	+ ->where($query->expr()->isNull('s.numeric_id'))
	61	+ ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
	62	+ ->setMaxResults(self::CHUNK_SIZE);
	63	+
	64	+ $deleteQuery = $this->connection->getQueryBuilder();
	65	+ $deleteQuery->delete('filecache')
	66	+ ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
	67	+
	68	+ $deletedInLastChunk = self::CHUNK_SIZE;
	69	+ while ($deletedInLastChunk === self::CHUNK_SIZE) {
	70	+ $deletedInLastChunk = 0;
	71	+ $result = $query->execute();
	72	+ while ($row = $result->fetch()) {
	73	+ $deletedInLastChunk++;
	74	+ $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
	75	+ ->execute();
	76	+ }
	77	+ $result->closeCursor();
	78	+ }
	79	+
	80	+ $output->writeln("$deletedEntries orphaned file cache entries deleted");
	81	+
	82	+ $deletedMounts = $this->cleanupOrphanedMounts();
	83	+ $output->writeln("$deletedMounts orphaned mount entries deleted");
	84	+ return 0;
	85	+ }
	86	+
	87	+ private function cleanupOrphanedMounts() {
	88	+ $deletedEntries = 0;
	89	+
	90	+ $query = $this->connection->getQueryBuilder();
	91	+ $query->select('m.storage_id')
	92	+ ->from('mounts', 'm')
	93	+ ->where($query->expr()->isNull('s.numeric_id'))
	94	+ ->leftJoin('m', 'storages', 's', $query->expr()->eq('m.storage_id', 's.numeric_id'))
	95	+ ->groupBy('storage_id')
	96	+ ->setMaxResults(self::CHUNK_SIZE);
	97	+
	98	+ $deleteQuery = $this->connection->getQueryBuilder();
	99	+ $deleteQuery->delete('mounts')
	100	+ ->where($deleteQuery->expr()->eq('storage_id', $deleteQuery->createParameter('storageid')));
	101	+
	102	+ $deletedInLastChunk = self::CHUNK_SIZE;
	103	+ while ($deletedInLastChunk === self::CHUNK_SIZE) {
	104	+ $deletedInLastChunk = 0;
	105	+ $result = $query->execute();
	106	+ while ($row = $result->fetch()) {
	107	+ $deletedInLastChunk++;
	108	+ $deletedEntries += $deleteQuery->setParameter('storageid', (int) $row['storage_id'])
	109	+ ->execute();
	110	+ }
	111	+ $result->closeCursor();
	112	+ }
	113	+
	114	+ return $deletedEntries;
	115	+ }
116	116	}

nextcloud / server

Push — master ( 4a4262...32927f )

Status

Category

Indentation +80 added lines, -80 removed lines patch added patch discarded remove patch