nextcloud / server

lib/private/Repair/NC13/RepairInvalidPaths.php

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
 		return $rows;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	private function getId($storage, $path) {
 		if (!$this->getIdQuery) {
 			$builder = $this->connection->getQueryBuilder();

Indentation +153 added lines, -153 removed lines

@@ -29,157 +29,157 @@
 use OCP\Migration\IRepairStep;
 
 class RepairInvalidPaths implements IRepairStep {
-	const MAX_ROWS = 200;
-
-	/** @var IDBConnection */
-	private $connection;
-	/** @var IConfig */
-	private $config;
-
-	private $getIdQuery;
-	private $updateQuery;
-	private $reparentQuery;
-	private $deleteQuery;
-
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-
-	public function getName() {
-		return 'Repair invalid paths in file cache';
-	}
-
-	/**
-	 * @return array[]
-	 * @suppress SqlInjectionChecker
-	 */
-	private function getInvalidEntries() {
-		$builder = $this->connection->getQueryBuilder();
-
-		$computedPath = $builder->func()->concat(
-			'p.path',
-			$builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
-		);
-
-		//select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
-		$builder->select('f.fileid', 'f.path', 'f.name', 'f.parent', 'f.storage')
-			->selectAlias('p.path', 'parent_path')
-			->selectAlias('p.storage', 'parent_storage')
-			->from('filecache', 'f')
-			->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
-				$builder->expr()->eq('f.parent', 'p.fileid'),
-				$builder->expr()->nonEmptyString('p.name')
-			))
-			->where($builder->expr()->neq('f.path', $computedPath))
-			->setMaxResults(self::MAX_ROWS);
-
-		$result = $builder->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return $rows;
-	}
-
-	private function getId($storage, $path) {
-		if (!$this->getIdQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->getIdQuery = $builder->select('fileid')
-				->from('filecache')
-				->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
-				->andWhere($builder->expr()->eq('path', $builder->createParameter('path')));
-		}
-
-		$this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
-		$this->getIdQuery->setParameter('path', $path);
-
-		return $this->getIdQuery->execute()->fetchColumn();
-	}
-
-	/**
-	 * @param string $fileid
-	 * @param string $newPath
-	 * @param string $newStorage
-	 * @suppress SqlInjectionChecker
-	 */
-	private function update($fileid, $newPath, $newStorage) {
-		if (!$this->updateQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->updateQuery = $builder->update('filecache')
-				->set('path', $builder->createParameter('newpath'))
-				->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
-				->set('storage', $builder->createParameter('newstorage'))
-				->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
-		}
-
-		$this->updateQuery->setParameter('newpath', $newPath);
-		$this->updateQuery->setParameter('newstorage', $newStorage);
-		$this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
-
-		$this->updateQuery->execute();
-	}
-
-	private function reparent($from, $to) {
-		if (!$this->reparentQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->reparentQuery = $builder->update('filecache')
-				->set('parent', $builder->createParameter('to'))
-				->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
-		}
-
-		$this->reparentQuery->setParameter('from', $from);
-		$this->reparentQuery->setParameter('to', $to);
-
-		$this->reparentQuery->execute();
-	}
-
-	private function delete($fileid) {
-		if (!$this->deleteQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->deleteQuery = $builder->delete('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
-		}
-
-		$this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
-
-		$this->deleteQuery->execute();
-	}
-
-	private function repair() {
-		$this->connection->beginTransaction();
-		$entries = $this->getInvalidEntries();
-		$count = 0;
-		foreach ($entries as $entry) {
-			$count++;
-			$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
-			if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
-				// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
-				$this->reparent($entry['fileid'], $newId);
-				$this->delete($entry['fileid']);
-			} else {
-				$this->update($entry['fileid'], $calculatedPath, $entry['parent_storage']);
-			}
-		}
-		$this->connection->commit();
-		return $count;
-	}
-
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		// was added to 12.0.0.30 and 13.0.0.1
-		if (version_compare($versionFromBeforeUpdate, '12.0.0.30', '<') || version_compare($versionFromBeforeUpdate, '13.0.0.0', '==')) {
-			$totalCount = 0;
-			do {
-				$count = $this->repair();
-				$totalCount += $count;
-			} while ($count === self::MAX_ROWS);
-
-			$output->info('Repaired ' . $totalCount . ' paths');
-		}
-	}
+    const MAX_ROWS = 200;
+
+    /** @var IDBConnection */
+    private $connection;
+    /** @var IConfig */
+    private $config;
+
+    private $getIdQuery;
+    private $updateQuery;
+    private $reparentQuery;
+    private $deleteQuery;
+
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+
+    public function getName() {
+        return 'Repair invalid paths in file cache';
+    }
+
+    /**
+     * @return array[]
+     * @suppress SqlInjectionChecker
+     */
+    private function getInvalidEntries() {
+        $builder = $this->connection->getQueryBuilder();
+
+        $computedPath = $builder->func()->concat(
+            'p.path',
+            $builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
+        );
+
+        //select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
+        $builder->select('f.fileid', 'f.path', 'f.name', 'f.parent', 'f.storage')
+            ->selectAlias('p.path', 'parent_path')
+            ->selectAlias('p.storage', 'parent_storage')
+            ->from('filecache', 'f')
+            ->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
+                $builder->expr()->eq('f.parent', 'p.fileid'),
+                $builder->expr()->nonEmptyString('p.name')
+            ))
+            ->where($builder->expr()->neq('f.path', $computedPath))
+            ->setMaxResults(self::MAX_ROWS);
+
+        $result = $builder->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return $rows;
+    }
+
+    private function getId($storage, $path) {
+        if (!$this->getIdQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->getIdQuery = $builder->select('fileid')
+                ->from('filecache')
+                ->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
+                ->andWhere($builder->expr()->eq('path', $builder->createParameter('path')));
+        }
+
+        $this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
+        $this->getIdQuery->setParameter('path', $path);
+
+        return $this->getIdQuery->execute()->fetchColumn();
+    }
+
+    /**
+     * @param string $fileid
+     * @param string $newPath
+     * @param string $newStorage
+     * @suppress SqlInjectionChecker
+     */
+    private function update($fileid, $newPath, $newStorage) {
+        if (!$this->updateQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->updateQuery = $builder->update('filecache')
+                ->set('path', $builder->createParameter('newpath'))
+                ->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
+                ->set('storage', $builder->createParameter('newstorage'))
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
+        }
+
+        $this->updateQuery->setParameter('newpath', $newPath);
+        $this->updateQuery->setParameter('newstorage', $newStorage);
+        $this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
+
+        $this->updateQuery->execute();
+    }
+
+    private function reparent($from, $to) {
+        if (!$this->reparentQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->reparentQuery = $builder->update('filecache')
+                ->set('parent', $builder->createParameter('to'))
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
+        }
+
+        $this->reparentQuery->setParameter('from', $from);
+        $this->reparentQuery->setParameter('to', $to);
+
+        $this->reparentQuery->execute();
+    }
+
+    private function delete($fileid) {
+        if (!$this->deleteQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->deleteQuery = $builder->delete('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
+        }
+
+        $this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
+
+        $this->deleteQuery->execute();
+    }
+
+    private function repair() {
+        $this->connection->beginTransaction();
+        $entries = $this->getInvalidEntries();
+        $count = 0;
+        foreach ($entries as $entry) {
+            $count++;
+            $calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
+            if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
+                // a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
+                $this->reparent($entry['fileid'], $newId);
+                $this->delete($entry['fileid']);
+            } else {
+                $this->update($entry['fileid'], $calculatedPath, $entry['parent_storage']);
+            }
+        }
+        $this->connection->commit();
+        return $count;
+    }
+
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        // was added to 12.0.0.30 and 13.0.0.1
+        if (version_compare($versionFromBeforeUpdate, '12.0.0.30', '<') || version_compare($versionFromBeforeUpdate, '13.0.0.0', '==')) {
+            $totalCount = 0;
+            do {
+                $count = $this->repair();
+                $totalCount += $count;
+            } while ($count === self::MAX_ROWS);
+
+            $output->info('Repaired ' . $totalCount . ' paths');
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -156,7 +156,7 @@ 
 		$count = 0;
 		foreach ($entries as $entry) {
 			$count++;
-			$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
+			$calculatedPath = $entry['parent_path'].'/'.$entry['name'];
 			if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
 				// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
 				$this->reparent($entry['fileid'], $newId);
@@ -179,7 +179,7 @@ 
 				$totalCount += $count;
 			} while ($count === self::MAX_ROWS);
 
-			$output->info('Repaired ' . $totalCount . ' paths');
+			$output->info('Repaired '.$totalCount.' paths');
 		}
 	}
 }