From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 1 Apr 2008 17:16:54 +0000 (+0000)
Subject: Made the core connects faster
X-Git-Tag: 0.2.0-alpha5~35
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=9204e98848ab202c0117aa1428fa0ea10b4dcd75

Made the core connects faster
---

diff --git a/src/core/SQL/SQLite/10/select_buffers.sql b/src/core/SQL/SQLite/10/select_buffers.sql
index 41fce3b1..2bea9c8c 100644
--- a/src/core/SQL/SQLite/10/select_buffers.sql
+++ b/src/core/SQL/SQLite/10/select_buffers.sql
@@ -1,5 +1,4 @@
 SELECT DISTINCT buffer.bufferid, network.networkid, buffertype, groupid, buffername
 FROM buffer
 JOIN network ON buffer.networkid = network.networkid
-JOIN backlog ON buffer.bufferid = backlog.bufferid
-WHERE buffer.userid = :userid AND time >= :time
+WHERE buffer.userid = :userid
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 21e7c16f..dad499a7 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -292,9 +292,9 @@ QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, in
   return instance()->storage->requestMsgRange(user, buffer, first, last);
 }
 
-QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
+QList<BufferInfo> Core::requestBuffers(UserId user) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->requestBuffers(user, since);
+  return instance()->storage->requestBuffers(user);
 }
 
 bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
diff --git a/src/core/core.h b/src/core/core.h
index f32502e7..5a125a4f 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -207,17 +207,14 @@ class Core : public QObject {
      */
     static QList<Message> requestMsgRange(UserId user, BufferId buffer, int first, int last);
 
-    //! Request a list of all buffers known to a user since a certain point in time.
+    //! Request a list of all buffers known to a user.
     /** This method is used to get a list of all buffers we have stored a backlog from.
-     *  Optionally, a QDateTime can be given, so that only buffers are listed that were active
-     *  since that point in time.
      *  \note This method is threadsafe.
      *
      *  \param user  The user whose buffers we request
-     *  \param since If this is defined, older buffers will be ignored
      *  \return A list of the BufferInfos for all buffers as requested
      */
-    static QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
+    static QList<BufferInfo> requestBuffers(UserId user);
 
     //! Remove permanently a buffer and it's content from the storage backend
     /** This call cannot be reverted!
diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 2121f79f..b1d3d268 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -479,16 +479,11 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const BufferId &bufferId) {
   return bufferInfo;
 }
 
-QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
-  uint time = 0;
-  if(since.isValid())
-    time = since.toTime_t();
-  
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user) {
   QList<BufferInfo> bufferlist;
   QSqlQuery query(logDb());
   query.prepare(queryString("select_buffers"));
   query.bindValue(":userid", user.toInt());
-  query.bindValue(":time", time);
   
   query.exec();
   watchQuery(&query);
diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 1242315f..66d205f5 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -67,7 +67,7 @@ public slots:
   /* Buffer handling */
   virtual BufferInfo getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "");
   virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId);
-  virtual QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
+  virtual QList<BufferInfo> requestBuffers(UserId user);
   virtual bool removeBuffer(const UserId &user, const BufferId &bufferId);
   virtual BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName);
   virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
diff --git a/src/core/storage.h b/src/core/storage.h
index 6786359c..1ce0079b 100644
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -212,15 +212,12 @@ class Storage : public QObject {
      */
     virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId) = 0;
 
-    //! Request a list of all buffers known to a user since a certain point in time.
+    //! Request a list of all buffers known to a user.
     /** This method is used to get a list of all buffers we have stored a backlog from.
-     *  Optionally, a QDateTime can be given, so that only buffers are listed that where active
-     *  since that point in time.
      *  \param user  The user whose buffers we request
-     *  \param since If this is defined, older buffers will be ignored
      *  \return A list of the BufferInfos for all buffers as requested
      */
-    virtual QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime()) = 0;
+    virtual QList<BufferInfo> requestBuffers(UserId user) = 0;
 
     //! Remove permanently a buffer and it's content from the storage backend
     /** This call cannot be reverted!
diff --git a/version.inc b/version.inc
index 21224fd2..780883fd 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-alpha5-pre";
   quasselDate = "2008-04-01";
-  quasselBuild = 680;
+  quasselBuild = 682;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 642;