feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LocatorFileCache: Update the cache in one go

Browse Source 
Don't leave the partially updated cache when the generate()
method was canceled. Before, it was possible that only
m_filePaths were updated, without updating m_lastInput and
m_cache, what could leave the cache in inconsistent state.

Remove unneeded namespace qualifier.
Some doc fixes.

Amends 19918129bf

Change-Id: Icef6389f45f0699d851ce412f134c93353728338
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2023-04-28 12:49:51 +02:00
parent 27f62806ca
commit 9df9185382
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/locator/ilocatorfilter.cpp
View File

@@ -1179,10 +1179,10 @@ public:
LocatorFileCache::FilePathsGenerator m_generator; LocatorFileCache::FilePathsGenerator m_generator;
int m_executionId = 0; int m_executionId = 0;
std::optional<Utils::FilePaths> m_filePaths; std::optional<FilePaths> m_filePaths;
QString m_lastInput; QString m_lastInput;
std::optional<Utils::FilePaths> m_cache; std::optional<FilePaths> m_cache;
}; };
// Clears all but provider // Clears all but provider
@@ -1242,7 +1242,7 @@ static bool containsPathSeparator(const QString &candidate)
\internal \internal
Uses the generator to update the cache if needed and returns entries for the input. Uses the generator to update the cache if needed and returns entries for the input.
Uses the cached data when no need for re-generation. Updates the cached accordingly. Uses the cached data when no need for re-generation. Updates the cache accordingly.
*/ */
LocatorFilterEntries LocatorFileCachePrivate::generate(const QFuture<void> &future, LocatorFilterEntries LocatorFileCachePrivate::generate(const QFuture<void> &future,
const QString &input) const QString &input)
@@ -1265,14 +1265,14 @@ LocatorFilterEntries LocatorFileCachePrivate::generate(const QFuture<void> &futu
const bool pathSeparatorAdded = !containsPathSeparator(m_lastInput) && hasPathSeparator; const bool pathSeparatorAdded = !containsPathSeparator(m_lastInput) && hasPathSeparator;
const bool searchInCache = m_filePaths && m_cache && containsLastInput && !pathSeparatorAdded; const bool searchInCache = m_filePaths && m_cache && containsLastInput && !pathSeparatorAdded;
if (!searchInCache && !m_filePaths) { std::optional<FilePaths> newPaths = m_filePaths;
const FilePaths newPaths = m_generator(future); if (!searchInCache && !newPaths) {
newPaths = m_generator(future);
if (future.isCanceled()) // Ensure we got not canceled results from generator. if (future.isCanceled()) // Ensure we got not canceled results from generator.
return {}; return {};
m_filePaths = newPaths;
} }
const FilePaths &sourcePaths = searchInCache ? *m_cache : *m_filePaths; const FilePaths &sourcePaths = searchInCache ? *m_cache : *newPaths;
LocatorFileCache::MatchedEntries entries = {}; LocatorFileCache::MatchedEntries entries = {};
const FilePaths newCache = LocatorFileCache::processFilePaths( const FilePaths newCache = LocatorFileCache::processFilePaths(
future, sourcePaths, hasPathSeparator, regExp, inputLink, &entries); future, sourcePaths, hasPathSeparator, regExp, inputLink, &entries);
@@ -1287,8 +1287,11 @@ LocatorFilterEntries LocatorFileCachePrivate::generate(const QFuture<void> &futu
if (future.isCanceled()) if (future.isCanceled())
return {}; return {};
// Update all the cache data in one go
m_filePaths = newPaths;
m_lastInput = newInput; m_lastInput = newInput;
m_cache = newCache; m_cache = newCache;
return std::accumulate(std::begin(entries), std::end(entries), LocatorFilterEntries()); return std::accumulate(std::begin(entries), std::end(entries), LocatorFilterEntries());
} }
@@ -1400,6 +1403,7 @@ void LocatorFileCache::setFilePathsGenerator(const FilePathsGenerator &generator
\note This function invalidates the cache temporarily, clearing all the cached data, \note This function invalidates the cache temporarily, clearing all the cached data,
and sets it to a valid state with the new generator for the passed \a filePaths. and sets it to a valid state with the new generator for the passed \a filePaths.
The stored generator provider is preserved.
\sa setGenerator \sa setGenerator
*/ */