RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-10 08:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add comments mentioning shortcomings and avoid potential double check

Browse Source
This commit is contained in:
Dean Herbert 2021-06-27 16:48:42 +09:00
parent 44f875b802
commit 9120321731
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Database/ArchiveModelManager.cs
View File

@ -371,18 +371,25 @@ namespace osu.Game.Database
delayEvents(); delayEvents();
bool checkedExisting = false;
TModel existing = null;
if (archive != null && !HasCustomHashFunction) if (archive != null && !HasCustomHashFunction)
{ {
// fast bail to improve large import performance. // this is a fast bail condition to improve large import performance.
item.Hash = computeHashFast(archive); item.Hash = computeHashFast(archive);
var fastExisting = CheckForExisting(item); checkedExisting = true;
existing = CheckForExisting(item);
if (fastExisting != null) if (existing != null)
{ {
// bare minimum comparisons // bare minimum comparisons
if (getFilenames(fastExisting.Files).SequenceEqual(getShortenedFilenames(archive).Select(p => p.shortened))) //
return fastExisting; // note that this should really be checking filesizes on disk (of existing files) for some degree of sanity.
// or alternatively doing a faster hash check. either of these require database changes and reprocessing of existing files.
if (getFilenames(existing.Files).SequenceEqual(getShortenedFilenames(archive).Select(p => p.shortened).OrderBy(f => f)))
return existing;
} }
} }
@ -411,7 +418,8 @@ namespace osu.Game.Database
{ {
if (!write.IsTransactionLeader) throw new InvalidOperationException($"Ensure there is no parent transaction so errors can correctly be handled by {this}"); if (!write.IsTransactionLeader) throw new InvalidOperationException($"Ensure there is no parent transaction so errors can correctly be handled by {this}");
var existing = CheckForExisting(item); if (!checkedExisting)
existing = CheckForExisting(item);
if (existing != null) if (existing != null)
{ {