Skip to content

Commit f4c2f80

Browse files
salmart-devprovokateurin
authored andcommitted
fixup! feat: Add repair step for deduplicating mounts
Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com>
1 parent 826e95d commit f4c2f80

4 files changed

Lines changed: 34 additions & 227 deletions

File tree

lib/private/Repair.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
use OC\Repair\ClearFrontendCaches;
2020
use OC\Repair\ClearGeneratedAvatarCache;
2121
use OC\Repair\Collation;
22+
<<<<<<< HEAD
2223
use OC\Repair\ConfigKeyMigration;
2324
use OC\Repair\DeduplicateMounts;
25+
=======
26+
>>>>>>> 40ad8fd0dfc (fixup! feat: Add repair step for deduplicating mounts)
2427
use OC\Repair\Events\RepairAdvanceEvent;
2528
use OC\Repair\Events\RepairErrorEvent;
2629
use OC\Repair\Events\RepairFinishEvent;
@@ -58,6 +61,7 @@
5861
use OC\Repair\RepairInvalidShares;
5962
use OC\Repair\RepairLogoDimension;
6063
use OC\Repair\RepairMimeTypes;
64+
use OC\Repair\TruncateMounts;
6165
use OC\Template\JSCombiner;
6266
use OCA\DAV\Migration\DeleteSchedulingObjects;
6367
use OCA\DAV\Migration\RemoveObjectProperties;
@@ -222,7 +226,7 @@ public static function getExpensiveRepairSteps() {
222226
),
223227
\OCP\Server::get(DeleteSchedulingObjects::class),
224228
\OC::$server->get(RemoveObjectProperties::class),
225-
\OCP\Server::get(DeduplicateMounts::class),
229+
\OCP\Server::get(TruncateMounts::class),
226230
];
227231
}
228232

lib/private/Repair/DeduplicateMounts.php

Lines changed: 0 additions & 68 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
7+
* SPDX-License-Identifier: AGPL-3.0-or-later
8+
*/
9+
10+
namespace OC\Repair;
11+
12+
use OCP\IDBConnection;
13+
use OCP\Migration\IOutput;
14+
use OCP\Migration\IRepairStep;
15+
16+
class TruncateMounts implements IRepairStep {
17+
public function __construct(
18+
private readonly IDBConnection $connection,
19+
) {
20+
}
21+
22+
public function getName(): string {
23+
return 'Deduplicate mounts';
24+
}
25+
26+
public function run(IOutput $output): void {
27+
$this->connection->truncateTable('mounts', false);
28+
}
29+
}

tests/lib/Repair/DeduplicateMountsTest.php

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)