From: Alex Ingram <reimu@reimuhakurei.net>
Date: Fri, 3 Mar 2017 16:34:23 +0000 (-0600)
Subject: Improve PostgreSQL performance for unread message fetch method, too.
X-Git-Tag: travis-deploy-test~335^2~2
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=df3e1433ea4850e57cade871ced1b0eab4fd785a

Improve PostgreSQL performance for unread message fetch method, too.
---

diff --git a/src/core/SQL/PostgreSQL/20/select_messages.sql b/src/core/SQL/PostgreSQL/20/select_messages.sql
index 5bf6a249..50be2e31 100644
--- a/src/core/SQL/PostgreSQL/20/select_messages.sql
+++ b/src/core/SQL/PostgreSQL/20/select_messages.sql
@@ -2,6 +2,6 @@ SELECT messageid, time,  type, flags, sender, message
 FROM backlog
 JOIN sender ON backlog.senderid = sender.senderid
 WHERE bufferid = $1
-AND messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1)
+AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1)
 ORDER BY messageid DESC
 LIMIT $2
diff --git a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
index 393d3cfa..d5c01dcd 100644
--- a/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
+++ b/src/core/SQL/PostgreSQL/20/select_messagesNewerThan.sql
@@ -1,6 +1,8 @@
 SELECT messageid, time,  type, flags, sender, message
 FROM backlog
 LEFT JOIN sender ON backlog.senderid = sender.senderid
-WHERE backlog.messageid >= $1 AND bufferid = $2
+WHERE backlog.messageid >= $1
+AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = $1)
+AND bufferid = $2
 ORDER BY messageid DESC
 LIMIT $3
\ No newline at end of file