X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=e0f8fd809d92292778976fbca6eb3aa9656556e4;hp=e40150c49ac074ae7656f5aa28c46d1f7532bea9;hb=d1aa795013aaebe5ca57353d6077b0007b489832;hpb=6a63070246d89aa2a2474e3a9a1035fa889ad77e diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index e40150c4..e0f8fd80 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -22,7 +22,7 @@ #include -#include "logger.h" +#include "logmessage.h" #include "network.h" #include "quassel.h" @@ -1756,18 +1756,9 @@ bool SqliteStorage::logMessage(Message &msg) { QSqlQuery logMessageQuery(db); logMessageQuery.prepare(queryString("insert_message")); - // Store timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need to store a - // fractional number to support toMSecsSinceEpoch(), or an upgrade step would need to - // convert all past times to milliseconds, multiplying by 1000. -#if QT_VERSION >= 0x050800 - logMessageQuery.bindValue(":time", msg.timestamp().toSecsSinceEpoch()); -#else - // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now. - // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch - logMessageQuery.bindValue(":time", (qint64)(msg.timestamp().toMSecsSinceEpoch() / 1000)); -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds instead of + // seconds. This nets us more precision as well as simplifying 64-bit time. + logMessageQuery.bindValue(":time", msg.timestamp().toMSecsSinceEpoch()); logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt()); logMessageQuery.bindValue(":type", msg.type()); logMessageQuery.bindValue(":flags", (int)msg.flags()); @@ -1849,19 +1840,9 @@ bool SqliteStorage::logMessages(MessageList &msgs) logMessageQuery.prepare(queryString("insert_message")); for (int i = 0; i < msgs.count(); i++) { Message &msg = msgs[i]; - // Store timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need to store a - // fractional number to support toMSecsSinceEpoch(), or an upgrade step would need to - // convert all past times to milliseconds, multiplying by 1000. -#if QT_VERSION >= 0x050800 - logMessageQuery.bindValue(":time", msg.timestamp().toSecsSinceEpoch()); -#else - // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now. - // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch - logMessageQuery.bindValue(":time", - (qint64)(msg.timestamp().toMSecsSinceEpoch() / 1000)); -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds instead of + // seconds. This nets us more precision as well as simplifying 64-bit time. + logMessageQuery.bindValue(":time", msg.timestamp().toMSecsSinceEpoch()); logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt()); logMessageQuery.bindValue(":type", msg.type()); logMessageQuery.bindValue(":flags", (int)msg.flags()); @@ -1951,19 +1932,9 @@ QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId while (query.next()) { Message msg( - // Read timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need to store - // a fractional number to support fromMSecsSinceEpoch(), or an upgrade step would - // need to convert all past times to milliseconds, multiplying by 1000. -#if QT_VERSION >= 0x050800 - QDateTime::fromSecsSinceEpoch(query.value(1).toLongLong()), -#else - // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for - // now. - // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch - QDateTime::fromMSecsSinceEpoch((qint64)(query.value(1).toLongLong() * 1000)), -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds instead of + // seconds. This nets us more precision as well as simplifying 64-bit time. + QDateTime::fromMSecsSinceEpoch(query.value(1).toLongLong()), bufferInfo, (Message::Type)query.value(2).toInt(), query.value(8).toString(), @@ -2040,21 +2011,10 @@ QList SqliteStorage::requestMsgsFiltered(UserId user, BufferId bufferId while (query.next()) { Message msg( - // Read timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need - // to store a fractional number to support fromMSecsSinceEpoch(), or an - // upgrade step would need to convert all past times to milliseconds, - // multiplying by 1000. -#if QT_VERSION >= 0x050800 - QDateTime::fromSecsSinceEpoch(query.value(1).toLongLong()), -#else - // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to - // seconds for now. - // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch - QDateTime::fromMSecsSinceEpoch( - (qint64)(query.value(1).toLongLong() * 1000)), -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds + // instead of seconds. This nets us more precision as well as simplifying + // 64-bit time. + QDateTime::fromMSecsSinceEpoch(query.value(1).toLongLong()), bufferInfo, (Message::Type)query.value(2).toInt(), query.value(8).toString(), @@ -2112,19 +2072,9 @@ QList SqliteStorage::requestAllMsgs(UserId user, MsgId first, MsgId las while (query.next()) { Message msg( - // Read timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need to store - // a fractional number to support fromMSecsSinceEpoch(), or an upgrade step would - // need to convert all past times to milliseconds, multiplying by 1000. -#if QT_VERSION >= 0x050800 - QDateTime::fromSecsSinceEpoch(query.value(2).toLongLong()), -#else - // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for - // now. - // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch - QDateTime::fromMSecsSinceEpoch((qint64)(query.value(2).toLongLong() * 1000)), -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds instead of + // seconds. This nets us more precision as well as simplifying 64-bit time. + QDateTime::fromMSecsSinceEpoch(query.value(2).toLongLong()), bufferInfoHash[query.value(1).toInt()], (Message::Type)query.value(3).toInt(), query.value(9).toString(), @@ -2184,21 +2134,10 @@ QList SqliteStorage::requestAllMsgsFiltered(UserId user, MsgId first, M while (query.next()) { Message msg( - // Read timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need - // to store a fractional number to support fromMSecsSinceEpoch(), or an - // upgrade step would need to convert all past times to milliseconds, - // multiplying by 1000. -#if QT_VERSION >= 0x050800 - QDateTime::fromSecsSinceEpoch(query.value(2).toLongLong()), -#else - // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to - // seconds for now. - // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch - QDateTime::fromMSecsSinceEpoch( - (qint64)(query.value(2).toLongLong() * 1000)), -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds + // instead of seconds. This nets us more precision as well as simplifying + // 64-bit time. + QDateTime::fromMSecsSinceEpoch(query.value(2).toLongLong()), bufferInfoHash[query.value(1).toInt()], (Message::Type)query.value(3).toInt(), query.value(9).toString(), @@ -2239,25 +2178,6 @@ QMap SqliteStorage::getAllAuthUserNames() } -QString SqliteStorage::getAuthUserName(UserId user) { - QString authusername; - QSqlQuery query(logDb()); - query.prepare(queryString("select_authusername")); - query.bindValue(":userid", user.toInt()); - - lockForRead(); - safeExec(query); - watchQuery(query); - unlock(); - - if (query.first()) { - authusername = query.value(0).toString(); - } - - return authusername; -} - - QString SqliteStorage::backlogFile() { return Quassel::configDirPath() + "quassel-storage.sqlite"; @@ -2273,7 +2193,7 @@ bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount) switch (query.lastError().number()) { case 5: // SQLITE_BUSY 5 /* The database file is locked */ - [[clang::fallthrough]]; + // fallthrough case 6: // SQLITE_LOCKED 6 /* A table in the database is locked */ if (retryCount < _maxRetryCount) return safeExec(query, retryCount + 1); @@ -2519,20 +2439,9 @@ bool SqliteMigrationReader::readMo(BacklogMO &backlog) } backlog.messageid = value(0).toLongLong(); - // Read timestamp in seconds as 64-bit integer - // - // NOTE: This is a loss of precision. The database time column would need to store a - // fractional number to support fromMSecsSinceEpoch(), or an upgrade step would need to convert - // all past times to milliseconds, multiplying by 1000. -#if QT_VERSION >= 0x050800 - backlog.time = QDateTime::fromSecsSinceEpoch(value(1).toLongLong()).toUTC(); -#else - // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for - // now. - // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch - backlog.time = QDateTime::fromMSecsSinceEpoch((qint64)(value(1).toLongLong() * 1000) - ).toUTC(); -#endif + // As of SQLite schema version 31, timestamps are stored in milliseconds instead of + // seconds. This nets us more precision as well as simplifying 64-bit time. + backlog.time = QDateTime::fromMSecsSinceEpoch(value(1).toLongLong()).toUTC(); backlog.bufferid = value(2).toInt(); backlog.type = value(3).toInt(); backlog.flags = value(4).toInt();