/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-07 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "abstractsqlstorage.h"
+#include "logger.h"
+
+#include <QMutexLocker>
#include <QSqlError>
#include <QSqlQuery>
AbstractSqlStorage::AbstractSqlStorage(QObject *parent)
: Storage(parent),
- _schemaVersion(0)
+ _schemaVersion(0),
+ _nextConnectionId(0)
{
}
AbstractSqlStorage::~AbstractSqlStorage() {
- {
- QSqlDatabase db = QSqlDatabase::database("quassel_connection");
- db.commit();
- db.close();
+ // disconnect the connections, so their deletion is no longer interessting for us
+ QHash<QThread *, Connection *>::iterator conIter;
+ for(conIter = _connectionPool.begin(); conIter != _connectionPool.end(); conIter++) {
+ disconnect(conIter.value(), 0, this, 0);
}
- QSqlDatabase::removeDatabase("quassel_connection");
}
QSqlDatabase AbstractSqlStorage::logDb() {
- QSqlDatabase db = QSqlDatabase::database("quassel_connection");
- if(db.isValid() && db.isOpen())
- return db;
-
- if(!openDb()) {
- qWarning() << "Unable to Open Database" << engineName();
- qWarning() << " -" << db.lastError().text();
- }
+ if(!_connectionPool.contains(QThread::currentThread()))
+ addConnectionToPool();
- return QSqlDatabase::database("quassel_connection");
+ return QSqlDatabase::database(_connectionPool[QThread::currentThread()]->name());
}
-bool AbstractSqlStorage::openDb() {
- QSqlDatabase db = QSqlDatabase::database("quassel_connection");
- if(db.isValid() && !db.isOpen())
- return db.open();
+void AbstractSqlStorage::addConnectionToPool() {
+ QMutexLocker locker(&_connectionPoolMutex);
+ // we have to recheck if the connection pool already contains a connection for
+ // this thread. Since now (after the lock) we can only tell for sure
+ if(_connectionPool.contains(QThread::currentThread()))
+ return;
+
+ QThread *currentThread = QThread::currentThread();
+
+ int connectionId = _nextConnectionId++;
- db = QSqlDatabase::addDatabase(driverName(), "quassel_connection");
+ Connection *connection = new Connection(QLatin1String(QString("quassel_connection_%1").arg(connectionId).toLatin1()));
+ connection->moveToThread(currentThread);
+ connect(this, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
+ connect(currentThread, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
+ connect(connection, SIGNAL(destroyed()), this, SLOT(connectionDestroyed()));
+ _connectionPool[currentThread] = connection;
+
+ QSqlDatabase db = QSqlDatabase::addDatabase(driverName(), connection->name());
db.setDatabaseName(databaseName());
if(!hostName().isEmpty())
db.setPassword(password());
}
- return db.open();
+ if(!db.open()) {
+ qWarning() << "Unable to open database" << displayName() << "for thread" << QThread::currentThread();
+ qWarning() << "-" << db.lastError().text();
+ }
}
-bool AbstractSqlStorage::init(const QVariantMap &settings) {
+Storage::State AbstractSqlStorage::init(const QVariantMap &settings) {
Q_UNUSED(settings)
+
QSqlDatabase db = logDb();
if(!db.isValid() || !db.isOpen())
- return false;
+ return NotAvailable;
if(installedSchemaVersion() == -1) {
- qDebug() << "Storage Schema is missing!";
- return false;
+ qCritical() << "Storage Schema is missing!";
+ return NeedsSetup;
}
if(installedSchemaVersion() > schemaVersion()) {
- qWarning() << "Installed Schema is newer then any known Version.";
- return false;
+ qCritical() << "Installed Schema is newer then any known Version.";
+ return NotAvailable;
}
-
+
if(installedSchemaVersion() < schemaVersion()) {
- qWarning() << "Installed Schema is not up to date. Upgrading...";
- if(!upgradeDb())
- return false;
+ qWarning() << qPrintable(tr("Installed Schema (version %1) is not up to date. Upgrading to version %2...").arg(installedSchemaVersion()).arg(schemaVersion()));
+ if(!upgradeDb()) {
+ qWarning() << qPrintable(tr("Upgrade failed..."));
+ return NotAvailable;
+ }
}
-
- qDebug() << "Storage Backend is ready. Quassel Schema Version:" << installedSchemaVersion();
- return true;
+
+ quInfo() << "Storage Backend is ready. Quassel Schema Version:" << installedSchemaVersion();
+ return IsReady;
}
QString AbstractSqlStorage::queryString(const QString &queryName, int version) {
if(version == 0)
version = schemaVersion();
-
- QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(engineName()).arg(version).arg(queryName));
+
+ QFileInfo queryInfo(QString(":/SQL/%1/%2/%3.sql").arg(displayName()).arg(version).arg(queryName));
if(!queryInfo.exists() || !queryInfo.isFile() || !queryInfo.isReadable()) {
- qWarning() << "Unable to read SQL-Query" << queryName << "for Engine" << engineName();
+ qCritical() << "Unable to read SQL-Query" << queryName << "for engine" << displayName();
return QString();
}
return QString();
QString query = QTextStream(&queryFile).readAll();
queryFile.close();
-
- return query.trimmed();
-}
-QString AbstractSqlStorage::queryString(const QString &queryName) {
- return queryString(queryName, 0);
-}
-
-QSqlQuery *AbstractSqlStorage::cachedQuery(const QString &queryName, int version) {
- QPair<QString, int> queryId = qMakePair(queryName, version);
- if(!_queryCache.contains(queryId)) {
- QSqlQuery *query = new QSqlQuery(logDb());
- query->prepare(queryString(queryName, version));
- _queryCache[queryId] = query;
- }
-
- return _queryCache[queryId];
-}
-
-QSqlQuery *AbstractSqlStorage::cachedQuery(const QString &queryName) {
- return cachedQuery(queryName, 0);
+ return query.trimmed();
}
QStringList AbstractSqlStorage::setupQueries() {
QStringList queries;
- QDir dir = QDir(QString(":/SQL/%1/%2/").arg(engineName()).arg(schemaVersion()));
+ QDir dir = QDir(QString(":/SQL/%1/%2/").arg(displayName()).arg(schemaVersion()));
foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "setup*", QDir::NoFilter, QDir::Name)) {
queries << queryString(fileInfo.baseName());
}
Q_UNUSED(settings)
QSqlDatabase db = logDb();
if(!db.isOpen()) {
- qWarning() << "Unable to setup Logging Backend!";
+ qCritical() << "Unable to setup Logging Backend!";
return false;
}
foreach(QString queryString, setupQueries()) {
QSqlQuery query = db.exec(queryString);
- if(!watchQuery(&query)) {
- qWarning() << "Unable to setup Logging Backend!";
+ if(!watchQuery(query)) {
+ qCritical() << "Unable to setup Logging Backend!";
return false;
}
}
- return true;
+ return setupSchemaVersion(schemaVersion());
}
QStringList AbstractSqlStorage::upgradeQueries(int version) {
QStringList queries;
- QDir dir = QDir(QString(":/SQL/%1/%2/").arg(engineName()).arg(version));
+ QDir dir = QDir(QString(":/SQL/%1/%2/").arg(displayName()).arg(version));
foreach(QFileInfo fileInfo, dir.entryInfoList(QStringList() << "upgrade*", QDir::NoFilter, QDir::Name)) {
- qDebug() << queryString(fileInfo.baseName());
- queries << queryString(fileInfo.baseName());
+ queries << queryString(fileInfo.baseName(), version);
}
return queries;
}
for(int ver = installedSchemaVersion() + 1; ver <= schemaVersion(); ver++) {
foreach(QString queryString, upgradeQueries(ver)) {
QSqlQuery query = db.exec(queryString);
- if(!watchQuery(&query)) {
- qWarning() << "Unable to upgrade Logging Backend!";
+ if(!watchQuery(query)) {
+ qCritical() << "Unable to upgrade Logging Backend!";
return false;
}
}
}
- return true;
+ return updateSchemaVersion(schemaVersion());
}
int version;
bool ok;
- QDir dir = QDir(":/SQL/" + engineName());
+ QDir dir = QDir(":/SQL/" + displayName());
foreach(QFileInfo fileInfo, dir.entryInfoList()) {
if(!fileInfo.isDir())
continue;
return _schemaVersion;
}
-bool AbstractSqlStorage::watchQuery(QSqlQuery *query) {
- if(query->lastError().isValid()) {
- qWarning() << "unhandled Error in QSqlQuery!";
- qWarning() << " last Query:" << query->lastQuery();
- qWarning() << " executed Query:" << query->executedQuery();
- qWarning() << " bound Values:" << query->boundValues();
- qWarning() << " Error Number:" << query->lastError().number();
- qWarning() << " Error Message:" << query->lastError().text();
- qWarning() << " Driver Message:" << query->lastError().driverText();
- qWarning() << " DB Message:" << query->lastError().databaseText();
-
+bool AbstractSqlStorage::watchQuery(QSqlQuery &query) {
+ if(query.lastError().isValid()) {
+ qCritical() << "unhandled Error in QSqlQuery!";
+ qCritical() << " last Query:\n" << query.lastQuery();
+ qCritical() << " executed Query:\n" << query.executedQuery();
+ qCritical() << " bound Values:";
+ QList<QVariant> list = query.boundValues().values();
+ for (int i = 0; i < list.size(); ++i)
+ qCritical() << i << ": " << list.at(i).toString().toAscii().data();
+ qCritical() << " Error Number:" << query.lastError().number();
+ qCritical() << " Error Message:" << query.lastError().text();
+ qCritical() << " Driver Message:" << query.lastError().driverText();
+ qCritical() << " DB Message:" << query.lastError().databaseText();
+
return false;
}
return true;
}
+
+void AbstractSqlStorage::connectionDestroyed() {
+ QMutexLocker locker(&_connectionPoolMutex);
+ _connectionPool.remove(sender()->thread());
+}
+
+// ========================================
+// AbstractSqlStorage::Connection
+// ========================================
+AbstractSqlStorage::Connection::Connection(const QString &name, QObject *parent)
+ : QObject(parent),
+ _name(name.toLatin1())
+{
+}
+
+AbstractSqlStorage::Connection::~Connection() {
+ {
+ QSqlDatabase db = QSqlDatabase::database(name(), false);
+ if(db.isOpen()) {
+ db.commit();
+ db.close();
+ }
+ }
+ QSqlDatabase::removeDatabase(name());
+}
projects / quassel.git / blobdiff