ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: improved python post processing speed and show progress dialog

Browse Source
This commit is contained in:
Eberhard Graether
2019-05-28 17:40:35 +02:00
parent 31f4e47903
commit d2b41f7598
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/indexer/TaskExecuteCustomCommands.cpp
+2 -1
View File
@@ -69,7 +69,7 @@ void TaskExecuteCustomCommands::doEnter(std::shared_ptr<Blackboard> blackboard)
} }
} }
// reverse because we pull elements from the back of these vectors // reverse because we pull elements from the back of these vectors
std::reverse(m_parallelCommands.begin(), m_parallelCommands.end()); std::reverse(m_parallelCommands.begin(), m_parallelCommands.end());
std::reverse(m_serialCommands.begin(), m_serialCommands.end()); std::reverse(m_serialCommands.begin(), m_serialCommands.end());
} }
} }
@@ -255,6 +255,7 @@ void TaskExecuteCustomCommands::runIndexerCommand(std::shared_ptr<IndexerCommand
void TaskExecuteCustomCommands::runPythonPostProcessing(PersistentStorage& storage) void TaskExecuteCustomCommands::runPythonPostProcessing(PersistentStorage& storage)
{ {
LOG_INFO("Starting Python post processing."); LOG_INFO("Starting Python post processing.");
m_dialogView->showUnknownProgressDialog(L"Finish Indexing", L"Run Python Post Processing");
std::vector<Id> unsolvedLocationIds; std::vector<Id> unsolvedLocationIds;
for (const StorageSourceLocation location : storage.getStorageSourceLocations()) for (const StorageSourceLocation location : storage.getStorageSourceLocations())
src/lib/data/indexer/TaskExecuteCustomCommands.h
+1 -1
View File
@@ -37,7 +37,7 @@ private:
void executeParallelIndexerCommands(int threadId, std::shared_ptr<Blackboard> blackboard); void executeParallelIndexerCommands(int threadId, std::shared_ptr<Blackboard> blackboard);
void runIndexerCommand(std::shared_ptr<IndexerCommandCustom> indexerCommand, std::shared_ptr<Blackboard> blackboard); void runIndexerCommand(std::shared_ptr<IndexerCommandCustom> indexerCommand, std::shared_ptr<Blackboard> blackboard);
static void runPythonPostProcessing(PersistentStorage& storage); void runPythonPostProcessing(PersistentStorage& storage);
private: private:
std::unique_ptr<IndexerCommandProvider> m_indexerCommandProvider; std::unique_ptr<IndexerCommandProvider> m_indexerCommandProvider;
src/lib/data/storage/PersistentStorage.cpp
+7 -7
View File
@@ -1473,14 +1473,14 @@ std::shared_ptr<SourceLocationCollection> PersistentStorage::getSourceLocationsF
std::shared_ptr<SourceLocationCollection> collection = std::make_shared<SourceLocationCollection>(); std::shared_ptr<SourceLocationCollection> collection = std::make_shared<SourceLocationCollection>();
std::map<Id, std::vector<Id>> m_locationIdToElementIds;
for (const StorageOccurrence& occurrence: m_sqliteIndexStorage.getOccurrencesForLocationIds(locationIds))
{
m_locationIdToElementIds[occurrence.sourceLocationId].push_back(occurrence.elementId);
}
for (StorageSourceLocation location: m_sqliteIndexStorage.getAllByIds<StorageSourceLocation>(locationIds)) for (StorageSourceLocation location: m_sqliteIndexStorage.getAllByIds<StorageSourceLocation>(locationIds))
{ {
std::vector<Id> elementIds;
for (const StorageOccurrence& occurrence: m_sqliteIndexStorage.getOccurrencesForLocationId(location.id))
{
elementIds.push_back(occurrence.elementId);
}
const LocationType type = intToLocationType(location.type); const LocationType type = intToLocationType(location.type);
if (type != LOCATION_TOKEN && type != LOCATION_SCOPE && type != LOCATION_LOCAL_SYMBOL && type != LOCATION_UNSOLVED) if (type != LOCATION_TOKEN && type != LOCATION_SCOPE && type != LOCATION_LOCAL_SYMBOL && type != LOCATION_UNSOLVED)
{ {
@@ -1490,7 +1490,7 @@ std::shared_ptr<SourceLocationCollection> PersistentStorage::getSourceLocationsF
collection->addSourceLocation( collection->addSourceLocation(
intToLocationType(location.type), intToLocationType(location.type),
location.id, location.id,
elementIds, m_locationIdToElementIds[location.id],
getFileNodePath(location.fileNodeId), getFileNodePath(location.fileNodeId),
location.startLine, location.startLine,
location.startCol, location.startCol,