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

Use a separate linked list for each contact, containing visible groups.

Browse Source
This commit is contained in:
akwizgran
2012-05-17 23:08:57 +02:00
parent 2f4b347cdf
commit b4f0da53b5
5 changed files with 279 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,6 +132,13 @@ interface Database<T> {
*/
TransportIndex addTransport(T txn, TransportId t) throws DbException;
/**
* Makes the given group visible to the given contact.
* <p>
* Locking: contact read, subscription write.
*/
void addVisibility(T txn, ContactId c, GroupId g) throws DbException;
/**
* Returns true if the database contains the given contact.
* <p>
@@ -514,6 +521,13 @@ interface Database<T> {
*/
void removeSubscription(T txn, GroupId g) throws DbException;
/**
* Makes the given group invisible to the given contact.
* <p>
* Locking: contact read, subscription write.
*/
void removeVisibility(T txn, ContactId c, GroupId g) throws DbException;
/**
* Sets the configuration for the given transport, replacing any existing
* configuration for that transport.
@@ -642,13 +656,4 @@ interface Database<T> {
*/
void setTransportsSent(T txn, ContactId c, long timestamp)
throws DbException;
/**
* Makes the given group visible to the given set of contacts and invisible
* to any other contacts.
* <p>
* Locking: contact read, subscription write.
*/
void setVisibility(T txn, GroupId g, Collection<ContactId> visible)
throws DbException;
}

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

@@ -1425,7 +1425,7 @@ DatabaseCleaner.Callback {
public void setVisibility(GroupId g, Collection<ContactId> visible)
throws DbException {
List<ContactId> affected;
List<ContactId> affected = new ArrayList<ContactId>();
contactLock.readLock().lock();
try {
subscriptionLock.writeLock().lock();
@@ -1433,23 +1433,25 @@ DatabaseCleaner.Callback {
T txn = db.startTransaction();
try {
// Use HashSets for O(1) lookups, O(n) overall running time
HashSet<ContactId> then, now;
// Retrieve the group's current visibility
then = new HashSet<ContactId>(db.getVisibility(txn, g));
// Don't try to make the group visible to ex-contacts
now = new HashSet<ContactId>(visible);
now.retainAll(new HashSet<ContactId>(db.getContacts(txn)));
db.setVisibility(txn, g, now);
// Work out which contacts were affected by the change
affected = new ArrayList<ContactId>();
for(ContactId c : then) {
if(!now.contains(c)) affected.add(c);
visible = new HashSet<ContactId>(visible);
HashSet<ContactId> oldVisible =
new HashSet<ContactId>(db.getVisibility(txn, g));
// Set the group's visibility for each current contact
for(ContactId c : db.getContacts(txn)) {
boolean then = oldVisible.contains(c);
boolean now = visible.contains(c);
if(!then && now) {
db.addVisibility(txn, c, g);
affected.add(c);
} else if(then && !now) {
db.removeVisibility(txn, c, g);
affected.add(c);
}
}
for(ContactId c : now) {
if(!then.contains(c)) affected.add(c);
if(!affected.isEmpty()) {
db.setSubscriptionsModified(txn, affected,
System.currentTimeMillis());
}
db.setSubscriptionsModified(txn, affected,
System.currentTimeMillis());
db.commitTransaction(txn);
} catch(DbException e) {
db.abortTransaction(txn);

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

@@ -59,12 +59,6 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " start BIGINT NOT NULL,"
+ " PRIMARY KEY (groupId))";
private static final String CREATE_SUBSCRIPTION_IDS =
"CREATE TABLE subscriptionIds"
+ " (groupId HASH," // Null for the head of the list
+ " nextId HASH," // Null for the tail of the list
+ " deleted BIGINT NOT NULL)";
private static final String CREATE_CONTACTS =
"CREATE TABLE contacts"
+ " (contactId COUNTER,"
@@ -104,12 +98,13 @@ abstract class JdbcDatabase implements Database<Connection> {
private static final String CREATE_VISIBILITIES =
"CREATE TABLE visibilities"
+ " (groupId HASH NOT NULL,"
+ " contactId INT NOT NULL,"
+ " PRIMARY KEY (groupId, contactId),"
+ " FOREIGN KEY (groupId) REFERENCES subscriptions (groupId)"
+ " ON DELETE CASCADE,"
+ " (contactId INT NOT NULL,"
+ " groupId HASH," // Null for the head of the linked list
+ " nextId HASH," // Null for the tail of the linked list
+ " deleted BIGINT NOT NULL,"
+ " FOREIGN KEY (contactId) REFERENCES contacts (contactId)"
+ " ON DELETE CASCADE,"
+ " FOREIGN KEY (groupId) REFERENCES subscriptions (groupId)"
+ " ON DELETE CASCADE)";
private static final String INDEX_VISIBILITIES_BY_GROUP =
@@ -333,7 +328,6 @@ abstract class JdbcDatabase implements Database<Connection> {
try {
s = txn.createStatement();
s.executeUpdate(insertTypeNames(CREATE_SUBSCRIPTIONS));
s.executeUpdate(insertTypeNames(CREATE_SUBSCRIPTION_IDS));
s.executeUpdate(insertTypeNames(CREATE_CONTACTS));
s.executeUpdate(insertTypeNames(CREATE_MESSAGES));
s.executeUpdate(INDEX_MESSAGES_BY_PARENT);
@@ -729,7 +723,6 @@ abstract class JdbcDatabase implements Database<Connection> {
public void addSubscription(Connection txn, Group g) throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
// Add the group to the subscriptions table
String sql = "INSERT INTO subscriptions"
@@ -743,78 +736,7 @@ abstract class JdbcDatabase implements Database<Connection> {
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
// Insert the group ID into the linked list
byte[] id = g.getId().getBytes();
sql = "SELECT groupId, nextId, deleted FROM subscriptionIds"
+ " ORDER BY groupId";
ps = txn.prepareStatement(sql);
rs = ps.executeQuery();
if(rs.next()) {
// The head pointer of the list exists
byte[] groupId = rs.getBytes(1);
if(groupId != null) throw new DbStateException();
byte[] nextId = rs.getBytes(2);
long deleted = rs.getLong(3);
// Scan through the list to find the insertion point
while(nextId != null && ByteUtils.compare(id, nextId) > 0) {
if(!rs.next()) throw new DbStateException();
groupId = rs.getBytes(1);
if(groupId == null) throw new DbStateException();
nextId = rs.getBytes(2);
deleted = rs.getLong(3);
}
rs.close();
ps.close();
// Update the previous element
if(groupId == null) {
// Inserting at the head of the list
sql = "UPDATE subscriptionIds SET nextId = ?"
+ " WHERE groupId IS NULL";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
} else {
// Inserting in the middle or at the tail of the list
sql = "UPDATE subscriptionIds SET nextId = ?"
+ " WHERE groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
ps.setBytes(2, groupId);
}
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
// Insert the new element
sql = "INSERT INTO subscriptionIds (groupId, nextId, deleted)"
+ " VALUES (?, ?, ?)";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
if(nextId == null) ps.setNull(2, Types.BINARY); // At the tail
else ps.setBytes(2, nextId); // In the middle
ps.setLong(3, deleted);
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
} else {
// The head pointer of the list does not exist
rs.close();
ps.close();
sql = "INSERT INTO subscriptionIds (nextId, deleted)"
+ " VALUES (?, ZERO())";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
sql = "INSERT INTO subscriptionIds (groupId, deleted)"
+ " VALUES (?, ZERO())";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
}
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
throw new DbException(e);
}
@@ -858,6 +780,96 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
public void addVisibility(Connection txn, ContactId c, GroupId g)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
// Insert the group ID into the linked list
byte[] id = g.getBytes();
String sql = "SELECT groupId, nextId, deleted FROM visibilities"
+ " WHERE contactId = ?"
+ " ORDER BY groupId";
ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt());
rs = ps.executeQuery();
if(rs.next()) {
// The head pointer of the list exists
byte[] groupId = rs.getBytes(1);
if(groupId != null) throw new DbStateException();
byte[] nextId = rs.getBytes(2);
long deleted = rs.getLong(3);
// Scan through the list to find the insertion point
while(nextId != null && ByteUtils.compare(id, nextId) > 0) {
if(!rs.next()) throw new DbStateException();
groupId = rs.getBytes(1);
if(groupId == null) throw new DbStateException();
nextId = rs.getBytes(2);
deleted = rs.getLong(3);
}
rs.close();
ps.close();
// Update the previous element
if(groupId == null) {
// Inserting at the head of the list
sql = "UPDATE visibilities SET nextId = ?"
+ " WHERE contactId = ? AND groupId IS NULL";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
ps.setInt(2, c.getInt());
} else {
// Inserting in the middle or at the tail of the list
sql = "UPDATE visibilities SET nextId = ?"
+ " WHERE contactId = ? AND groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, id);
ps.setInt(2, c.getInt());
ps.setBytes(3, groupId);
}
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
// Insert the new element
sql = "INSERT INTO visibilities"
+ " (contactId, groupId, nextId, deleted)"
+ " VALUES (?, ?, ?, ?)";
ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt());
ps.setBytes(2, id);
if(nextId == null) ps.setNull(3, Types.BINARY); // At the tail
else ps.setBytes(3, nextId); // In the middle
ps.setLong(4, deleted);
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
} else {
// The head pointer of the list does not exist
rs.close();
ps.close();
sql = "INSERT INTO visibilities (contactId, nextId, deleted)"
+ " VALUES (?, ?, ZERO())";
ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt());
ps.setBytes(2, id);
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
sql = "INSERT INTO visibilities (contactId, groupId, deleted)"
+ " VALUES (?, ?, ZERO())";
ps = txn.prepareStatement(sql);
ps.setInt(1, c.getInt());
ps.setBytes(2, id);
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
}
} catch(SQLException e) {
tryToClose(rs);
tryToClose(ps);
throw new DbException(e);
}
}
public boolean containsContact(Connection txn, ContactId c)
throws DbException {
PreparedStatement ps = null;
@@ -2176,39 +2188,82 @@ abstract class JdbcDatabase implements Database<Connection> {
public void removeSubscription(Connection txn, GroupId g)
throws DbException {
PreparedStatement ps = null;
PreparedStatement ps = null, ps1 = null;
ResultSet rs = null;
try {
// Remove the group ID from the visibility lists
long now = System.currentTimeMillis();
String sql = "SELECT contactId, nextId FROM visibilities"
+ " WHERE groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, g.getBytes());
rs = ps.executeQuery();
while(rs.next()) {
int contactId = rs.getInt(1);
byte[] nextId = rs.getBytes(2);
sql = "UPDATE visibilities SET nextId = ?, deleted = ?"
+ " WHERE contactId = ? AND nextId = ?";
ps1 = txn.prepareStatement(sql);
if(nextId == null) ps1.setNull(1, Types.BINARY); // At the tail
else ps1.setBytes(1, nextId); // At the head or in the middle
ps1.setLong(2, now);
ps1.setInt(3, contactId);
ps1.setBytes(4, g.getBytes());
int affected = ps1.executeUpdate();
if(affected != 1) throw new DbStateException();
ps1.close();
}
rs.close();
ps.close();
// Remove the group from the subscriptions table
String sql = "DELETE FROM subscriptions WHERE groupId = ?";
sql = "DELETE FROM subscriptions WHERE groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, g.getBytes());
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
} catch(SQLException e) {
e.printStackTrace();
tryToClose(rs);
tryToClose(ps);
tryToClose(ps1);
throw new DbException(e);
}
}
public void removeVisibility(Connection txn, ContactId c, GroupId g)
throws DbException {
PreparedStatement ps = null;
ResultSet rs = null;
try {
// Remove the group ID from the linked list
sql = "SELECT nextId FROM subscriptionIds WHERE groupId = ?";
String sql = "SELECT nextId FROM visibilities"
+ " WHERE contactId = ? AND groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, g.getBytes());
ps.setInt(1, c.getInt());
ps.setBytes(2, g.getBytes());
rs = ps.executeQuery();
if(!rs.next()) throw new DbStateException();
byte[] nextId = rs.getBytes(1);
if(rs.next()) throw new DbStateException();
rs.close();
ps.close();
sql = "DELETE FROM subscriptionIds WHERE groupId = ?";
sql = "DELETE FROM visibilities"
+ " WHERE contactId = ? AND groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, g.getBytes());
affected = ps.executeUpdate();
ps.setInt(1, c.getInt());
ps.setBytes(2, g.getBytes());
int affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
sql = "UPDATE subscriptionIds SET nextId = ?, deleted = ?"
+ " WHERE nextId = ?";
sql = "UPDATE visibilities SET nextId = ?, deleted = ?"
+ " WHERE contactId = ? AND nextId = ?";
ps = txn.prepareStatement(sql);
if(nextId == null) ps.setNull(1, Types.BINARY); // At the tail
else ps.setBytes(1, nextId); // At the head or in the middle
ps.setLong(2, System.currentTimeMillis());
ps.setBytes(3, g.getBytes());
ps.setInt(3, c.getInt());
ps.setBytes(4, g.getBytes());
affected = ps.executeUpdate();
if(affected != 1) throw new DbStateException();
ps.close();
@@ -2800,36 +2855,4 @@ abstract class JdbcDatabase implements Database<Connection> {
throw new DbException(e);
}
}
public void setVisibility(Connection txn, GroupId g,
Collection<ContactId> visible) throws DbException {
PreparedStatement ps = null;
try {
// Delete any existing visibilities
String sql = "DELETE FROM visibilities where groupId = ?";
ps = txn.prepareStatement(sql);
ps.setBytes(1, g.getBytes());
ps.executeUpdate();
ps.close();
// Store the new visibilities
sql = "INSERT INTO visibilities (groupId, contactId)"
+ " VALUES (?, ?)";
ps = txn.prepareStatement(sql);
ps.setBytes(1, g.getBytes());
for(ContactId c : visible) {
ps.setInt(2, c.getInt());
ps.addBatch();
}
int[] batchAffected = ps.executeBatch();
if(batchAffected.length != visible.size())
throw new DbStateException();
for(int i = 0; i < batchAffected.length; i++) {
if(batchAffected[i] != 1) throw new DbStateException();
}
ps.close();
} catch(SQLException e) {
tryToClose(ps);
throw new DbException(e);
}
}
}