Clang: Improve project part updating

The project part ids are now already created very early in the database.
This removes some checks because we can assume that an id already exists.
The project part are now completely persistent, so we can read them from
the database and compare them with new generated from a new creator
session. This should help to not recreate the same PCH again and again.

Task-number: QTCREATORBUG-21151
Change-Id: Iced818ff9f7431eaed3e37978087cc0a43b9afda
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

5 files changed, 35 insertions, 19 deletions

diff --git a/src/plugins/clangrefactoring/clangrefactoringplugin.cpp b/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
index ea765bed5f8..059eff4c78e 100644
--- a/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
+++ b/src/plugins/clangrefactoring/clangrefactoringplugin.cpp
@@ -36,6 +36,7 @@
 #include <clangpchmanager/clangpchmanagerplugin.h>
 #include <clangpchmanager/progressmanager.h>
 #include <clangsupport/refactoringdatabaseinitializer.h>
+#include <projectpartsstorage.h>
 
 #include <cpptools/cppmodelmanager.h>
 
@@ -61,6 +62,8 @@ namespace ClangRefactoring {
 
 namespace {
 
+using ClangPchManager::ClangPchManagerPlugin;
+
 QString backendProcessPath()
 {
     return Core::ICore::libexecPath()
@@ -91,14 +94,16 @@ public:
     ClangBackEnd::RefactoringConnectionClient connectionClient{&refactoringClient};
     QuerySqliteReadStatementFactory statementFactory{database};
     SymbolQuery<QuerySqliteReadStatementFactory> symbolQuery{statementFactory};
+    ClangBackEnd::ProjectPartsStorage<Sqlite::Database> projectPartsStorage{database};
     RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery};
     QtCreatorSearch qtCreatorSearch;
     QtCreatorClangQueryFindFilter qtCreatorfindFilter{connectionClient.serverProxy(),
                                                       qtCreatorSearch,
                                                       refactoringClient};
     QtCreatorRefactoringProjectUpdater projectUpdate{connectionClient.serverProxy(),
-                                                     ClangPchManager::ClangPchManagerPlugin::pchManagerClient(),
-                                                     filePathCache};
+                                                     ClangPchManagerPlugin::pchManagerClient(),
+                                                     filePathCache,
+                                                     projectPartsStorage};
 };
 
 ClangRefactoringPlugin::ClangRefactoringPlugin()
diff --git a/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.cpp b/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.cpp
index f3ca992620c..dea3ccfeec9 100644
--- a/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.cpp
+++ b/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.cpp
@@ -60,10 +60,16 @@ std::vector<ClangBackEnd::V2::FileContainer> createGeneratedFiles()
 }
 }
 
-QtCreatorRefactoringProjectUpdater::QtCreatorRefactoringProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server,
-                                                                       ClangPchManager::PchManagerClient &pchManagerClient,
-                                                                       ClangBackEnd::FilePathCachingInterface &filePathCache)
-    : RefactoringProjectUpdater(server, pchManagerClient, *cppModelManager(), filePathCache)
+QtCreatorRefactoringProjectUpdater::QtCreatorRefactoringProjectUpdater(
+    ClangBackEnd::ProjectManagementServerInterface &server,
+    ClangPchManager::PchManagerClient &pchManagerClient,
+    ClangBackEnd::FilePathCachingInterface &filePathCache,
+    ClangBackEnd::ProjectPartsStorageInterface &projectPartsStorage)
+    : RefactoringProjectUpdater(server,
+                                pchManagerClient,
+                                *cppModelManager(),
+                                filePathCache,
+                                projectPartsStorage)
 {
     connectToCppModelManager();
 }
diff --git a/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.h b/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.h
index 118c15b50c7..85d635a3af5 100644
--- a/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.h
+++ b/src/plugins/clangrefactoring/qtcreatorrefactoringprojectupdater.h
@@ -32,9 +32,11 @@ namespace ClangRefactoring {
 class QtCreatorRefactoringProjectUpdater final : public RefactoringProjectUpdater
 {
 public:
-    QtCreatorRefactoringProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server,
-                                       ClangPchManager::PchManagerClient &pchManagerClient,
-                                       ClangBackEnd::FilePathCachingInterface &filePathCache);
+    QtCreatorRefactoringProjectUpdater(
+        ClangBackEnd::ProjectManagementServerInterface &server,
+        ClangPchManager::PchManagerClient &pchManagerClient,
+        ClangBackEnd::FilePathCachingInterface &filePathCache,
+        ClangBackEnd::ProjectPartsStorageInterface &projectPartsStorage);
 
 private:
     void abstractEditorUpdated(const QString &filePath, const QByteArray &contents);
diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.cpp b/src/plugins/clangrefactoring/refactoringprojectupdater.cpp
index 99b028e522a..8cfd5b942a4 100644
--- a/src/plugins/clangrefactoring/refactoringprojectupdater.cpp
+++ b/src/plugins/clangrefactoring/refactoringprojectupdater.cpp
@@ -26,19 +26,22 @@
 #include "refactoringprojectupdater.h"
 
 #include <cpptools/cppmodelmanager.h>
+#include <projectpartsstorageinterface.h>
 
 namespace ClangRefactoring {
 
-void RefactoringProjectUpdater::precompiledHeaderUpdated(const QString &projectPartId,
+void RefactoringProjectUpdater::precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId,
                                                          const QString &,
                                                          long long)
 {
-    auto projectPart = m_cppModelManager.projectPartForId(projectPartId);
+    const QString projectPartName = fetchProjectPartName(projectPartId);
+
+    auto projectPart = m_cppModelManager.projectPartForId(projectPartName);
     if (projectPart)
         updateProjectParts({projectPart.data()}, {});
 }
 
-void RefactoringProjectUpdater::precompiledHeaderRemoved(const QString &projectPartId)
+void RefactoringProjectUpdater::precompiledHeaderRemoved(ClangBackEnd::ProjectPartId projectPartId)
 {
     removeProjectParts({projectPartId});
 }
diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.h b/src/plugins/clangrefactoring/refactoringprojectupdater.h
index 8e2652cf237..a9559ef94ec 100644
--- a/src/plugins/clangrefactoring/refactoringprojectupdater.h
+++ b/src/plugins/clangrefactoring/refactoringprojectupdater.h
@@ -39,18 +39,18 @@ public:
     RefactoringProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server,
                               ClangPchManager::PchManagerClient &pchManagerClient,
                               CppTools::CppModelManagerInterface &cppModelManager,
-                              ClangBackEnd::FilePathCachingInterface &filePathCache)
-        : ClangPchManager::ProjectUpdater(server, filePathCache),
-          ClangPchManager::PchManagerNotifierInterface(pchManagerClient),
-          m_cppModelManager(cppModelManager)
+                              ClangBackEnd::FilePathCachingInterface &filePathCache,
+                              ClangBackEnd::ProjectPartsStorageInterface &projectPartsStorage)
+        : ClangPchManager::ProjectUpdater(server, filePathCache, projectPartsStorage)
+        , ClangPchManager::PchManagerNotifierInterface(pchManagerClient)
+        , m_cppModelManager(cppModelManager)
     {
-
     }
 
-    void precompiledHeaderUpdated(const QString &projectPartId,
+    void precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId,
                                   const QString &pchFilePath,
                                   long long lastModified) override;
-    void precompiledHeaderRemoved(const QString &projectPartId) override;
+    void precompiledHeaderRemoved(ClangBackEnd::ProjectPartId projectPartId) override;
 
 private:
     CppTools::CppModelManagerInterface &m_cppModelManager;