Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Inlined constant values in SQL statements to improve readability.

Browse Source
This commit is contained in:
akwizgran
2013-04-15 13:45:21 +01:00
parent 42fd02d0b9
commit 2ef06f8564
1 changed files with 41 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
briar-core/src/net/sf/briar/db/JdbcDatabase.java
View File

@@ -56,7 +56,7 @@ import net.sf.briar.api.transport.TemporarySecret;
/** /**
* A generic database implementation that can be used with any JDBC-compatible * A generic database implementation that can be used with any JDBC-compatible
* database library. (Tested with H2, Derby and HSQLDB.) * database library.
*/ */
abstract class JdbcDatabase implements Database<Connection> { abstract class JdbcDatabase implements Database<Connection> {
@@ -566,9 +566,8 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close(); ps.close();
// Get the new (highest) contact ID // Get the new (highest) contact ID
sql = "SELECT contactId FROM contacts" sql = "SELECT contactId FROM contacts"
+ " ORDER BY contactId DESC LIMIT ?"; + " ORDER BY contactId DESC LIMIT 1";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1);
rs = ps.executeQuery(); rs = ps.executeQuery();
if(!rs.next()) throw new DbStateException(); if(!rs.next()) throw new DbStateException();
ContactId c = new ContactId(rs.getInt(1)); ContactId c = new ContactId(rs.getInt(1));
@@ -613,11 +612,9 @@ abstract class JdbcDatabase implements Database<Connection> {
sql = "INSERT INTO retentionVersions (contactId, retention," sql = "INSERT INTO retentionVersions (contactId, retention,"
+ " localVersion, localAcked, remoteVersion, remoteAcked," + " localVersion, localAcked, remoteVersion, remoteAcked,"
+ " expiry, txCount)" + " expiry, txCount)"
+ " VALUES (?, ZERO(), ?, ZERO(), ZERO(), TRUE, ZERO()," + " VALUES (?, 0, 1, 0, 0, TRUE, 0, 0)";
+ " ZERO())";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setInt(2, 1);
affected = ps.executeUpdate(); affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -625,10 +622,9 @@ abstract class JdbcDatabase implements Database<Connection> {
sql = "INSERT INTO groupVersions (contactId, localVersion," sql = "INSERT INTO groupVersions (contactId, localVersion,"
+ " localAcked, remoteVersion, remoteAcked, expiry," + " localAcked, remoteVersion, remoteAcked, expiry,"
+ " txCount)" + " txCount)"
+ " VALUES (?, ?, ZERO(), ZERO(), TRUE, ZERO(), ZERO())"; + " VALUES (?, 1, 0, 0, TRUE, 0, 0)";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setInt(2, 1);
affected = ps.executeUpdate(); affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -643,10 +639,9 @@ abstract class JdbcDatabase implements Database<Connection> {
if(transports.isEmpty()) return c; if(transports.isEmpty()) return c;
sql = "INSERT INTO transportVersions (contactId, transportId," sql = "INSERT INTO transportVersions (contactId, transportId,"
+ " localVersion, localAcked, expiry, txCount)" + " localVersion, localAcked, expiry, txCount)"
+ " VALUES (?, ?, ?, ZERO(), ZERO(), ZERO())"; + " VALUES (?, ?, 1, 0, 0, 0)";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setInt(3, 1);
for(byte[] t : transports) { for(byte[] t : transports) {
ps.setBytes(2, t); ps.setBytes(2, t);
ps.addBatch(); ps.addBatch();
@@ -696,8 +691,8 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " authorId, authorName, authorKey, contentType, subject," + " authorId, authorName, authorKey, contentType, subject,"
+ " timestamp, length, bodyStart, bodyLength, raw," + " timestamp, length, bodyStart, bodyLength, raw,"
+ " incoming, sendability, read, starred)" + " incoming, sendability, read, starred)"
+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?," + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0,"
+ " ZERO(), FALSE, FALSE)"; + " FALSE, FALSE)";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getId().getBytes()); ps.setBytes(1, m.getId().getBytes());
if(m.getParent() == null) ps.setNull(2, BINARY); if(m.getParent() == null) ps.setNull(2, BINARY);
@@ -892,7 +887,7 @@ abstract class JdbcDatabase implements Database<Connection> {
try { try {
String sql = "INSERT INTO statuses" String sql = "INSERT INTO statuses"
+ " (messageId, contactId, seen, expiry, txCount)" + " (messageId, contactId, seen, expiry, txCount)"
+ " VALUES (?, ?, ?, ZERO(), ZERO())"; + " VALUES (?, ?, ?, 0, 0)";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes()); ps.setBytes(1, m.getBytes());
ps.setInt(2, c.getInt()); ps.setInt(2, c.getInt());
@@ -972,10 +967,9 @@ abstract class JdbcDatabase implements Database<Connection> {
if(contacts.isEmpty()) return true; if(contacts.isEmpty()) return true;
sql = "INSERT INTO transportVersions (contactId, transportId," sql = "INSERT INTO transportVersions (contactId, transportId,"
+ " localVersion, localAcked, expiry, txCount)" + " localVersion, localAcked, expiry, txCount)"
+ " VALUES (?, ?, ?, ZERO(), ZERO(), ZERO())"; + " VALUES (?, ?, 1, 0, 0, 0)";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setBytes(2, t.getBytes()); ps.setBytes(2, t.getBytes());
ps.setInt(3, 1);
for(Integer c : contacts) { for(Integer c : contacts) {
ps.setInt(1, c); ps.setInt(1, c);
ps.addBatch(); ps.addBatch();
@@ -1008,12 +1002,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close(); ps.close();
// Bump the subscription version // Bump the subscription version
sql = "UPDATE groupVersions" sql = "UPDATE groupVersions"
+ " SET localVersion = localVersion + ?," + " SET localVersion = localVersion + 1,"
+ " expiry = ZERO(), txCount = ZERO()" + " expiry = 0, txCount = 0"
+ " WHERE contactId = ?"; + " WHERE contactId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1); ps.setInt(1, c.getInt());
ps.setInt(2, c.getInt());
affected = ps.executeUpdate(); affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -1663,7 +1656,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " WHERE cg.contactId = ?" + " WHERE cg.contactId = ?"
+ " AND timestamp >= retention" + " AND timestamp >= retention"
+ " AND seen = FALSE AND s.expiry < ?" + " AND seen = FALSE AND s.expiry < ?"
+ " AND sendability > ZERO()" + " AND sendability > 0"
+ " ORDER BY timestamp DESC LIMIT ?"; + " ORDER BY timestamp DESC LIMIT ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
@@ -1698,7 +1691,7 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close(); ps.close();
sql = "SELECT COUNT (messageId) FROM messages" sql = "SELECT COUNT (messageId) FROM messages"
+ " WHERE parentId = ? AND groupId = ?" + " WHERE parentId = ? AND groupId = ?"
+ " AND sendability > ZERO()"; + " AND sendability > 0";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes()); ps.setBytes(1, m.getBytes());
ps.setBytes(2, groupId); ps.setBytes(2, groupId);
@@ -1921,7 +1914,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " AND cg.contactId = ?" + " AND cg.contactId = ?"
+ " AND timestamp >= retention" + " AND timestamp >= retention"
+ " AND seen = FALSE AND s.expiry < ?" + " AND seen = FALSE AND s.expiry < ?"
+ " AND sendability > ZERO()"; + " AND sendability > 0";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes()); ps.setBytes(1, m.getBytes());
ps.setInt(2, c.getInt()); ps.setInt(2, c.getInt());
@@ -2046,11 +2039,10 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " WHERE rv.contactId = ?" + " WHERE rv.contactId = ?"
+ " AND localVersion > localAcked" + " AND localVersion > localAcked"
+ " AND expiry < ?" + " AND expiry < ?"
+ " ORDER BY timestamp LIMIT ?"; + " ORDER BY timestamp LIMIT 1";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setLong(2, now); ps.setLong(2, now);
ps.setInt(3, 1);
rs = ps.executeQuery(); rs = ps.executeQuery();
if(!rs.next()) { if(!rs.next()) {
rs.close(); rs.close();
@@ -2065,12 +2057,11 @@ abstract class JdbcDatabase implements Database<Connection> {
rs.close(); rs.close();
ps.close(); ps.close();
sql = "UPDATE retentionVersions" sql = "UPDATE retentionVersions"
+ " SET expiry = ?, txCount = txCount + ?" + " SET expiry = ?, txCount = txCount + 1"
+ " WHERE contactId = ?"; + " WHERE contactId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setLong(1, calculateExpiry(now, maxLatency, txCount)); ps.setLong(1, calculateExpiry(now, maxLatency, txCount));
ps.setInt(2, 1); ps.setInt(2, c.getInt());
ps.setInt(3, c.getInt());
int affected = ps.executeUpdate(); int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -2182,7 +2173,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " WHERE cg.contactId = ?" + " WHERE cg.contactId = ?"
+ " AND timestamp >= retention" + " AND timestamp >= retention"
+ " AND seen = FALSE AND s.expiry < ?" + " AND seen = FALSE AND s.expiry < ?"
+ " AND sendability > ZERO()" + " AND sendability > 0"
+ " ORDER BY timestamp DESC"; + " ORDER BY timestamp DESC";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
@@ -2346,12 +2337,11 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close(); ps.close();
if(subs.isEmpty()) return null; if(subs.isEmpty()) return null;
sql = "UPDATE groupVersions" sql = "UPDATE groupVersions"
+ " SET expiry = ?, txCount = txCount + ?" + " SET expiry = ?, txCount = txCount + 1"
+ " WHERE contactId = ?"; + " WHERE contactId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setLong(1, calculateExpiry(now, maxLatency, txCount)); ps.setLong(1, calculateExpiry(now, maxLatency, txCount));
ps.setInt(2, 1); ps.setInt(2, c.getInt());
ps.setInt(3, c.getInt());
int affected = ps.executeUpdate(); int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -2493,16 +2483,15 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close(); ps.close();
if(updates.isEmpty()) return null; if(updates.isEmpty()) return null;
sql = "UPDATE transportVersions" sql = "UPDATE transportVersions"
+ " SET expiry = ?, txCount = txCount + ?" + " SET expiry = ?, txCount = txCount + 1"
+ " WHERE contactId = ? AND transportId = ?"; + " WHERE contactId = ? AND transportId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(2, 1); ps.setInt(2, c.getInt());
ps.setInt(3, c.getInt());
int i = 0; int i = 0;
for(TransportUpdate u : updates) { for(TransportUpdate u : updates) {
int txCount = txCounts.get(i++); int txCount = txCounts.get(i++);
ps.setLong(1, calculateExpiry(now, maxLatency, txCount)); ps.setLong(1, calculateExpiry(now, maxLatency, txCount));
ps.setBytes(4, u.getId().getBytes()); ps.setBytes(3, u.getId().getBytes());
ps.addBatch(); ps.addBatch();
} }
int [] batchAffected = ps.executeBatch(); int [] batchAffected = ps.executeBatch();
@@ -2628,11 +2617,10 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " JOIN statuses AS s" + " JOIN statuses AS s"
+ " ON m.messageId = s.messageId" + " ON m.messageId = s.messageId"
+ " WHERE m.contactId = ? AND seen = FALSE AND expiry < ?" + " WHERE m.contactId = ? AND seen = FALSE AND expiry < ?"
+ " LIMIT ?"; + " LIMIT 1";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setLong(2, now); ps.setLong(2, now);
ps.setInt(3, 1);
rs = ps.executeQuery(); rs = ps.executeQuery();
boolean found = rs.next(); boolean found = rs.next();
if(rs.next()) throw new DbStateException(); if(rs.next()) throw new DbStateException();
@@ -2654,12 +2642,11 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " WHERE cg.contactId = ?" + " WHERE cg.contactId = ?"
+ " AND timestamp >= retention" + " AND timestamp >= retention"
+ " AND seen = FALSE AND s.expiry < ?" + " AND seen = FALSE AND s.expiry < ?"
+ " AND sendability > ZERO()" + " AND sendability > 0"
+ " LIMIT ?"; + " LIMIT 1";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt()); ps.setInt(1, c.getInt());
ps.setLong(2, now); ps.setLong(2, now);
ps.setInt(3, 1);
rs = ps.executeQuery(); rs = ps.executeQuery();
found = rs.next(); found = rs.next();
if(rs.next()) throw new DbStateException(); if(rs.next()) throw new DbStateException();
@@ -2696,13 +2683,12 @@ abstract class JdbcDatabase implements Database<Connection> {
rs.close(); rs.close();
ps.close(); ps.close();
// Increment the connection counter // Increment the connection counter
sql = "UPDATE secrets SET outgoing = outgoing + ?" sql = "UPDATE secrets SET outgoing = outgoing + 1"
+ " WHERE contactId = ? AND transportId = ? AND period = ?"; + " WHERE contactId = ? AND transportId = ? AND period = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1); ps.setInt(1, c.getInt());
ps.setInt(2, c.getInt()); ps.setBytes(2, t.getBytes());
ps.setBytes(3, t.getBytes()); ps.setLong(3, period);
ps.setLong(4, period);
int affected = ps.executeUpdate(); int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -2718,9 +2704,8 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null; PreparedStatement ps = null;
try { try {
String sql = "UPDATE retentionVersions" String sql = "UPDATE retentionVersions"
+ " SET localVersion = localVersion + ?, expiry = ZERO()"; + " SET localVersion = localVersion + 1, expiry = 0";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1);
ps.executeUpdate(); ps.executeUpdate();
} catch(SQLException e) { } catch(SQLException e) {
tryToClose(ps); tryToClose(ps);
@@ -2835,12 +2820,11 @@ abstract class JdbcDatabase implements Database<Connection> {
if(visible.isEmpty()) return; if(visible.isEmpty()) return;
// Bump the subscription version for the affected contacts // Bump the subscription version for the affected contacts
sql = "UPDATE groupVersions" sql = "UPDATE groupVersions"
+ " SET localVersion = localVersion + ?, expiry = ZERO()" + " SET localVersion = localVersion + 1, expiry = 0"
+ " WHERE contactId = ?"; + " WHERE contactId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1);
for(Integer c : visible) { for(Integer c : visible) {
ps.setInt(2, c); ps.setInt(1, c);
ps.addBatch(); ps.addBatch();
} }
int[] batchAffected = ps.executeBatch(); int[] batchAffected = ps.executeBatch();
@@ -2887,11 +2871,10 @@ abstract class JdbcDatabase implements Database<Connection> {
ps.close(); ps.close();
// Bump the subscription version // Bump the subscription version
sql = "UPDATE groupVersions" sql = "UPDATE groupVersions"
+ " SET localVersion = localVersion + ?, expiry = ZERO()" + " SET localVersion = localVersion + 1, expiry = 0"
+ " WHERE contactId = ?"; + " WHERE contactId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1); ps.setInt(1, c.getInt());
ps.setInt(2, c.getInt());
affected = ps.executeUpdate(); affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException(); if(affected != 1) throw new DbStateException();
ps.close(); ps.close();
@@ -2915,11 +2898,10 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null; PreparedStatement ps = null;
try { try {
String sql = "UPDATE transportVersions" String sql = "UPDATE transportVersions"
+ " SET localVersion = localVersion + ?, expiry = ZERO()" + " SET localVersion = localVersion + 1, expiry = 0"
+ " WHERE transportId = ?"; + " WHERE transportId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(1, 1); ps.setBytes(1, t.getBytes());
ps.setBytes(2, t.getBytes());
ps.executeUpdate(); ps.executeUpdate();
ps.close(); ps.close();
} catch(SQLException e) { } catch(SQLException e) {
@@ -3462,14 +3444,13 @@ abstract class JdbcDatabase implements Database<Connection> {
PreparedStatement ps = null; PreparedStatement ps = null;
try { try {
String sql = "UPDATE statuses" String sql = "UPDATE statuses"
+ " SET expiry = ?, txCount = txCount + ?" + " SET expiry = ?, txCount = txCount + 1"
+ " WHERE messageId = ? AND contactId = ?"; + " WHERE messageId = ? AND contactId = ?";
ps = txn.prepareStatement(sql); ps = txn.prepareStatement(sql);
ps.setInt(2, 1); ps.setInt(3, c.getInt());
ps.setInt(4, c.getInt());
for(Entry<MessageId, Integer> e : sent.entrySet()) { for(Entry<MessageId, Integer> e : sent.entrySet()) {
ps.setLong(1, calculateExpiry(now, maxLatency, e.getValue())); ps.setLong(1, calculateExpiry(now, maxLatency, e.getValue()));
ps.setBytes(3, e.getKey().getBytes()); ps.setBytes(2, e.getKey().getBytes());
ps.addBatch(); ps.addBatch();
} }
int[] batchAffected = ps.executeBatch(); int[] batchAffected = ps.executeBatch();