mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve locking in SQLiteTableModel

Browse Source
This commit is contained in:
Martin Kleusberg
2017-10-16 21:54:33 +02:00
parent 973f97c1eb
commit 681456733e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sqlitetablemodel.cpp
View File

@@ -384,7 +384,6 @@ bool SqliteTableModel::setTypedData(const QModelIndex& index, bool isBlob, const
bool SqliteTableModel::canFetchMore(const QModelIndex&) const
{
m_futureFetch.waitForFinished();
QMutexLocker lock(&m_mutexDataCache);
return m_data.size() < (m_rowCount + m_rowCountAdjustment);
}
@@ -535,7 +534,6 @@ void SqliteTableModel::fetchData(unsigned int from, unsigned to)
// Fetch more data using a separate thread
m_futureFetch = QtConcurrent::run([=]() {
QMutexLocker lock(&m_mutexDataCache);
int num_rows_before_insert = m_data.size();
QString sLimitQuery;
@@ -562,6 +560,7 @@ void SqliteTableModel::fetchData(unsigned int from, unsigned to)
int num_columns = m_headers.size();
while(!m_futureFetch.isCanceled() && sqlite3_step(stmt) == SQLITE_ROW)
{
QMutexLocker lock(&m_mutexDataCache);
QByteArrayList rowdata;
for(int i=0;i<num_columns;++i)
{