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

SocketAPI: Use new class SqlQuery to cache the sql queries.

Browse source 
This results in better handling of the BUSY condition through SqlQuery.
This commit is contained in:
Klaas Freitag 2014-10-20 16:54:51 +02:00
parent 7dbb98c2e5
commit 53b3e5af1b
4 changed files with 57 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mirall/ownsql.cpp
View file

@ -283,4 +283,11 @@ void SqlQuery::reset()
SQLITE_DO(sqlite3_reset(_stmt));
}
void SqlQuery::closeDb()
{
if( _db) {
SQLITE_DO(sqlite3_close(_db) );
_db = 0;
}
}
} // namespace Mirall

3
src/mirall/ownsql.h
View file

@ -57,6 +57,9 @@ public:
quint64 int64Value(int index);
QByteArray baValue(int index);
// use only in rare cases, invalidates the internal db object.
void closeDb();
bool isSelect();
bool isPragma();
bool exec();

86
src/mirall/socketapi.cpp
View file

@ -225,13 +225,13 @@ void SocketApi::slotUnregisterPath( const QString& alias )
if (f) {
broadcastMessage(QLatin1String("UNREGISTER_PATH"), f->path(), QString::null, true );
if( _dbConnections.contains(f)) {
SqliteHandle h = _dbConnections[f];
if( h._stmt ) {
sqlite3_finalize(h._stmt);
if( _dbQueries.contains(f)) {
SqlQuery *h = _dbQueries[f];
if( h ) {
h->finish();
h->closeDb();
}
sqlite3_close(h._db);
_dbConnections.remove(f);
_dbQueries.remove(f);
}
}
}
@ -373,34 +373,39 @@ void SocketApi::command_VERSION(const QString&, SocketType* socket)
sendMessage(socket, QLatin1String("VERSION:" MIRALL_VERSION_STRING ":" MIRALL_SOCKET_API_VERSION));
}
SqliteHandle SocketApi::getSqliteHandle( Folder *folder )
SqlQuery* SocketApi::getSqlQuery( Folder *folder )
{
if( _dbConnections.contains(folder) ) {
return _dbConnections[folder];
}
SqliteHandle h;
h._db = NULL;
h._stmt = NULL;
if( !folder ) {
return h;
return 0;
}
if( _dbQueries.contains(folder) ) {
return _dbQueries[folder];
}
/* No valid sql query object yet for this folder */
int rc;
const char* query = "SELECT inode, mode, modtime, type, md5, fileid, remotePerm FROM "
"metadata WHERE phash=:ph";
const QString sql("SELECT inode, mode, modtime, type, md5, fileid, remotePerm FROM "
"metadata WHERE phash=?1");
QString dbFileName = folder->journalDb()->databaseFilePath();
if( sqlite3_open_v2(dbFileName.toUtf8().constData(), &(h._db),
SQLITE_OPEN_READONLY+SQLITE_OPEN_NOMUTEX, NULL) == SQLITE_OK ) {
if( QFileInfo::exists(dbFileName) ) {
SqlDatabase *db = new SqlDatabase;
rc = sqlite3_prepare_v2(h._db, query, strlen(query), &(h._stmt), NULL);
if( rc != SQLITE_OK ) {
qDebug() << "Unable to prepare the query statement.";
return h; // do not insert into hash
if( db->open(dbFileName) ) {
SqlQuery *query = new SqlQuery(*db);
rc = query->prepare(sql);
if( rc != SQLITE_OK ) {
delete query;
qDebug() << "Unable to prepare the query statement:" << rc;
return 0; // do not insert into hash
}
_dbQueries.insert( folder, query);
return query;
}
_dbConnections.insert( folder, h);
}
return h;
return 0;
}
SyncJournalFileRecord SocketApi::dbFileRecord_capi( Folder *folder, QString fileName )
@ -413,30 +418,25 @@ SyncJournalFileRecord SocketApi::dbFileRecord_capi( Folder *folder, QString file
fileName.remove(0, folder->path().length());
}
SqliteHandle h = getSqliteHandle(folder);
sqlite3_stmt *stmt = h._stmt;
SqlQuery *query = getSqlQuery(folder);
SyncJournalFileRecord rec;
if( h._db && h._stmt ) {
if( query ) {
qlonglong phash = SyncJournalDb::getPHash( fileName );
sqlite3_bind_int64(stmt, 1, (long long signed int)phash);
query->bindValue(1, phash);
// int column_count = sqlite3_column_count(stmt);
int rc = sqlite3_step(stmt);
if (rc == SQLITE_ROW ) {
rec._path = fileName;
rec._inode = sqlite3_column_int64(stmt,0);;
rec._mode = sqlite3_column_int(stmt, 1);
rec._modtime = Utility::qDateTimeFromTime_t( strtoul((char*)sqlite3_column_text(stmt, 2), NULL, 10));
rec._type = sqlite3_column_int(stmt, 3);;
rec._etag = QByteArray((char*)sqlite3_column_text(stmt, 4));
rec._fileId = QByteArray((char*)sqlite3_column_text(stmt, 5));
rec._remotePerm = QByteArray((char*)sqlite3_column_text(stmt, 6));
if (query->next()) {
rec._path = fileName;
rec._inode = query->int64Value(0);
rec._mode = query->intValue(1);
rec._modtime = Utility::qDateTimeFromTime_t( query->int64Value(2));
rec._type = query->intValue(3);
rec._etag = query->baValue(4);
rec._fileId = query->baValue(5);
rec._remotePerm = query->baValue(6);
}
sqlite3_reset(stmt);
query->reset();
}
return rec;
}

12
src/mirall/socketapi.h
View file

@ -29,6 +29,8 @@ extern "C" {
#include "mirall/syncfileitem.h"
#include "mirall/syncjournalfilerecord.h"
#include "mirall/ownsql.h"
class QUrl;
class QLocalSocket;
class QStringList;
@ -40,12 +42,6 @@ typedef QLocalSocket SocketType;
class SyncFileStatus;
class Folder;
struct SqliteHandle
{
sqlite3 *_db;
sqlite3_stmt *_stmt;
};
class SocketApi : public QObject
{
Q_OBJECT
@ -72,7 +68,7 @@ private:
SyncJournalFileRecord dbFileRecord( Folder *folder, QString fileName );
SyncJournalFileRecord dbFileRecord_capi( Folder *folder, QString fileName );
SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName, c_strlist_t *excludes );
SqliteHandle getSqliteHandle( Folder *folder );
SqlQuery *getSqlQuery( Folder *folder );
void sendMessage(SocketType* socket, const QString& message, bool doWait = false);
void broadcastMessage(const QString& verb, const QString &path, const QString &status = QString::null, bool doWait = false);
@ -89,7 +85,7 @@ private:
#endif
QList<SocketType*> _listeners;
c_strlist_t *_excludes;
QHash<Folder*, SqliteHandle> _dbConnections;
QHash<Folder*, SqlQuery*> _dbQueries;
};
}