Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Send messages in ascending order of timestamp.

Browse Source 
The old behaviour was a leftover from the days of limited retention periods. The new behaviour will interact better with dependencies and message queues.
This commit is contained in:
akwizgran
2016-08-01 18:49:24 +01:00
parent 0d9cbb2793
commit a51d2f47af
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/org/briarproject/db/JdbcDatabase.java
View File

@@ -1532,7 +1532,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " AND state = ? AND shared = TRUE AND raw IS NOT NULL" + " AND state = ? AND shared = TRUE AND raw IS NOT NULL"
+ " AND seen = FALSE AND requested = FALSE" + " AND seen = FALSE AND requested = FALSE"
+ " AND expiry < ?" + " AND expiry < ?"
+ " ORDER BY timestamp DESC LIMIT ?"; + " ORDER BY timestamp LIMIT ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setInt(2, DELIVERED.getValue()); ps.setInt(2, DELIVERED.getValue());
@@ -1588,7 +1588,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " AND state = ? AND shared = TRUE AND raw IS NOT NULL" + " AND state = ? AND shared = TRUE AND raw IS NOT NULL"
+ " AND seen = FALSE" + " AND seen = FALSE"
+ " AND expiry < ?" + " AND expiry < ?"
+ " ORDER BY timestamp DESC"; + " ORDER BY timestamp";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setInt(2, DELIVERED.getValue()); ps.setInt(2, DELIVERED.getValue());
@@ -1686,7 +1686,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " AND state = ? AND shared = TRUE AND raw IS NOT NULL" + " AND state = ? AND shared = TRUE AND raw IS NOT NULL"
+ " AND seen = FALSE AND requested = TRUE" + " AND seen = FALSE AND requested = TRUE"
+ " AND expiry < ?" + " AND expiry < ?"
+ " ORDER BY timestamp DESC"; + " ORDER BY timestamp";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setInt(2, DELIVERED.getValue()); ps.setInt(2, DELIVERED.getValue());