nextcloud / server

lib/private/Repair/SearchLuceneTables.php

Indentation +34 added lines, -34 removed lines

@@ -29,37 +29,37 @@ 
 
 class SearchLuceneTables implements IRepairStep {
 
-	public function getName() {
-		return 'Repair duplicate entries in oc_lucene_status';
-	}
+    public function getName() {
+        return 'Repair duplicate entries in oc_lucene_status';
+    }
 
-	/**
-	 * Fix duplicate entries in oc_lucene_status
-	 *
-	 * search_lucene prior to v0.5.0 did not have a primary key on the lucene_status table. Newer versions do, which
-	 * causes the migration check to fail because it tries to insert duplicate rows into the new schema.
-	 *
-	 * FIXME Currently, apps don't have a way of repairing anything before the migration check:
-	 * @link https://github.com/owncloud/core/issues/10980
-	 *
-	 * As a result this repair step needs to live in the core repo, although it belongs into search_lucene:
-	 * @link https://github.com/owncloud/core/issues/10205#issuecomment-54957557
-	 *
-	 * It will completely remove any rows that make a file id have more than one status:
-	 *  fileid | status                       fileid | status
-	 * --------+--------     will become     --------+--------
-	 *     2   |   E                             3   |   E
-	 *     2   |   I
-	 *     3   |   E
-	 *
-	 * search_lucene will then reindex the fileids without a status when the next indexing job is executed
-	 */
-	public function run(IOutput $out) {
-		$connection = \OC::$server->getDatabaseConnection();
-		if ($connection->tableExists('lucene_status')) {
-			$out->info('removing duplicate entries from lucene_status');
+    /**
+     * Fix duplicate entries in oc_lucene_status
+     *
+     * search_lucene prior to v0.5.0 did not have a primary key on the lucene_status table. Newer versions do, which
+     * causes the migration check to fail because it tries to insert duplicate rows into the new schema.
+     *
+     * FIXME Currently, apps don't have a way of repairing anything before the migration check:
+     * @link https://github.com/owncloud/core/issues/10980
+     *
+     * As a result this repair step needs to live in the core repo, although it belongs into search_lucene:
+     * @link https://github.com/owncloud/core/issues/10205#issuecomment-54957557
+     *
+     * It will completely remove any rows that make a file id have more than one status:
+     *  fileid | status                       fileid | status
+     * --------+--------     will become     --------+--------
+     *     2   |   E                             3   |   E
+     *     2   |   I
+     *     3   |   E
+     *
+     * search_lucene will then reindex the fileids without a status when the next indexing job is executed
+     */
+    public function run(IOutput $out) {
+        $connection = \OC::$server->getDatabaseConnection();
+        if ($connection->tableExists('lucene_status')) {
+            $out->info('removing duplicate entries from lucene_status');
 
-			$query = $connection->prepare('
+            $query = $connection->prepare('
 				DELETE FROM `*PREFIX*lucene_status`
 				WHERE `fileid` IN (
 					SELECT `fileid`
@@ -70,11 +70,11 @@ 
 						HAVING count(`fileid`) > 1
 					) AS `mysqlerr1093hack`
 				)');
-			$query->execute();
-		} else {
-			$out->info('lucene_status table does not exist -> nothing to do');
-		}
-	}
+            $query->execute();
+        } else {
+            $out->info('lucene_status table does not exist -> nothing to do');
+        }
+    }
 
 }
 

lib/private/Repair/SqliteAutoincrement.php

Indentation +52 added lines, -52 removed lines

@@ -36,66 +36,66 @@
  * altered in order to retrigger SQL schema generation through OCSqlitePlatform.
  */
 class SqliteAutoincrement implements IRepairStep {
-	/**
-	 * @var \OC\DB\Connection
-	 */
-	protected $connection;
+    /**
+     * @var \OC\DB\Connection
+     */
+    protected $connection;
 
-	/**
-	 * @param \OC\DB\Connection $connection
-	 */
-	public function __construct($connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param \OC\DB\Connection $connection
+     */
+    public function __construct($connection) {
+        $this->connection = $connection;
+    }
 
-	public function getName() {
-		return 'Repair SQLite autoincrement';
-	}
+    public function getName() {
+        return 'Repair SQLite autoincrement';
+    }
 
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-		if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return;
-		}
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return;
+        }
 
-		$sourceSchema = $this->connection->getSchemaManager()->createSchema();
+        $sourceSchema = $this->connection->getSchemaManager()->createSchema();
 
-		$schemaDiff = new SchemaDiff();
+        $schemaDiff = new SchemaDiff();
 
-		foreach ($sourceSchema->getTables() as $tableSchema) {
-			$primaryKey = $tableSchema->getPrimaryKey();
-			if (!$primaryKey) {
-				continue;
-			}
+        foreach ($sourceSchema->getTables() as $tableSchema) {
+            $primaryKey = $tableSchema->getPrimaryKey();
+            if (!$primaryKey) {
+                continue;
+            }
 
-			$columnNames = $primaryKey->getColumns();
+            $columnNames = $primaryKey->getColumns();
 
-			// add a column diff for every primary key column,
-			// but do not actually change anything, this will
-			// force the generation of SQL statements to alter
-			// those tables, which will then trigger the
-			// specific SQL code from OCSqlitePlatform
-			try {
-				$tableDiff = new TableDiff($tableSchema->getName());
-				$tableDiff->fromTable = $tableSchema;
-				foreach ($columnNames as $columnName) {
-					$columnSchema = $tableSchema->getColumn($columnName);
-					$columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
-					$tableDiff->changedColumns[] = $columnDiff;
-					$schemaDiff->changedTables[] = $tableDiff;
-				}
-			} catch (SchemaException $e) {
-				// ignore
-			}
-		}
+            // add a column diff for every primary key column,
+            // but do not actually change anything, this will
+            // force the generation of SQL statements to alter
+            // those tables, which will then trigger the
+            // specific SQL code from OCSqlitePlatform
+            try {
+                $tableDiff = new TableDiff($tableSchema->getName());
+                $tableDiff->fromTable = $tableSchema;
+                foreach ($columnNames as $columnName) {
+                    $columnSchema = $tableSchema->getColumn($columnName);
+                    $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
+                    $tableDiff->changedColumns[] = $columnDiff;
+                    $schemaDiff->changedTables[] = $tableDiff;
+                }
+            } catch (SchemaException $e) {
+                // ignore
+            }
+        }
 
-		$this->connection->beginTransaction();
-		foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
-			$this->connection->query($sql);
-		}
-		$this->connection->commit();
-	}
+        $this->connection->beginTransaction();
+        foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
+            $this->connection->query($sql);
+        }
+        $this->connection->commit();
+    }
 }
 

lib/private/Repair/OldGroupMembershipShares.php

Indentation +84 added lines, -84 removed lines

@@ -31,88 +31,88 @@
 
 class OldGroupMembershipShares implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @var array [gid => [uid => (bool)]]
-	 */
-	protected $memberships;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of old group memberships';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 */
-	public function run(IOutput $output) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
-				->andWhere($query->expr()->isNotNull('s2.id'))
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			if (!$this->isMember($row['group'], $row['user'])) {
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
-					->execute();
-			}
-		}
-		$result->closeCursor();
-
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
-		}
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $uid
-	 * @return bool
-	 */
-	protected function isMember($gid, $uid) {
-		if (isset($this->memberships[$gid][$uid])) {
-			return $this->memberships[$gid][$uid];
-		}
-
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
-		if (!isset($this->memberships[$gid])) {
-			$this->memberships[$gid] = [];
-		}
-		$this->memberships[$gid][$uid] = $isMember;
-
-		return $isMember;
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @var array [gid => [uid => (bool)]]
+     */
+    protected $memberships;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of old group memberships';
+    }
+
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     */
+    public function run(IOutput $output) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
+                ->andWhere($query->expr()->isNotNull('s2.id'))
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(Share::SHARE_TYPE_GROUP)))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            if (!$this->isMember($row['group'], $row['user'])) {
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
+                    ->execute();
+            }
+        }
+        $result->closeCursor();
+
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+        }
+    }
+
+    /**
+     * @param string $gid
+     * @param string $uid
+     * @return bool
+     */
+    protected function isMember($gid, $uid) {
+        if (isset($this->memberships[$gid][$uid])) {
+            return $this->memberships[$gid][$uid];
+        }
+
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
+        if (!isset($this->memberships[$gid])) {
+            $this->memberships[$gid] = [];
+        }
+        $this->memberships[$gid][$uid] = $isMember;
+
+        return $isMember;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		$result->closeCursor();
 
 		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+			$output->info('Removed '.$deletedEntries.' shares where user is not a member of the group anymore');
 		}
 	}
 

lib/private/Repair/Preview.php

Indentation +15 added lines, -15 removed lines

@@ -28,21 +28,21 @@
 
 class Preview implements IRepairStep {
 
-	public function getName() {
-		return 'Cleaning-up broken previews';
-	}
+    public function getName() {
+        return 'Cleaning-up broken previews';
+    }
 
-	public function run(IOutput $out) {
-		$view = new View('/');
-		$children = $view->getDirectoryContent('/');
+    public function run(IOutput $out) {
+        $view = new View('/');
+        $children = $view->getDirectoryContent('/');
 
-		foreach ($children as $child) {
-			if ($view->is_dir($child->getPath())) {
-				$thumbnailsFolder = $child->getPath() . '/thumbnails';
-				if ($view->is_dir($thumbnailsFolder)) {
-					$view->rmdir($thumbnailsFolder);
-				}
-			}
-		}
-	}
+        foreach ($children as $child) {
+            if ($view->is_dir($child->getPath())) {
+                $thumbnailsFolder = $child->getPath() . '/thumbnails';
+                if ($view->is_dir($thumbnailsFolder)) {
+                    $view->rmdir($thumbnailsFolder);
+                }
+            }
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 		foreach ($children as $child) {
 			if ($view->is_dir($child->getPath())) {
-				$thumbnailsFolder = $child->getPath() . '/thumbnails';
+				$thumbnailsFolder = $child->getPath().'/thumbnails';
 				if ($view->is_dir($thumbnailsFolder)) {
 					$view->rmdir($thumbnailsFolder);
 				}

lib/private/Repair/FillETags.php

Indentation +24 added lines, -24 removed lines

@@ -29,29 +29,29 @@
 
 class FillETags implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($connection) {
-		$this->connection = $connection;
-	}
-
-	public function getName() {
-		return 'Generate ETags for file where no ETag is present.';
-	}
-
-	public function run(IOutput $output) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('filecache')
-			->set('etag', $qb->expr()->literal('xxx'))
-			->where($qb->expr()->eq('etag', $qb->expr()->literal('')))
-			->orWhere($qb->expr()->isNull('etag'));
-
-		$result = $qb->execute();
-		$output->info("ETags have been fixed for $result files/folders.");
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($connection) {
+        $this->connection = $connection;
+    }
+
+    public function getName() {
+        return 'Generate ETags for file where no ETag is present.';
+    }
+
+    public function run(IOutput $output) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('filecache')
+            ->set('etag', $qb->expr()->literal('xxx'))
+            ->where($qb->expr()->eq('etag', $qb->expr()->literal('')))
+            ->orWhere($qb->expr()->isNull('etag'));
+
+        $result = $qb->execute();
+        $output->info("ETags have been fixed for $result files/folders.");
+    }
 }
 

lib/private/Repair/CleanTags.php

Indentation +167 added lines, -167 removed lines

@@ -37,171 +37,171 @@
  */
 class CleanTags implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	protected $deletedTags = 0;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IDBConnection $connection, IUserManager $userManager) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Clean tags and favorites';
-	}
-
-	/**
-	 * Updates the configuration after running an update
-	 */
-	public function run(IOutput $output) {
-		$this->deleteOrphanTags($output);
-		$this->deleteOrphanFileEntries($output);
-		$this->deleteOrphanTagEntries($output);
-		$this->deleteOrphanCategoryEntries($output);
-	}
-
-	/**
-	 * Delete tags for deleted users
-	 */
-	protected function deleteOrphanTags(IOutput $output) {
-		$offset = 0;
-		while ($this->checkTags($offset)) {
-			$offset += 50;
-		}
-
-		$output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
-	}
-
-	protected function checkTags($offset) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('uid')
-			->from('vcategory')
-			->groupBy('uid')
-			->orderBy('uid')
-			->setMaxResults(50)
-			->setFirstResult($offset);
-		$result = $query->execute();
-
-		$users = [];
-		$hadResults = false;
-		while ($row = $result->fetch()) {
-			$hadResults = true;
-			if (!$this->userManager->userExists($row['uid'])) {
-				$users[] = $row['uid'];
-			}
-		}
-		$result->closeCursor();
-
-		if (!$hadResults) {
-			// No more tags, stop looping
-			return false;
-		}
-
-		if (!empty($users)) {
-			$query = $this->connection->getQueryBuilder();
-			$query->delete('vcategory')
-				->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
-			$this->deletedTags += $query->execute();
-		}
-		return true;
-	}
-
-	/**
-	 * Delete tag entries for deleted files
-	 */
-	protected function deleteOrphanFileEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags for delete files have been removed.',
-			'vcategory_to_object', 'objid',
-			'filecache', 'fileid', 'path_hash'
-		);
-	}
-
-	/**
-	 * Delete tag entries for deleted tags
-	 */
-	protected function deleteOrphanTagEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tag entries for deleted tags have been removed.',
-			'vcategory_to_object', 'categoryid',
-			'vcategory', 'id', 'uid'
-		);
-	}
-
-	/**
-	 * Delete tags that have no entries
-	 */
-	protected function deleteOrphanCategoryEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags with no entries have been removed.',
-			'vcategory', 'id',
-			'vcategory_to_object', 'categoryid', 'type'
-		);
-	}
-
-	/**
-	 * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
-	 *
-	 * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
-	 * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
-	 * is being deleted.
-	 *
-	 * @param string $repairInfo
-	 * @param string $deleteTable
-	 * @param string $deleteId
-	 * @param string $sourceTable
-	 * @param string $sourceId
-	 * @param string $sourceNullColumn	If this column is null in the source table,
-	 * 								the entry is deleted in the $deleteTable
-	 */
-	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('d.' . $deleteId)
-			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, ' s.' . $sourceId))
-			->where(
-				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
-			)
-			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
-			);
-		$result = $qb->execute();
-
-		$orphanItems = array();
-		while ($row = $result->fetch()) {
-			$orphanItems[] = (int) $row[$deleteId];
-		}
-
-		if (!empty($orphanItems)) {
-			$orphanItemsBatch = array_chunk($orphanItems, 200);
-			foreach ($orphanItemsBatch as $items) {
-				$qb->delete($deleteTable)
-					->where(
-						$qb->expr()->eq('type', $qb->expr()->literal('files'))
-					)
-					->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
-				$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->execute();
-			}
-		}
-
-		if ($repairInfo) {
-			$output->info(sprintf($repairInfo, sizeof($orphanItems)));
-		}
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    protected $deletedTags = 0;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     */
+    public function __construct(IDBConnection $connection, IUserManager $userManager) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Clean tags and favorites';
+    }
+
+    /**
+     * Updates the configuration after running an update
+     */
+    public function run(IOutput $output) {
+        $this->deleteOrphanTags($output);
+        $this->deleteOrphanFileEntries($output);
+        $this->deleteOrphanTagEntries($output);
+        $this->deleteOrphanCategoryEntries($output);
+    }
+
+    /**
+     * Delete tags for deleted users
+     */
+    protected function deleteOrphanTags(IOutput $output) {
+        $offset = 0;
+        while ($this->checkTags($offset)) {
+            $offset += 50;
+        }
+
+        $output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
+    }
+
+    protected function checkTags($offset) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('uid')
+            ->from('vcategory')
+            ->groupBy('uid')
+            ->orderBy('uid')
+            ->setMaxResults(50)
+            ->setFirstResult($offset);
+        $result = $query->execute();
+
+        $users = [];
+        $hadResults = false;
+        while ($row = $result->fetch()) {
+            $hadResults = true;
+            if (!$this->userManager->userExists($row['uid'])) {
+                $users[] = $row['uid'];
+            }
+        }
+        $result->closeCursor();
+
+        if (!$hadResults) {
+            // No more tags, stop looping
+            return false;
+        }
+
+        if (!empty($users)) {
+            $query = $this->connection->getQueryBuilder();
+            $query->delete('vcategory')
+                ->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
+            $this->deletedTags += $query->execute();
+        }
+        return true;
+    }
+
+    /**
+     * Delete tag entries for deleted files
+     */
+    protected function deleteOrphanFileEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags for delete files have been removed.',
+            'vcategory_to_object', 'objid',
+            'filecache', 'fileid', 'path_hash'
+        );
+    }
+
+    /**
+     * Delete tag entries for deleted tags
+     */
+    protected function deleteOrphanTagEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tag entries for deleted tags have been removed.',
+            'vcategory_to_object', 'categoryid',
+            'vcategory', 'id', 'uid'
+        );
+    }
+
+    /**
+     * Delete tags that have no entries
+     */
+    protected function deleteOrphanCategoryEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags with no entries have been removed.',
+            'vcategory', 'id',
+            'vcategory_to_object', 'categoryid', 'type'
+        );
+    }
+
+    /**
+     * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
+     *
+     * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
+     * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
+     * is being deleted.
+     *
+     * @param string $repairInfo
+     * @param string $deleteTable
+     * @param string $deleteId
+     * @param string $sourceTable
+     * @param string $sourceId
+     * @param string $sourceNullColumn	If this column is null in the source table,
+     * 								the entry is deleted in the $deleteTable
+     */
+    protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('d.' . $deleteId)
+            ->from($deleteTable, 'd')
+            ->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, ' s.' . $sourceId))
+            ->where(
+                $qb->expr()->eq('d.type', $qb->expr()->literal('files'))
+            )
+            ->andWhere(
+                $qb->expr()->isNull('s.' . $sourceNullColumn)
+            );
+        $result = $qb->execute();
+
+        $orphanItems = array();
+        while ($row = $result->fetch()) {
+            $orphanItems[] = (int) $row[$deleteId];
+        }
+
+        if (!empty($orphanItems)) {
+            $orphanItemsBatch = array_chunk($orphanItems, 200);
+            foreach ($orphanItemsBatch as $items) {
+                $qb->delete($deleteTable)
+                    ->where(
+                        $qb->expr()->eq('type', $qb->expr()->literal('files'))
+                    )
+                    ->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
+                $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->execute();
+            }
+        }
+
+        if ($repairInfo) {
+            $output->info(sprintf($repairInfo, sizeof($orphanItems)));
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -171,14 +171,14 @@
 	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
 		$qb = $this->connection->getQueryBuilder();
 
-		$qb->select('d.' . $deleteId)
+		$qb->select('d.'.$deleteId)
 			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, ' s.' . $sourceId))
+			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.'.$deleteId, ' s.'.$sourceId))
 			->where(
 				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
 			)
 			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
+				$qb->expr()->isNull('s.'.$sourceNullColumn)
 			);
 		$result = $qb->execute();
 

lib/private/Repair/DropOldJobs.php

Indentation +47 added lines, -47 removed lines

@@ -30,59 +30,59 @@
 
 class DropOldJobs implements IRepairStep {
 
-	/** @var IJobList */
-	protected $jobList;
+    /** @var IJobList */
+    protected $jobList;
 
-	/**
-	 * @param IJobList $jobList
-	 */
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    /**
+     * @param IJobList $jobList
+     */
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Drop old background jobs';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Drop old background jobs';
+    }
 
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 */
-	public function run(IOutput $output) {
-		$oldJobs = $this->oldJobs();
-		foreach($oldJobs as $job) {
-			if($this->jobList->has($job['class'], $job['arguments'])) {
-				$this->jobList->remove($job['class'], $job['arguments']);
-			}
-		}
-	}
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     */
+    public function run(IOutput $output) {
+        $oldJobs = $this->oldJobs();
+        foreach($oldJobs as $job) {
+            if($this->jobList->has($job['class'], $job['arguments'])) {
+                $this->jobList->remove($job['class'], $job['arguments']);
+            }
+        }
+    }
 
-	/**
-	 * returns a list of old jobs as an associative array with keys 'class' and
-	 * 'arguments'.
-	 *
-	 * @return array
-	 */
-	public function oldJobs() {
-		return [
-			['class' => 'OC_Cache_FileGlobalGC', 'arguments' => null],
-			['class' => 'OC\Cache\FileGlobalGC', 'arguments' => null],
-			['class' => 'OCA\Files\BackgroundJob\DeleteOrphanedTagsJob', 'arguments' => null],
+    /**
+     * returns a list of old jobs as an associative array with keys 'class' and
+     * 'arguments'.
+     *
+     * @return array
+     */
+    public function oldJobs() {
+        return [
+            ['class' => 'OC_Cache_FileGlobalGC', 'arguments' => null],
+            ['class' => 'OC\Cache\FileGlobalGC', 'arguments' => null],
+            ['class' => 'OCA\Files\BackgroundJob\DeleteOrphanedTagsJob', 'arguments' => null],
 
-			['class' => 'OCA\Files_sharing\Lib\DeleteOrphanedSharesJob', 'arguments' => null],
-			['class' => 'OCA\Files_sharing\ExpireSharesJob', 'arguments' => null],
+            ['class' => 'OCA\Files_sharing\Lib\DeleteOrphanedSharesJob', 'arguments' => null],
+            ['class' => 'OCA\Files_sharing\ExpireSharesJob', 'arguments' => null],
 
-			['class' => 'OCA\user_ldap\lib\Jobs', 'arguments' => null],
-			['class' => '\OCA\User_LDAP\Jobs\CleanUp', 'arguments' => null],
-		];
-	}
+            ['class' => 'OCA\user_ldap\lib\Jobs', 'arguments' => null],
+            ['class' => '\OCA\User_LDAP\Jobs\CleanUp', 'arguments' => null],
+        ];
+    }
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 	 */
 	public function run(IOutput $output) {
 		$oldJobs = $this->oldJobs();
-		foreach($oldJobs as $job) {
-			if($this->jobList->has($job['class'], $job['arguments'])) {
+		foreach ($oldJobs as $job) {
+			if ($this->jobList->has($job['class'], $job['arguments'])) {
 				$this->jobList->remove($job['class'], $job['arguments']);
 			}
 		}

lib/private/Repair/UpdateOutdatedOcsIds.php

Indentation +60 added lines, -60 removed lines

@@ -36,71 +36,71 @@
  * @package OC\Repair
  */
 class UpdateOutdatedOcsIds implements IRepairStep {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getName() {
-		return 'Repair outdated OCS IDs';
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getName() {
+        return 'Repair outdated OCS IDs';
+    }
 
-	/**
-	 * @param string $appName
-	 * @param string $oldId
-	 * @param string $newId
-	 * @return bool True if updated, false otherwise
-	 */
-	public function fixOcsId($appName, $oldId, $newId) {
-		$existingId = $this->config->getAppValue($appName, 'ocsid');
+    /**
+     * @param string $appName
+     * @param string $oldId
+     * @param string $newId
+     * @return bool True if updated, false otherwise
+     */
+    public function fixOcsId($appName, $oldId, $newId) {
+        $existingId = $this->config->getAppValue($appName, 'ocsid');
 
-		if($existingId === $oldId) {
-			$this->config->setAppValue($appName, 'ocsid', $newId);
-			return true;
-		}
+        if($existingId === $oldId) {
+            $this->config->setAppValue($appName, 'ocsid', $newId);
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function run(IOutput $output) {
-		$appsToUpdate = [
-			'contacts' => [
-				'old' => '166044',
-				'new' => '168708',
-			],
-			'calendar' => [
-				'old' => '166043',
-				'new' => '168707',
-			],
-			'bookmarks' => [
-				'old' => '166042',
-				'new' => '168710',
-			],
-			'search_lucene' => [
-				'old' => '166057',
-				'new' => '168709',
-			],
-			'documents' => [
-				'old' => '166045',
-				'new' => '168711',
-			]
-		];
+    /**
+     * {@inheritdoc}
+     */
+    public function run(IOutput $output) {
+        $appsToUpdate = [
+            'contacts' => [
+                'old' => '166044',
+                'new' => '168708',
+            ],
+            'calendar' => [
+                'old' => '166043',
+                'new' => '168707',
+            ],
+            'bookmarks' => [
+                'old' => '166042',
+                'new' => '168710',
+            ],
+            'search_lucene' => [
+                'old' => '166057',
+                'new' => '168709',
+            ],
+            'documents' => [
+                'old' => '166045',
+                'new' => '168711',
+            ]
+        ];
 
-		foreach($appsToUpdate as $appName => $ids) {
-			if ($this->fixOcsId($appName, $ids['old'], $ids['new'])) {
-				$output->info("Fixed invalid $appName OCS id");
-			}
-		}
-	}
+        foreach($appsToUpdate as $appName => $ids) {
+            if ($this->fixOcsId($appName, $ids['old'], $ids['new'])) {
+                $output->info("Fixed invalid $appName OCS id");
+            }
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	public function fixOcsId($appName, $oldId, $newId) {
 		$existingId = $this->config->getAppValue($appName, 'ocsid');
 
-		if($existingId === $oldId) {
+		if ($existingId === $oldId) {
 			$this->config->setAppValue($appName, 'ocsid', $newId);
 			return true;
 		}
@@ -97,7 +97,7 @@ 
 			]
 		];
 
-		foreach($appsToUpdate as $appName => $ids) {
+		foreach ($appsToUpdate as $appName => $ids) {
 			if ($this->fixOcsId($appName, $ids['old'], $ids['new'])) {
 				$output->info("Fixed invalid $appName OCS id");
 			}

lib/private/Repair/RemoveGetETagEntries.php

Indentation +26 added lines, -26 removed lines

@@ -29,30 +29,30 @@
 
 class RemoveGetETagEntries implements IRepairStep {
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
-
-	public function getName() {
-		return 'Remove getetag entries in properties table';
-	}
-
-	/**
-	 * Removes all entries with the key "{DAV:}getetag" from the table properties
-	 */
-	public function run(IOutput $out) {
-		$sql = 'DELETE FROM `*PREFIX*properties`'
-			. ' WHERE `propertyname` = ?';
-		$deletedRows = $this->connection->executeUpdate($sql, ['{DAV:}getetag']);
-
-		$out->info('Removed ' . $deletedRows . ' unneeded "{DAV:}getetag" entries from properties table.');
-	}
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
+
+    public function getName() {
+        return 'Remove getetag entries in properties table';
+    }
+
+    /**
+     * Removes all entries with the key "{DAV:}getetag" from the table properties
+     */
+    public function run(IOutput $out) {
+        $sql = 'DELETE FROM `*PREFIX*properties`'
+            . ' WHERE `propertyname` = ?';
+        $deletedRows = $this->connection->executeUpdate($sql, ['{DAV:}getetag']);
+
+        $out->info('Removed ' . $deletedRows . ' unneeded "{DAV:}getetag" entries from properties table.');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -53,6 +53,6 @@
 			. ' WHERE `propertyname` = ?';
 		$deletedRows = $this->connection->executeUpdate($sql, ['{DAV:}getetag']);
 
-		$out->info('Removed ' . $deletedRows . ' unneeded "{DAV:}getetag" entries from properties table.');
+		$out->info('Removed '.$deletedRows.' unneeded "{DAV:}getetag" entries from properties table.');
 	}
 }