Skip to content

Add repair step to repair mismatch filecache paths #28253

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

Merged
PVince81 merged 13 commits into from
Sep 20, 2017
Merged

Add repair step to repair mismatch filecache paths #28253

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c3fe226
Add repair step to repair mismatch filecache paths
Jun 28, 2017
8ff57c2
Repair detached filecache entries through occ files:scan
Jul 26, 2017
97e991d
Use DI and add more tests for storage filter
Aug 2, 2017
4247b50
Run phase 2 of repair on gathered affected storages from phase 1
Aug 16, 2017
dfaece3
occ files:scan --all --repair repairs all storages at once
Aug 16, 2017
894981c
Improve output when repairing. Fix non-repair file:scan
tomneedham Aug 18, 2017
733ba8c
Add parallel non-corrupt storages to filecache repair step to check f…
tomneedham Sep 12, 2017
76e08b7
Test without parallel storages
tomneedham Sep 14, 2017
20555eb
Fix lastinsertid for postgres wehn reusing fileid
tomneedham Sep 14, 2017
63747ec
Try oracle tests without throwing exception for stray transactions
tomneedham Sep 15, 2017
b62ff20
Oracle hates empty strings
Sep 18, 2017
4c15721
Workaround for Oracle trigger for fileid
Sep 19, 2017
cea1009
Cleanup testcase and comments
tomneedham Sep 20, 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
Workaround for Oracle trigger for fileid
  • Loading branch information
Vincent Petry committed Sep 19, 2017
commit 4c157211685c450b46437b1188ed849676670617
14 changes: 14 additions & 0 deletions lib/private/Repair/RepairMismatchFileCachePath.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,20 @@ private function getOrCreateEntry($storageId, $path, $reuseFileId = null) {

// If we reused the fileid then this is the id to return
if($reuseFileId !== null) {
// with Oracle, the trigger gets in the way and does not let us specify
// a fileid value on insert
if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
$lastFileId = $this->connection->lastInsertId('*PREFIX*filecache');
if ($reuseFileId !== $lastFileId) {
// use update to set it directly
$qb = $this->connection->getQueryBuilder();
$qb->update('filecache')
->set('fileid', $qb->createNamedParameter($reuseFileId))
->where($qb->expr()->eq('fileid', $qb->createNamedParameter($lastFileId)));
$qb->execute();
}
}

return $reuseFileId;
} else {
// Else we inserted a new row with auto generated id, use that
Expand Down