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

Allow identical batches to be sent to multiple contacts.

Browse Source
This commit is contained in:
akwizgran
2011-09-07 11:15:34 +01:00
parent e80ede4429
commit 0a84a01235
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,7 +127,7 @@ abstract class JdbcDatabase implements Database<Connection> {
+ " (batchId HASH NOT NULL,"
+ " contactId INT NOT NULL,"
+ " messageId HASH NOT NULL,"
+ " PRIMARY KEY (batchId, messageId),"
+ " PRIMARY KEY (batchId, contactId, messageId),"
+ " FOREIGN KEY (batchId, contactId)"
+ " REFERENCES outstandingBatches (batchId, contactId)"
+ " ON DELETE CASCADE,"

49
test/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -461,7 +461,6 @@ public class H2DatabaseTest extends TestCase {
assertEquals(contactId, db.addContact(txn, transports, secret));
db.addBatchToAck(txn, contactId, batchId);
db.addBatchToAck(txn, contactId, batchId);
db.commitTransaction(txn);
// The batch ID should only be returned once
Collection<BatchId> acks = db.getBatchesToAck(txn, contactId);
@@ -479,6 +478,54 @@ public class H2DatabaseTest extends TestCase {
db.close();
}
@Test
public void testSameBatchCannotBeSentTwice() throws DbException {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add a contact, subscribe to a group and store a message
assertEquals(contactId, db.addContact(txn, transports, secret));
db.addSubscription(txn, group);
db.addMessage(txn, message);
// Add an outstanding batch
db.addOutstandingBatch(txn, contactId, batchId,
Collections.singleton(messageId));
// It should not be possible to add the same outstanding batch again
try {
db.addOutstandingBatch(txn, contactId, batchId,
Collections.singleton(messageId));
fail();
} catch(DbException expected) {}
db.abortTransaction(txn);
db.close();
}
@Test
public void testSameBatchCanBeSentToDifferentContacts() throws DbException {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Add two contacts, subscribe to a group and store a message
assertEquals(contactId, db.addContact(txn, transports, secret));
ContactId contactId1 = db.addContact(txn, transports, secret);
db.addSubscription(txn, group);
db.addMessage(txn, message);
// Add an outstanding batch for the first contact
db.addOutstandingBatch(txn, contactId, batchId,
Collections.singleton(messageId));
// Add the same outstanding batch for the second contact
db.addOutstandingBatch(txn, contactId1, batchId,
Collections.singleton(messageId));
db.commitTransaction(txn);
db.close();
}
@Test
public void testRemoveAckedBatch() throws DbException {
Database<Connection> db = open(false);