Made the last scan step (checking for removed files) faster on big libraries

This commit is contained in:
emeric
2024-03-14 23:21:30 +01:00
parent 071b86602e
commit 03425f3c94
4 changed files with 104 additions and 34 deletions
@@ -89,62 +89,49 @@ namespace lms::scanner
Session& session{ _db.getTLSSession() };
LMS_LOG(DBUPDATER, DEBUG, "Checking tracks to be removed...");
std::size_t trackCount{};
{
auto transaction{ session.createReadTransaction() };
trackCount = Track::getCount(session);
context.currentStepStats.totalElems = Track::getCount(session);
}
LMS_LOG(DBUPDATER, DEBUG, trackCount << " tracks to be checked...");
LMS_LOG(DBUPDATER, DEBUG, context.currentStepStats.totalElems << " tracks to be checked...");
context.currentStepStats.totalElems = trackCount;
// TODO handle only files in context.directory?
std::vector<Track::pointer> tracksToRemove;
RangeResults<Track::PathResult> trackPaths;
std::vector<TrackId> tracksToRemove;
// TODO handle only files in context.directory
for (std::size_t i{ trackCount < batchSize ? 0 : trackCount - batchSize }; ; i -= (i > batchSize ? batchSize : i))
TrackId lastCheckedTrackID;
bool moreResults{ true };
while (moreResults)
{
tracksToRemove.clear();
if (_abortScan)
break;
tracksToRemove.clear();
{
auto transaction{ session.createReadTransaction() };
trackPaths = Track::findPaths(session, Range{ i, batchSize });
}
Track::find(session, lastCheckedTrackID, batchSize, moreResults, [&](const Track::pointer& track)
{
if (!checkFile(track->getPath()))
tracksToRemove.push_back(track);
for (const Track::PathResult& trackPath : trackPaths.results)
{
if (_abortScan)
return;
if (!checkFile(trackPath.path))
tracksToRemove.push_back(trackPath.trackId);
context.currentStepStats.processedElems++;
context.currentStepStats.processedElems++;
});
}
if (!tracksToRemove.empty())
{
auto transaction{ session.createWriteTransaction() };
for (const TrackId trackId : tracksToRemove)
for (Track::pointer& track : tracksToRemove)
{
Track::pointer track{ Track::find(session, trackId) };
if (track)
{
track.remove();
context.stats.deletions++;
}
track.remove();
context.stats.deletions++;
}
}
_progressCallback(context.currentStepStats);
if (i == 0)
break;
}
LMS_LOG(DBUPDATER, DEBUG, trackCount << " tracks checked!");
LMS_LOG(DBUPDATER, DEBUG, context.currentStepStats.processedElems << " tracks checked!");
}
void ScanStepRemoveOrphanDbFiles::removeOrphanClusters()