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

Clang: Handle a busy database in the PCH plugin

Browse Source 
This can be always happen for write statements. It fixes the wrong behavior
of the transaction that it tried to rollback if begin fails. If begin fails
the transaction never started so there is nothing to rollback.

Change-Id: I8a03162257fa22a0bb66ccb844f90c6afbc7db64
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2018-03-28 16:25:01 +02:00
parent 789379a8e3
commit 5870905db6
4 changed files with 162 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/clangpchmanager/precompiledheaderstorage.h
View File

@@ -28,6 +28,7 @@
#include "precompiledheaderstorageinterface.h"
#include <sqlitetransaction.h>
#include <sqliteexception.h>
#include <utils/smallstringview.h>
@@ -50,13 +51,29 @@ public:
Utils::SmallStringView pchPath,
long long pchBuildTime) override
{
m_insertProjectPartStatement.write(projectPartName);
m_insertPrecompiledHeaderStatement .write(projectPartName, pchPath, pchBuildTime);
try {
Sqlite::ImmediateTransaction transaction{m_database};
m_insertProjectPartStatement.write(projectPartName);
m_insertPrecompiledHeaderStatement .write(projectPartName, pchPath, pchBuildTime);
transaction.commit();
} catch (const Sqlite::StatementIsBusy) {
insertPrecompiledHeader(projectPartName, pchPath, pchBuildTime);
}
}
void deletePrecompiledHeader(Utils::SmallStringView projectPartName) override
{
m_deletePrecompiledHeaderStatement.write(projectPartName);
try {
Sqlite::ImmediateTransaction transaction{m_database};
m_deletePrecompiledHeaderStatement.write(projectPartName);
transaction.commit();
} catch (const Sqlite::StatementIsBusy) {
deletePrecompiledHeader(projectPartName);
}
}