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

Unit tests, refactoring and bugfixes for the database. Replies to messages in

Browse Source 
other groups no longer affect sendability, which makes it safe to delete all
messages from a group when unsubscribing.
This commit is contained in:
akwizgran
2011-07-05 14:16:29 +01:00
parent eb752ada62
commit f97393f160
8 changed files with 263 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/net/sf/briar/db/Database.java
View File

@@ -153,6 +153,13 @@ interface Database<T> {
*/
long getFreeSpace() throws DbException;
/**
* Returns the group that contains the given message.
* <p>
* Locking: messages read.
*/
GroupId getGroup(T txn, MessageId m) throws DbException;
/**
* Returns the message identified by the given ID.
* <p>
@@ -168,12 +175,12 @@ interface Database<T> {
Iterable<MessageId> getMessagesByAuthor(T txn, AuthorId a) throws DbException;
/**
* Returns the IDs of all children of the message identified by the given
* ID that are present in the database.
* Returns the number of children of the message identified by the given
* ID that are present in the database and sendable.
* <p>
* Locking: messages read.
*/
Iterable<MessageId> getMessagesByParent(T txn, MessageId m) throws DbException;
int getNumberOfSendableChildren(T txn, MessageId m) throws DbException;
/**
* Returns the IDs of the oldest messages in the database, with a total

13
components/net/sf/briar/db/DatabaseCleaner.java
View File

@@ -16,16 +16,17 @@ interface DatabaseCleaner {
interface Callback {
/**
* Checks how much free storage space is available to the database, and if
* necessary expires old messages until the free space is at least
* MIN_FREE_SPACE. While the free space is less than CRITICAL_FREE_SPACE,
* operations that attempt to store messages in the database will block.
* Checks how much free storage space is available to the database, and
* if necessary expires old messages until the free space is at least
* MIN_FREE_SPACE. While the free space is less than
* CRITICAL_FREE_SPACE, operations that attempt to store messages in
* the database will block.
*/
void checkFreeSpaceAndClean() throws DbException;
/**
* Called by the cleaner; returns true iff the amount of free storage space
* available to the database should be checked.
* Returns true iff the amount of free storage space available to the
* database should be checked.
*/
boolean shouldCheckFreeSpace();
}

9
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -3,9 +3,9 @@ package net.sf.briar.db;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.sf.briar.api.db.ContactId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.ContactId;
import net.sf.briar.api.db.Rating;
import net.sf.briar.api.db.Status;
import net.sf.briar.api.protocol.AuthorId;
@@ -63,11 +63,7 @@ DatabaseCleaner.Callback {
// One point for a good rating
if(getRating(m.getAuthor()) == Rating.GOOD) sendability++;
// One point per sendable child (backward inclusion)
for(MessageId kid : db.getMessagesByParent(txn, m.getId())) {
Integer kidSendability = db.getSendability(txn, kid);
assert kidSendability != null;
if(kidSendability > 0) sendability++;
}
sendability += db.getNumberOfSendableChildren(txn, m.getId());
return sendability;
}
@@ -195,6 +191,7 @@ DatabaseCleaner.Callback {
MessageId parent = db.getParent(txn, m);
if(parent.equals(MessageId.NONE)) break;
if(!db.containsMessage(txn, parent)) break;
if(!db.getGroup(txn, m).equals(db.getGroup(txn, parent))) break;
Integer parentSendability = db.getSendability(txn, parent);
assert parentSendability != null;
if(increment) {

100
components/net/sf/briar/db/JdbcDatabase.java
View File

@@ -17,9 +17,9 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.sf.briar.api.db.ContactId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.ContactId;
import net.sf.briar.api.db.Rating;
import net.sf.briar.api.db.Status;
import net.sf.briar.api.protocol.AuthorId;
@@ -376,6 +376,16 @@ abstract class JdbcDatabase implements Database<Connection> {
int rowsAffected = ps.executeUpdate();
assert rowsAffected == 1;
ps.close();
sql = "INSERT INTO receivedBundles"
+ " (bundleId, contactId, timestamp)"
+ " VALUES (?, ?, ?)";
ps = txn.prepareStatement(sql);
ps.setBytes(1, BundleId.NONE.getBytes());
ps.setInt(2, c.getInt());
ps.setLong(3, System.currentTimeMillis());
rowsAffected = ps.executeUpdate();
assert rowsAffected == 1;
ps.close();
} catch(SQLException e) {
tryToClose(ps);
tryToClose(txn);
@@ -736,6 +746,30 @@ abstract class JdbcDatabase implements Database<Connection> {
} else return f.length();
}
public GroupId getGroup(Connection txn, MessageId m) throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
String sql = "SELECT groupId FROM messages WHERE messageId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes());
rs = ps.executeQuery();
boolean found = rs.next();
assert found;
byte[] group = rs.getBytes(1);
boolean more = rs.next();
assert !more;
rs.close();
ps.close();
return new GroupId(group);
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
tryToClose(txn);
throw new DbException(e);
}
}
public Message getMessage(Connection txn, MessageId m) throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
@@ -792,29 +826,7 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
public Iterable<MessageId> getMessagesByParent(Connection txn, MessageId m)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
String sql = "SELECT messageId FROM messages WHERE parentId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes());
rs = ps.executeQuery();
List<MessageId> ids = new ArrayList<MessageId>();
while(rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close();
ps.close();
return ids;
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
tryToClose(txn);
throw new DbException(e);
}
}
public int getNumberOfMessages(Connection txn) throws DbException {
private int getNumberOfMessages(Connection txn) throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
@@ -837,6 +849,46 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
public int getNumberOfSendableChildren(Connection txn, MessageId m)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
// Children in other groups should not be counted
String sql = "SELECT groupId FROM messages WHERE messageId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes());
rs = ps.executeQuery();
boolean found = rs.next();
assert found;
byte[] group = rs.getBytes(1);
boolean more = rs.next();
assert !more;
rs.close();
ps.close();
sql = "SELECT COUNT(messageId) FROM messages"
+ " WHERE parentId = ? AND groupId = ?"
+ " AND sendability > ZERO()";
ps = txn.prepareStatement(sql);
ps.setBytes(1, m.getBytes());
ps.setBytes(2, group);
rs = ps.executeQuery();
found = rs.next();
assert found;
int count = rs.getInt(1);
more = rs.next();
assert !more;
rs.close();
ps.close();
return count;
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
tryToClose(txn);
throw new DbException(e);
}
}
public Iterable<MessageId> getOldMessages(Connection txn, long capacity)
throws DbException {
PreparedStatement ps = null;