Skip to content

Stable9.1 repair boo jenkins #29474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PVince81 wants to merge 16 commits into from
Closed

Stable9.1 repair boo jenkins #29474

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7360d30
Add repair step to repair mismatch filecache paths
Jun 28, 2017
6fc4980
Repair detached filecache entries through occ files:scan
Jul 26, 2017
33c9f4c
Use DI and add more tests for storage filter
Aug 2, 2017
b91b1d1
Run phase 2 of repair on gathered affected storages from phase 1
Aug 16, 2017
84bbaee
occ files:scan --all --repair repairs all storages at once
Aug 16, 2017
d8213c4
Improve output when repairing. Fix non-repair file:scan
tomneedham Aug 18, 2017
ae12801
Add parallel non-corrupt storages to filecache repair step to check f…
tomneedham Sep 12, 2017
0409c06
Test without parallel storages
tomneedham Sep 14, 2017
2c62c8a
Fix lastinsertid for postgres wehn reusing fileid
tomneedham Sep 14, 2017
6311350
Try oracle tests without throwing exception for stray transactions
tomneedham Sep 15, 2017
fece7b2
Oracle hates empty strings
Sep 18, 2017
279b96d
Workaround for Oracle trigger for fileid
Sep 19, 2017
115247b
Cleanup testcase and comments
tomneedham Sep 20, 2017
e469958
Modify backported repair step for 9.1
tomneedham Nov 1, 2017
1c4386a
Modify backported repair step for 9.1
tomneedham Nov 1, 2017
940a97a
boo jenkins
Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Oracle hates empty strings
  • Loading branch information
@tomneedham
Vincent Petry authored and tomneedham committed Nov 1, 2017
commit fece7b2dc8db89d91d15ddc573615a13347a586f
18 changes: 14 additions & 4 deletions lib/private/Repair/RepairMismatchFileCachePath.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,13 @@ private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorage
// delete target if exists
$qb = $this->connection->getQueryBuilder();
$qb->delete('filecache')
->where($qb->expr()->eq('storage', $qb->createNamedParameter($correctStorageNumericId)))
->andWhere($qb->expr()->eq('path', $qb->createNamedParameter($correctPath)));
->where($qb->expr()->eq('storage', $qb->createNamedParameter($correctStorageNumericId)));

if ($correctPath === '' && $this->connection->getDatabasePlatform() instanceof OraclePlatform) {
$qb->andWhere($qb->expr()->isNull('path'));
} else {
$qb->andWhere($qb->expr()->eq('path', $qb->createNamedParameter($correctPath)));
}
$entryExisted = $qb->execute() > 0;

$qb = $this->connection->getQueryBuilder();
Expand Down Expand Up @@ -363,8 +368,13 @@ private function getOrCreateEntry($storageId, $path, $reuseFileId = null) {
// from oc_filecache
->from('filecache')
// where storage=$storage and path='$parentPath'
->where($qb->expr()->eq('storage', $qb->createNamedParameter($storageId)))
->andWhere($qb->expr()->eq('path', $qb->createNamedParameter($path)));
->where($qb->expr()->eq('storage', $qb->createNamedParameter($storageId)));

if ($path === '' && $this->connection->getDatabasePlatform() instanceof OraclePlatform) {
$qb->andWhere($qb->expr()->isNull('path'));
} else {
$qb->andWhere($qb->expr()->eq('path', $qb->createNamedParameter($path)));
}
$results = $qb->execute();
$rows = $results->fetchAll();
$results->closeCursor();
Expand Down