Skip to content
Snippets Groups Projects
Commit e2bcf509 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Treat messages created in the future as created now

parent ee9f1363
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ class Backend { ...@@ -33,7 +33,7 @@ class Backend {
GROUP BY backlog.bufferid, GROUP BY backlog.bufferid,
buffer.buffername, buffer.buffername,
network.networkname network.networkname
ORDER BY MIN((1 + log(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME)))) * (1 - ts_rank(tsv, query, 32)) * (1 + ln(backlog.type))) ASC; ORDER BY MIN((1 + log(MAX(1, EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME))))) * (1 - ts_rank(tsv, query, 32)) * (1 + ln(backlog.type))) ASC;
"); ");
$this->storedFindInBufferMultiple = $db->prepare(" $this->storedFindInBufferMultiple = $db->prepare("
SELECT tmp.bufferid, SELECT tmp.bufferid,
...@@ -50,7 +50,7 @@ class Backend { ...@@ -50,7 +50,7 @@ class Backend {
backlog.message, backlog.message,
query, query,
rank() OVER(PARTITION BY backlog.bufferid rank() OVER(PARTITION BY backlog.bufferid
ORDER BY (1 + log(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME)))) * (1 - ts_rank(tsv, query, 32)) * (1 + ln(backlog.type)) ASC ORDER BY (1 + log(MAX(1, EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME))))) * (1 - ts_rank(tsv, query, 32)) * (1 + ln(backlog.type)) ASC
) AS rank ) AS rank
FROM backlog FROM backlog
JOIN buffer ON backlog.bufferid = buffer.bufferid, JOIN buffer ON backlog.bufferid = buffer.bufferid,
...@@ -58,7 +58,7 @@ class Backend { ...@@ -58,7 +58,7 @@ class Backend {
WHERE (backlog.type & 23559) > 0 WHERE (backlog.type & 23559) > 0
AND buffer.userid = :userid AND buffer.userid = :userid
AND backlog.tsv @@ query AND backlog.tsv @@ query
ORDER BY (1 + log(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME)))) * (1 - ts_rank(tsv, query, 32)) * (1 + ln(backlog.type)) ASC ORDER BY (1 + log(MAX(1, EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME))))) * (1 - ts_rank(tsv, query, 32)) * (1 + ln(backlog.type)) ASC
) tmp ) tmp
JOIN sender ON tmp.senderid = sender.senderid JOIN sender ON tmp.senderid = sender.senderid
WHERE tmp.rank <= :limit; WHERE tmp.rank <= :limit;
...@@ -77,7 +77,7 @@ class Backend { ...@@ -77,7 +77,7 @@ class Backend {
AND buffer.userid = :userid AND buffer.userid = :userid
AND backlog.bufferid = :bufferid AND backlog.bufferid = :bufferid
AND backlog.tsv @@ query AND backlog.tsv @@ query
ORDER BY (1 + log(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME)))) * (1 - ts_rank(tsv, query, 32)) * ( 1 + ln(backlog.type)) ASC ORDER BY (1 + log(MAX(1, EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - TIME))))) * (1 - ts_rank(tsv, query, 32)) * ( 1 + ln(backlog.type)) ASC
LIMIT :limit OFFSET :offset; LIMIT :limit OFFSET :offset;
"); ");
$this->loadAfter = $db->prepare(" $this->loadAfter = $db->prepare("
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment