Skip to content

fix(versions): fix duplicate entry for key 'c_p_versions_uniq_idx' #2451

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

Open
mejo- wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −4
Open

fix(versions): fix duplicate entry for key 'c_p_versions_uniq_idx' #2451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 34 additions & 4 deletions lib/Versions/VersionsBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use OCA\Files_Versions\Versions\IVersionsImporterBackend;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\Constants;
use OCP\DB\Exception as DBException;
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\Files\Folder;
Expand Down Expand Up @@ -107,7 +108,15 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array {
$versionEntity->setSize($file->getSize());
$versionEntity->setMimetype($this->mimeTypeLoader->getId($file->getMimetype()));
$versionEntity->setDecodedMetadata([]);
$this->collectiveVersionMapper->insert($versionEntity);
try {
$this->collectiveVersionMapper->insert($versionEntity);
} catch (DBException $e) {
if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
// Another concurrent request already populated the DB for this file; return what's there.
return $this->getVersionsForFileFromDb($file, $user);
}

// Insert entries in the DB for existing versions.
$versionsOnFS = $versionsFolder->getDirectoryListing();
Expand All @@ -133,7 +142,14 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array {
// Use the main file mimetype for this initialization as the original mimetype is unknown.
$versionEntity->setMimetype($this->mimeTypeLoader->getId($file->getMimetype()));
$versionEntity->setDecodedMetadata([]);
$this->collectiveVersionMapper->insert($versionEntity);
try {
$this->collectiveVersionMapper->insert($versionEntity);
} catch (DBException $e) {
if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
// Duplicate on disk versions: skip this entry, it was already recorded.
}
}

return $this->getVersionsForFileFromDb($file, $user);
Expand Down Expand Up @@ -389,7 +405,14 @@ public function createVersionEntity(File $file): void {
$versionEntity->setSize($file->getSize());
$versionEntity->setMimetype($this->mimeTypeLoader->getId($file->getMimetype()));
$versionEntity->setDecodedMetadata([]);
$this->collectiveVersionMapper->insert($versionEntity);
try {
$this->collectiveVersionMapper->insert($versionEntity);
} catch (DBException $e) {
if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
// Entity already exists (e.g. created by a concurrent request or the lazy-init path); nothing to do.
}
}

public function updateVersionEntity(File $sourceFile, int $revision, array $properties): void {
Expand Down Expand Up @@ -458,7 +481,14 @@ public function importVersionsForFile(IUser $user, Node $source, Node $target, a
$versionEntity->setDecodedMetadata($version->getMetadata());
}

$this->collectiveVersionMapper->insert($versionEntity);
try {
$this->collectiveVersionMapper->insert($versionEntity);
} catch (DBException $e) {
if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
// Version was already imported (e.g. on a retry); skip.
}
}
}

Expand Down
Loading