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

More work on in-memory database.

Browse Source
This commit is contained in:
Martin Rotter 2014-01-12 14:13:00 +01:00
parent 8cffae07de
commit a9391c1ce4
7 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/misc/db_init_memory.sql
View File

@ -5,8 +5,6 @@ CREATE TABLE IF NOT EXISTS Information (
value TEXT NOT NULL
);
-- !
INSERT INTO Information VALUES ('schema_version', '0.0.1');
-- !
DROP TABLE IF EXISTS Categories;
-- !
CREATE TABLE IF NOT EXISTS Categories (

58
src/core/databasefactory.cpp
View File

@ -13,7 +13,10 @@
QPointer<DatabaseFactory> DatabaseFactory::s_instance;
DatabaseFactory::DatabaseFactory(QObject *parent)
: QObject(parent), m_fileBasedinitialized(false), m_inMemoryInitialized(false) {
: QObject(parent),
m_fileBasedinitialized(false),
m_inMemoryInitialized(false) {
setObjectName("DatabaseFactory");
assemblyDatabaseFilePath();
}
@ -48,7 +51,7 @@ QSqlDatabase DatabaseFactory::initializeInMemory() {
database.setDatabaseName(":memory:");
if (!database.open()) {
qFatal("Database was NOT opened. Delivered error message: '%s'",
qFatal("In-memory database was NOT opened. Delivered error message: '%s'",
qPrintable(database.lastError().text()));
}
else {
@ -67,13 +70,13 @@ QSqlDatabase DatabaseFactory::initializeInMemory() {
query_db.exec("SELECT value FROM Information WHERE key = 'schema_version'");
if (query_db.lastError().isValid()) {
qWarning("Error occurred. Database is not initialized. Initializing now.");
qWarning("Error occurred. In-memory database is not initialized. Initializing now.");
QFile file_init(APP_MISC_PATH + QDir::separator() + APP_DB_INIT_MEMORY);
if (!file_init.open(QIODevice::ReadOnly | QIODevice::Text)) {
// Database initialization file not opened. HUGE problem.
qFatal("Database initialization file '%s' from directory '%s' was not found. Database is uninitialized.",
qFatal("In-memory database initialization file '%s' from directory '%s' was not found. In-memory database is uninitialized.",
APP_DB_INIT_FILE,
qPrintable(APP_MISC_PATH));
}
@ -86,40 +89,40 @@ QSqlDatabase DatabaseFactory::initializeInMemory() {
query_db.exec(statement);
if (query_db.lastError().isValid()) {
qFatal("Database initialization failed. Initialization script '%s' is not correct.",
qFatal("In-memory database initialization failed. Initialization script '%s' is not correct.",
APP_DB_INIT_FILE);
}
}
database.commit();
qDebug("Database backend should be ready now.");
qDebug("In-memory database backend should be ready now.");
}
else {
query_db.next();
qDebug("In-memory database connection seems to be established.");
qDebug("Database has version '%s'.", qPrintable(query_db.value(0).toString()));
qDebug("In-memory database has version '%s'.", qPrintable(query_db.value(0).toString()));
}
// Loading messages from file-based database.
QSqlDatabase file_database = connection("fdb", false);
QSqlQuery copy_msgs(database);
QSqlDatabase file_database = connection(objectName(), false);
QSqlQuery copy_contents(database);
// Attach database.
copy_msgs.exec(QString("ATTACH DATABASE '%1' AS 'storage';").arg(file_database.databaseName()));
copy_contents.exec(QString("ATTACH DATABASE '%1' AS 'storage';").arg(file_database.databaseName()));
// Copy all stuff.
QStringList tables; tables << "Categories" << "Feeds" << "FeedsData" <<
QStringList tables; tables << "Information" << "Categories" <<
"Feeds" << "FeedsData" <<
"Messages";
foreach (const QString &table, tables) {
copy_msgs.exec(QString("INSERT INTO main.%1 SELECT * FROM storage.%1;").arg(table));
copy_contents.exec(QString("INSERT INTO main.%1 SELECT * FROM storage.%1;").arg(table));
}
// Detach database and finish.
copy_msgs.exec("DETACH 'storage'");
copy_msgs.finish();
copy_contents.exec("DETACH 'storage'");
copy_contents.finish();
// DB is attached.
@ -145,8 +148,7 @@ QString DatabaseFactory::getDatabasePath() {
// a pri vypinani se zase :memory: presype do
// souborove databaze
QSqlDatabase DatabaseFactory::initializeFileBased(const QString &connection_name,
bool in_memory) {
QSqlDatabase DatabaseFactory::initializeFileBased(const QString &connection_name) {
// Prepare file paths.
QDir db_path(getDatabasePath());
QFile db_file(db_path.absoluteFilePath(APP_DB_FILE));
@ -170,7 +172,7 @@ QSqlDatabase DatabaseFactory::initializeFileBased(const QString &connection_name
database.setDatabaseName(db_file.fileName());
if (!database.open()) {
qFatal("Database was NOT opened. Delivered error message: '%s'",
qFatal("File-based database was NOT opened. Delivered error message: '%s'",
qPrintable(database.lastError().text()));
}
else {
@ -190,13 +192,13 @@ QSqlDatabase DatabaseFactory::initializeFileBased(const QString &connection_name
query_db.exec("SELECT value FROM Information WHERE key = 'schema_version'");
if (query_db.lastError().isValid()) {
qWarning("Error occurred. Database is not initialized. Initializing now.");
qWarning("Error occurred. File-based database is not initialized. Initializing now.");
QFile file_init(APP_MISC_PATH + QDir::separator() + APP_DB_INIT_FILE);
if (!file_init.open(QIODevice::ReadOnly | QIODevice::Text)) {
// Database initialization file not opened. HUGE problem.
qFatal("Database initialization file '%s' from directory '%s' was not found. Database is uninitialized.",
qFatal("Database initialization file '%s' from directory '%s' was not found. File-based database is uninitialized.",
APP_DB_INIT_FILE,
qPrintable(APP_MISC_PATH));
}
@ -209,21 +211,21 @@ QSqlDatabase DatabaseFactory::initializeFileBased(const QString &connection_name
query_db.exec(statement);
if (query_db.lastError().isValid()) {
qFatal("Database initialization failed. Initialization script '%s' is not correct.",
qFatal("File-based database initialization failed. Initialization script '%s' is not correct.",
APP_DB_INIT_FILE);
}
}
database.commit();
qDebug("Database backend should be ready now.");
qDebug("File-based database backend should be ready now.");
}
else {
query_db.next();
qDebug("Database connection '%s' to file '%s' seems to be established.",
qDebug("File-based database connection '%s' to file '%s' seems to be established.",
qPrintable(connection_name),
qPrintable(QDir::toNativeSeparators(database.databaseName())));
qDebug("Database has version '%s'.", qPrintable(query_db.value(0).toString()));
qDebug("File-based database has version '%s'.", qPrintable(query_db.value(0).toString()));
}
query_db.finish();
@ -262,7 +264,7 @@ QSqlDatabase DatabaseFactory::connection(const QString &connection_name,
if (!m_fileBasedinitialized) {
// File-based database is not yet initialised.
return initializeFileBased(connection_name, in_memory);
return initializeFileBased(connection_name);
}
else {
QSqlDatabase database;
@ -286,11 +288,11 @@ QSqlDatabase DatabaseFactory::connection(const QString &connection_name,
}
if (!database.isOpen() && !database.open()) {
qFatal("Database was NOT opened. Delivered error message: '%s'.",
qFatal("File-based database was NOT opened. Delivered error message: '%s'.",
qPrintable(database.lastError().text()));
}
else {
qDebug("Database connection '%s' to file '%s' seems to be established.",
qDebug("File-based database connection '%s' to file '%s' seems to be established.",
qPrintable(connection_name),
qPrintable(QDir::toNativeSeparators(database.databaseName())));
}
@ -306,7 +308,7 @@ void DatabaseFactory::removeConnection(const QString &connection_name) {
void DatabaseFactory::saveMemoryDatabase() {
QSqlDatabase database = connection();
QSqlDatabase file_database = connection("fdb", false);
QSqlDatabase file_database = connection(objectName(), false);
QSqlQuery copy_msgs(database);

4
src/core/databasefactory.h
View File

@ -16,6 +16,8 @@ class DatabaseFactory : public QObject {
// Returns absolute file path to database file.
QString getDatabasePath();
// If in-memory is true, then :memory: database is returned
// In-memory database is DEFAULT database.
// NOTE: This always returns OPENED database.
QSqlDatabase connection(const QString &connection_name = QString(),
bool in_memory = true);
@ -40,7 +42,7 @@ class DatabaseFactory : public QObject {
// Creates new connection, initializes database and
// returns opened connection.
QSqlDatabase initializeInMemory();
QSqlDatabase initializeFileBased(const QString &connection_name, bool in_memory);
QSqlDatabase initializeFileBased(const QString &connection_name);
// Path to database file.
QString m_databasePath;

11
src/core/feedsmodel.cpp
View File

@ -36,9 +36,6 @@ FeedsModel::~FeedsModel() {
// Delete all model items.
delete m_rootItem;
// Remove connection.
DatabaseFactory::instance()->removeConnection(objectName());
}
QVariant FeedsModel::data(const QModelIndex &index, int role) const {
@ -192,7 +189,7 @@ bool FeedsModel::removeItems(const QModelIndexList &indexes) {
QList<Message> FeedsModel::messagesForFeeds(const QList<FeedsModelFeed*> &feeds) {
QList<Message> messages;
QSqlDatabase database = DatabaseFactory::instance()->connection(objectName());
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlQuery query_read_msg(database);
query_read_msg.setForwardOnly(true);
query_read_msg.prepare("SELECT title, url, author, date_created, contents "
@ -334,7 +331,7 @@ void FeedsModel::loadFromDatabase() {
qDeleteAll(m_rootItem->childItems());
m_rootItem->clearChilds();
QSqlDatabase database = DatabaseFactory::instance()->connection(objectName());
QSqlDatabase database = DatabaseFactory::instance()->connection();
CategoryAssignment categories;
FeedAssignment feeds;
@ -447,7 +444,7 @@ QList<FeedsModelFeed*> FeedsModel::feedsForIndexes(const QModelIndexList &indexe
bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
int read) {
QSqlDatabase db_handle = DatabaseFactory::instance()->connection(objectName());
QSqlDatabase db_handle = DatabaseFactory::instance()->connection();
if (!db_handle.transaction()) {
qWarning("Starting transaction for feeds read change.");
@ -483,7 +480,7 @@ bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
bool FeedsModel::markFeedsDeleted(const QList<FeedsModelFeed *> &feeds,
int deleted) {
QSqlDatabase db_handle = DatabaseFactory::instance()->connection(objectName());
QSqlDatabase db_handle = DatabaseFactory::instance()->connection();
if (!db_handle.transaction()) {
qWarning("Starting transaction for feeds clearing.");

2
src/core/feedsmodelfeed.cpp
View File

@ -58,7 +58,7 @@ QString FeedsModelFeed::typeToString(FeedsModelFeed::Type type) {
}
void FeedsModelFeed::updateCounts(bool including_total_count) {
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelFeed");
QSqlDatabase database = DatabaseFactory::instance()->connection();
QSqlQuery query_all(database);
query_all.setForwardOnly(true);

2
src/core/feedsmodelstandardfeed.cpp
View File

@ -189,7 +189,7 @@ void FeedsModelStandardFeed::update() {
void FeedsModelStandardFeed::updateMessages(const QList<Message> &messages) {
int feed_id = id(), message_id;
qint64 message_creation_date;
QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardFeed");
QSqlDatabase database = DatabaseFactory::instance()->connection();
// Prepare queries.
QSqlQuery query_select(database);

2
src/core/messagesmodel.cpp
View File

@ -13,7 +13,7 @@
MessagesModel::MessagesModel(QObject *parent)
: QSqlTableModel(parent,
DatabaseFactory::instance()->connection("MessagesModel")) {
DatabaseFactory::instance()->connection()) {
setObjectName("MessagesModel");
setupFonts();