FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Transactions in SQLite are now IMMEDIATE.

Browse Source
This commit is contained in:
Martin Rotter 2017-01-05 07:36:13 +01:00
parent dc6b5b63c6
commit 79c4e5772d
5 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/text/CHANGELOG
View File

@ -4,6 +4,7 @@
Added:
▪ MySQL database backend now requires at least version 5.5, DB encoding is now changed to utf8mb4 character set. (bug #74)
▪ Height if message attachment image is now configurable, defaults to 36. (issue #69)
▪ All textual contents of all messages are now locally saved in explicit UTF-8 encoding. This is partially because of MySQL backend. We need to keep encoding of data sent to DB and encoding of DB itself in parity.
Changed:
▪ TT-RSS plugin now does NOT require service URL to be entered with "/api/" suffix. In other words, do not use that suffix now, RSS Guard will add it silently when it needs to.

9
src/miscellaneous/databasefactory.cpp
View File

@ -521,6 +521,15 @@ void DatabaseFactory::removeConnection(const QString &connection_name) {
QSqlDatabase::removeDatabase(connection_name);
}
QString DatabaseFactory::obtainBeginTransactionSql() const {
if (m_activeDatabaseDriver == DatabaseFactory::SQLITE || m_activeDatabaseDriver == DatabaseFactory::SQLITE_MEMORY) {
return QSL("BEGIN IMMEDIATE TRANSACTION;");
}
else {
return QSL("START TRANSACTION;");
}
}
void DatabaseFactory::sqliteSaveMemoryDatabase() {
qDebug("Saving in-memory working database back to persistent file-based storage.");

2
src/miscellaneous/databasefactory.h
View File

@ -78,6 +78,8 @@ class DatabaseFactory : public QObject {
// Removes connection.
void removeConnection(const QString &connection_name = QString());
QString obtainBeginTransactionSql() const;
// Performs any needed database-related operation to be done
// to gracefully exit the application.
void saveDatabase();

33
src/miscellaneous/databasequeries.cpp
View File

@ -459,6 +459,7 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
QSqlQuery query_select_with_id(db);
QSqlQuery query_update(db);
QSqlQuery query_insert(db);
QSqlQuery query_begin_transaction(db);
// Here we have query which will check for existence of the "same" message in given feed.
// The two message are the "same" if:
@ -487,9 +488,8 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
"SET title = :title, is_read = :is_read, is_important = :is_important, url = :url, author = :author, date_created = :date_created, contents = :contents, enclosures = :enclosures "
"WHERE id = :id;");
if (!db.transaction()) {
db.rollback();
qDebug("Transaction start for message downloader failed: '%s'.", qPrintable(db.lastError().text()));
if (!query_begin_transaction.exec(qApp->database()->obtainBeginTransactionSql())) {
qCritical("Transaction start for message downloader failed: '%s'.", qPrintable(query_begin_transaction.lastError().text()));
return updated_messages;
}
@ -530,7 +530,7 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
is_important_existing_message = query_select_with_url.value(3).toBool();
}
else if (query_select_with_url.lastError().isValid()) {
qDebug("Failed to check for existing message in DB via URL: '%s'.", qPrintable(query_select_with_url.lastError().text()));
qWarning("Failed to check for existing message in DB via URL: '%s'.", qPrintable(query_select_with_url.lastError().text()));
}
query_select_with_url.finish();
@ -564,13 +564,13 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
if (/* 1 */ (!message.m_customId.isEmpty() && (message.m_created.toMSecsSinceEpoch() != date_existing_message || message.m_isRead != is_read_existing_message || message.m_isImportant != is_important_existing_message)) ||
/* 2 */ (message.m_createdFromFeed && message.m_created.toMSecsSinceEpoch() != date_existing_message)) {
// Message exists, it is changed, update it.
query_update.bindValue(QSL(":title"), message.m_title.toUtf8());
query_update.bindValue(QSL(":title"), message.m_title);
query_update.bindValue(QSL(":is_read"), (int) message.m_isRead);
query_update.bindValue(QSL(":is_important"), (int) message.m_isImportant);
query_update.bindValue(QSL(":url"), message.m_url);
query_update.bindValue(QSL(":author"), message.m_author.toUtf8());
query_update.bindValue(QSL(":author"), message.m_author);
query_update.bindValue(QSL(":date_created"), message.m_created.toMSecsSinceEpoch());
query_update.bindValue(QSL(":contents"), message.m_contents.toUtf8());
query_update.bindValue(QSL(":contents"), message.m_contents);
query_update.bindValue(QSL(":enclosures"), Enclosures::encodeEnclosuresToString(message.m_enclosures));
query_update.bindValue(QSL(":id"), id_existing_message);
@ -580,7 +580,7 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
updated_messages++;
}
else if (query_update.lastError().isValid()) {
qDebug("Failed to update message in DB: '%s'.", qPrintable(query_update.lastError().text()));
qWarning("Failed to update message in DB: '%s'.", qPrintable(query_update.lastError().text()));
}
query_update.finish();
@ -590,13 +590,13 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
else {
// Message with this URL is not fetched in this feed yet.
query_insert.bindValue(QSL(":feed"), feed_custom_id);
query_insert.bindValue(QSL(":title"), message.m_title.toUtf8());
query_insert.bindValue(QSL(":title"), message.m_title);
query_insert.bindValue(QSL(":is_read"), (int) message.m_isRead);
query_insert.bindValue(QSL(":is_important"), (int) message.m_isImportant);
query_insert.bindValue(QSL(":url"), message.m_url);
query_insert.bindValue(QSL(":author"), message.m_author.toUtf8());
query_insert.bindValue(QSL(":author"), message.m_author);
query_insert.bindValue(QSL(":date_created"), message.m_created.toMSecsSinceEpoch());
query_insert.bindValue(QSL(":contents"), message.m_contents.toUtf8());
query_insert.bindValue(QSL(":contents"), message.m_contents);
query_insert.bindValue(QSL(":enclosures"), Enclosures::encodeEnclosuresToString(message.m_enclosures));
query_insert.bindValue(QSL(":custom_id"), message.m_customId);
query_insert.bindValue(QSL(":custom_hash"), message.m_customHash);
@ -607,9 +607,9 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
qDebug("Added new message '%s' to DB.", qPrintable(message.m_title));
}
else if (query_insert.lastError().isValid()) {
qDebug("Failed to insert message to DB: '%s' - message title is '%s'.",
qPrintable(query_insert.lastError().text()),
qPrintable(message.m_title));
qWarning("Failed to insert message to DB: '%s' - message title is '%s'.",
qPrintable(query_insert.lastError().text()),
qPrintable(message.m_title));
}
query_insert.finish();
@ -625,8 +625,8 @@ int DatabaseQueries::updateMessages(QSqlDatabase db,
}
if (!db.commit()) {
qCritical("Transaction commit for message downloader failed: '%s'.", qPrintable(db.lastError().text()));
db.rollback();
qDebug("Transaction commit for message downloader failed: '%s'.", qPrintable(db.lastError().text()));
if (ok != nullptr) {
*ok = false;
@ -647,8 +647,7 @@ bool DatabaseQueries::purgeMessagesFromBin(QSqlDatabase db, bool clear_only_read
q.setForwardOnly(true);
if (clear_only_read) {
q.prepare("UPDATE Messages SET is_pdeleted = 1 "
"WHERE is_read = 1 AND is_deleted = 1 AND account_id = :account_id;");
q.prepare(QSL("UPDATE Messages SET is_pdeleted = 1 WHERE is_read = 1 AND is_deleted = 1 AND account_id = :account_id;"));
}
else {
q.prepare(QSL("UPDATE Messages SET is_pdeleted = 1 WHERE is_deleted = 1 AND account_id = :account_id;"));

12
src/services/abstract/feed.cpp
View File

@ -148,6 +148,18 @@ void Feed::run() {
bool error_during_obtaining;
QList<Message> msgs = obtainNewMessages(&error_during_obtaining);
qDebug().nospace() << "Downloaded " << msgs.size() << " messages for feed "
<< customId() << " in thread: \'"
<< QThread::currentThreadId() << "\'.";
// Now, do some general operations on messages (tweak encoding etc.).
for (int i = 0; i < msgs.size(); i++) {
msgs[i].m_contents = msgs[i].m_contents.toUtf8();
msgs[i].m_author = msgs[i].m_author.toUtf8();
msgs[i].m_title = msgs[i].m_title.toUtf8();
}
emit messagesObtained(msgs, error_during_obtaining);
}