mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use precompiled database statements.

Browse source
This commit is contained in:
Klaas Freitag 2013-11-13 11:16:00 +01:00
parent b610dd2754
commit 858facb5e0
2 changed files with 137 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

225
src/mirall/syncjournaldb.cpp
View file

@ -36,6 +36,8 @@ SyncJournalDb::SyncJournalDb(const QString& path, QObject *parent) :
_dbFile.append('/'); _dbFile.append('/');
} }
_dbFile.append(".csync_journal.db"); _dbFile.append(".csync_journal.db");
} }
bool SyncJournalDb::exists() bool SyncJournalDb::exists()
@ -117,13 +119,46 @@ bool SyncJournalDb::checkConnect()
"size INTEGER(8)," "size INTEGER(8),"
"modtime INTEGER(8)," "modtime INTEGER(8),"
"PRIMARY KEY(path)" "PRIMARY KEY(path)"
");" , _db); ");", _db );
if (!createQuery3.exec()) { if (!createQuery3.exec()) {
qWarning() << "Error creating table downloadinfo : " << createQuery3.lastError().text(); qWarning() << "Error creating table downloadinfo : " << createQuery3.lastError().text();
return false; return false;
} }
_getFileRecordQuery.reset(new QSqlQuery(_db));
_getFileRecordQuery->prepare("SELECT path, inode, uid, gid, mode, modtime, type, md5, fileid FROM "
"metadata WHERE phash=:ph" );
_setFileRecordQuery.reset(new QSqlQuery(_db) );
_setFileRecordQuery->prepare("INSERT OR REPLACE INTO metadata "
"(phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid) "
"VALUES ( ? , ?, ? , ? , ? , ? , ?, ? , ? , ?, ? )" );
_getDownloadInfoQuery.reset(new QSqlQuery(_db) );
_getDownloadInfoQuery->prepare( "SELECT tmpfile, etag, errorcount FROM "
"downloadinfo WHERE path=:pa" );
_setDownloadInfoQuery.reset(new QSqlQuery(_db) );
_setDownloadInfoQuery->prepare( "INSERT OR REPLACE INTO downloadinfo "
"(path, tmpfile, etag, errorcount) "
"VALUES ( ? , ?, ? , ? )" );
_deleteDownloadInfoQuery.reset(new QSqlQuery(_db) );
_deleteDownloadInfoQuery->prepare( "DELETE FROM downloadinfo WHERE path=?" );
_getUploadInfoQuery.reset(new QSqlQuery(_db));
_getUploadInfoQuery->prepare( "SELECT chunk, transferid, errorcount, size, modtime FROM "
"uploadinfo WHERE path=:pa" );
_setUploadInfoQuery.reset(new QSqlQuery(_db));
_setUploadInfoQuery->prepare( "INSERT OR REPLACE INTO uploadinfo "
"(path, chunk, transferid, errorcount, size, modtime) "
"VALUES ( ? , ?, ? , ? , ? , ? )");
_deleteUploadInfoQuery.reset(new QSqlQuery(_db));
_deleteUploadInfoQuery->prepare("DELETE FROM uploadinfo WHERE path=?" );
bool rc = updateDatabaseStructure(); bool rc = updateDatabaseStructure();
return rc; return rc;
@ -187,36 +222,40 @@ bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& record )
QMutexLocker locker(&_mutex); QMutexLocker locker(&_mutex);
qlonglong phash = getPHash(record._path); qlonglong phash = getPHash(record._path);
if( checkConnect() ) { if( checkConnect() ) {
QSqlQuery writeQuery( "INSERT OR REPLACE INTO metadata "
"(phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid) "
"VALUES ( ? , ?, ? , ? , ? , ? , ?, ? , ? , ?, ? )", _db );
QByteArray arr = record._path.toUtf8(); QByteArray arr = record._path.toUtf8();
int plen = arr.length(); int plen = arr.length();
writeQuery.bindValue(0, QString::number(phash)); // _setFileRecordQuery->prepare("INSERT OR REPLACE INTO metadata "
writeQuery.bindValue(1, plen); // "(phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid) "
writeQuery.bindValue(2, record._path ); // "VALUES ( ? , ?, ? , ? , ? , ? , ?, ? , ? , ?, ? )" );
writeQuery.bindValue(3, record._inode ); QString etag( record._etag );
writeQuery.bindValue(4, record._uid ); if( etag.isEmpty() ) etag = "";
writeQuery.bindValue(5, record._gid ); QString fileId( record._fileId);
writeQuery.bindValue(6, record._mode ); if( fileId.isEmpty() ) fileId = "";
writeQuery.bindValue(7, QString::number(record._modtime.toTime_t()));
writeQuery.bindValue(8, QString::number(record._type) );
writeQuery.bindValue(9, record._etag );
writeQuery.bindValue(10, record._fileId );
if( !writeQuery.exec() ) { _setFileRecordQuery->bindValue(0, QString::number(phash));
qWarning() << "Exec error of SQL statement: " << writeQuery.lastQuery() << " :" _setFileRecordQuery->bindValue(1, plen);
<< writeQuery.lastError().text(); _setFileRecordQuery->bindValue(2, record._path );
_setFileRecordQuery->bindValue(3, record._inode );
_setFileRecordQuery->bindValue(4, record._uid );
_setFileRecordQuery->bindValue(5, record._gid );
_setFileRecordQuery->bindValue(6, record._mode );
_setFileRecordQuery->bindValue(7, QString::number(record._modtime.toTime_t()));
_setFileRecordQuery->bindValue(8, QString::number(record._type) );
_setFileRecordQuery->bindValue(9, etag );
_setFileRecordQuery->bindValue(10, fileId );
if( !_setFileRecordQuery->exec() ) {
qWarning() << "Error SQL statement setFileRecord: " << _setFileRecordQuery->lastQuery() << " :"
<< _setFileRecordQuery->lastError().text();
return false; return false;
} }
qDebug() << writeQuery.lastQuery() << phash << plen << record._path << record._inode qDebug() << _setFileRecordQuery->lastQuery() << phash << plen << record._path << record._inode
<< record._uid << record._gid << record._mode << record._uid << record._gid << record._mode
<< QString::number(record._modtime.toTime_t()) << QString::number(record._type) << QString::number(record._modtime.toTime_t()) << QString::number(record._type)
<< record._etag << record._fileId; << record._etag << record._fileId;
_setFileRecordQuery->finish();
return true; return true;
} else { } else {
@ -273,30 +312,30 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
*/ */
if( checkConnect() ) { if( checkConnect() ) {
QSqlQuery query("SELECT path, inode, uid, gid, mode, modtime, type, md5, fileid FROM " _getFileRecordQuery->bindValue(":ph", QString::number(phash));
"metadata WHERE phash=:ph" , _db);
query.bindValue(":ph", QString::number(phash));
if (!query.exec()) { if (!_getFileRecordQuery->exec()) {
QString err = query.lastError().text(); QString err = _getFileRecordQuery->lastError().text();
qDebug() << "Error creating prepared statement: " << query.lastQuery() << ", Error:" << err;; qDebug() << "Error creating prepared statement: " << _getFileRecordQuery->lastQuery() << ", Error:" << err;;
return rec; return rec;
} }
if( query.next() ) { if( _getFileRecordQuery->next() ) {
bool ok; bool ok;
rec._path = query.value(0).toString(); rec._path = _getFileRecordQuery->value(0).toString();
rec._inode = query.value(1).toInt(&ok); rec._inode = _getFileRecordQuery->value(1).toInt(&ok);
rec._uid = query.value(2).toInt(&ok); rec._uid = _getFileRecordQuery->value(2).toInt(&ok);
rec._gid = query.value(3).toInt(&ok); rec._gid = _getFileRecordQuery->value(3).toInt(&ok);
rec._mode = query.value(4).toInt(&ok); rec._mode = _getFileRecordQuery->value(4).toInt(&ok);
rec._modtime = QDateTime::fromTime_t(query.value(5).toLongLong(&ok)); rec._modtime = QDateTime::fromTime_t(_getFileRecordQuery->value(5).toLongLong(&ok));
rec._type = query.value(6).toInt(&ok); rec._type = _getFileRecordQuery->value(6).toInt(&ok);
rec._etag = query.value(7).toString(); rec._etag = _getFileRecordQuery->value(7).toString();
rec._fileId = query.value(8).toString(); rec._fileId = _getFileRecordQuery->value(8).toString();
_getFileRecordQuery->finish();
} else { } else {
QString err = query.lastError().text(); QString err = _getFileRecordQuery->lastError().text();
qDebug() << "Can not query " << query.lastQuery() << ", Error:" << err; qDebug() << "Can not query " << _getFileRecordQuery->lastQuery() << ", Error:" << err;
} }
} }
return rec; return rec;
@ -368,23 +407,22 @@ SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString& file)
DownloadInfo res; DownloadInfo res;
if( checkConnect() ) { if( checkConnect() ) {
QSqlQuery query("SELECT tmpfile, etag, errorcount FROM " _getDownloadInfoQuery->bindValue(":pa", file);
"downloadinfo WHERE path=:pa" , _db);
query.bindValue(":pa", file);
if (!query.exec()) { if (!_getDownloadInfoQuery->exec()) {
QString err = query.lastError().text(); QString err = _getDownloadInfoQuery->lastError().text();
qDebug() << "Database error for file " << file << " : " << query.lastQuery() << ", Error:" << err;; qDebug() << "Database error for file " << file << " : " << _getDownloadInfoQuery->lastQuery() << ", Error:" << err;;
return res; return res;
} }
if( query.next() ) { if( _getDownloadInfoQuery->next() ) {
bool ok = true; bool ok = true;
res._tmpfile = query.value(0).toString(); res._tmpfile = _getDownloadInfoQuery->value(0).toString();
res._etag = query.value(1).toByteArray(); res._etag = _getDownloadInfoQuery->value(1).toByteArray();
res._errorCount = query.value(2).toInt(&ok); res._errorCount = _getDownloadInfoQuery->value(2).toInt(&ok);
res._valid = ok; res._valid = ok;
} }
_getDownloadInfoQuery->finish();
} }
return res; return res;
} }
@ -397,31 +435,28 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
return; return;
if (i._valid) { if (i._valid) {
_setDownloadInfoQuery->bindValue(0, file);
_setDownloadInfoQuery->bindValue(1, i._tmpfile);
_setDownloadInfoQuery->bindValue(2, i._etag );
_setDownloadInfoQuery->bindValue(3, i._errorCount );
QSqlQuery writeQuery( "INSERT OR REPLACE INTO downloadinfo " if( !_setDownloadInfoQuery->exec() ) {
"(path, tmpfile, etag, errorcount) " qWarning() << "Exec error of SQL statement: " << _setDownloadInfoQuery->lastQuery() << " :" << _setDownloadInfoQuery->lastError().text();
"VALUES ( ? , ?, ? , ? )", _db );
writeQuery.bindValue(0, file);
writeQuery.bindValue(1, i._tmpfile);
writeQuery.bindValue(2, i._etag );
writeQuery.bindValue(3, i._errorCount );
if( !writeQuery.exec() ) {
qWarning() << "Exec error of SQL statement: " << writeQuery.lastQuery() << " :" << writeQuery.lastError().text();
return; return;
} }
qDebug() << writeQuery.lastQuery() << file << i._tmpfile << i._etag << i._errorCount; qDebug() << _setDownloadInfoQuery->lastQuery() << file << i._tmpfile << i._etag << i._errorCount;
_setDownloadInfoQuery->finish();
} else { } else {
QSqlQuery query( "DELETE FROM downloadinfo WHERE path=?" ); _deleteDownloadInfoQuery->bindValue( 0, file );
query.bindValue( 0, file );
if( !query.exec() ) { if( !_deleteDownloadInfoQuery->exec() ) {
qWarning() << "Exec error of SQL statement: " << query.lastQuery() << " : " << query.lastError().text(); qWarning() << "Exec error of SQL statement: " << _deleteDownloadInfoQuery->lastQuery() << " : " << _deleteDownloadInfoQuery->lastError().text();
return; return;
} }
qDebug() << query.executedQuery() << file; qDebug() << _deleteDownloadInfoQuery->executedQuery() << file;
_deleteDownloadInfoQuery->finish();
} }
} }
@ -432,25 +467,25 @@ SyncJournalDb::UploadInfo SyncJournalDb::getUploadInfo(const QString& file)
UploadInfo res; UploadInfo res;
if( checkConnect() ) { if( checkConnect() ) {
QSqlQuery query("SELECT chunk, transferid, errorcount, size, modtime FROM "
"uploadinfo WHERE path=:pa" , _db);
query.bindValue(":pa", file);
if (!query.exec()) { _getUploadInfoQuery->bindValue(":pa", file);
QString err = query.lastError().text();
qDebug() << "Database error for file " << file << " : " << query.lastQuery() << ", Error:" << err; if (!_getUploadInfoQuery->exec()) {
QString err = _getUploadInfoQuery->lastError().text();
qDebug() << "Database error for file " << file << " : " << _getUploadInfoQuery->lastQuery() << ", Error:" << err;
return res; return res;
} }
if( query.next() ) { if( _getUploadInfoQuery->next() ) {
bool ok = true; bool ok = true;
res._chunk = query.value(0).toInt(&ok); res._chunk = _getUploadInfoQuery->value(0).toInt(&ok);
res._transferid = query.value(1).toInt(&ok); res._transferid = _getUploadInfoQuery->value(1).toInt(&ok);
res._errorCount = query.value(2).toInt(&ok); res._errorCount = _getUploadInfoQuery->value(2).toInt(&ok);
res._size = query.value(3).toLongLong(&ok); res._size = _getUploadInfoQuery->value(3).toLongLong(&ok);
res._modtime = QDateTime::fromTime_t(query.value(4).toLongLong(&ok)); res._modtime = QDateTime::fromTime_t(_getUploadInfoQuery->value(4).toLongLong(&ok));
res._valid = ok; res._valid = ok;
} }
_getUploadInfoQuery->finish();
} }
return res; return res;
} }
@ -463,33 +498,29 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
return; return;
if (i._valid) { if (i._valid) {
_setUploadInfoQuery->bindValue(0, file);
_setUploadInfoQuery->bindValue(1, i._chunk);
_setUploadInfoQuery->bindValue(2, i._transferid );
_setUploadInfoQuery->bindValue(3, i._errorCount );
_setUploadInfoQuery->bindValue(4, i._size );
_setUploadInfoQuery->bindValue(5, QString::number(i._modtime.toTime_t()) );
QSqlQuery writeQuery( "INSERT OR REPLACE INTO uploadinfo " if( !_setUploadInfoQuery->exec() ) {
"(path, chunk, transferid, errorcount, size, modtime) " qWarning() << "Exec error of SQL statement: " << _setUploadInfoQuery->lastQuery() << " :" << _setUploadInfoQuery->lastError().text();
"VALUES ( ? , ?, ? , ? , ? , ? )", _db );
writeQuery.bindValue(0, file);
writeQuery.bindValue(1, i._chunk);
writeQuery.bindValue(2, i._transferid );
writeQuery.bindValue(3, i._errorCount );
writeQuery.bindValue(4, i._size );
writeQuery.bindValue(5, QString::number(i._modtime.toTime_t()) );
if( !writeQuery.exec() ) {
qWarning() << "Exec error of SQL statement: " << writeQuery.lastQuery() << " :" << writeQuery.lastError().text();
return; return;
} }
qDebug() << writeQuery.lastQuery() << file << i._chunk << i._transferid << i._errorCount; qDebug() << _setUploadInfoQuery->lastQuery() << file << i._chunk << i._transferid << i._errorCount;
_setUploadInfoQuery->finish();
} else { } else {
QSqlQuery query( "DELETE FROM uploadinfo WHERE path=?" ); _deleteUploadInfoQuery->bindValue(0, file);
query.bindValue( 0, file );
if( !query.exec() ) { if( !_deleteUploadInfoQuery->exec() ) {
qWarning() << "Exec error of SQL statement: " << query.lastQuery() << " : " << query.lastError().text(); qWarning() << "Exec error of SQL statement: " << _deleteUploadInfoQuery->lastQuery() << " : " << _deleteUploadInfoQuery->lastError().text();
return; return;
} }
qDebug() << query.executedQuery() << file; qDebug() << _deleteUploadInfoQuery->executedQuery() << file;
_deleteUploadInfoQuery->finish();
} }
} }

9
src/mirall/syncjournaldb.h
View file

@ -19,6 +19,7 @@
#include <QDateTime> #include <QDateTime>
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QHash> #include <QHash>
#include <QSqlQuery>
namespace Mirall { namespace Mirall {
class SyncJournalFileRecord; class SyncJournalFileRecord;
@ -70,6 +71,14 @@ private:
QSqlDatabase _db; QSqlDatabase _db;
QString _dbFile; QString _dbFile;
QMutex _mutex; // Public functions are protected with the mutex. QMutex _mutex; // Public functions are protected with the mutex.
QScopedPointer<QSqlQuery> _getFileRecordQuery;
QScopedPointer<QSqlQuery> _setFileRecordQuery;
QScopedPointer<QSqlQuery> _getDownloadInfoQuery;
QScopedPointer<QSqlQuery> _setDownloadInfoQuery;
QScopedPointer<QSqlQuery> _deleteDownloadInfoQuery;
QScopedPointer<QSqlQuery> _getUploadInfoQuery;
QScopedPointer<QSqlQuery> _setUploadInfoQuery;
QScopedPointer<QSqlQuery> _deleteUploadInfoQuery;
}; };