mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-14 19:59:05 +01:00
Removed an unused DB method and index.
This commit is contained in:
@@ -282,14 +282,6 @@ interface Database<T> {
|
|||||||
*/
|
*/
|
||||||
MessageId getGroupMessageParent(T txn, MessageId m) throws DbException;
|
MessageId getGroupMessageParent(T txn, MessageId m) throws DbException;
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the IDs of all group messages posted by the given author.
|
|
||||||
* <p>
|
|
||||||
* Locking: message read.
|
|
||||||
*/
|
|
||||||
Collection<MessageId> getGroupMessages(T txn, AuthorId a)
|
|
||||||
throws DbException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the time at which a connection to each contact was last opened
|
* Returns the time at which a connection to each contact was last opened
|
||||||
* or closed.
|
* or closed.
|
||||||
|
|||||||
@@ -161,9 +161,6 @@ abstract class JdbcDatabase implements Database<Connection> {
|
|||||||
+ " REFERENCES contacts (contactId)"
|
+ " REFERENCES contacts (contactId)"
|
||||||
+ " ON DELETE CASCADE)";
|
+ " ON DELETE CASCADE)";
|
||||||
|
|
||||||
private static final String INDEX_MESSAGES_BY_AUTHOR =
|
|
||||||
"CREATE INDEX messagesByAuthor ON messages (authorId)";
|
|
||||||
|
|
||||||
private static final String INDEX_MESSAGES_BY_TIMESTAMP =
|
private static final String INDEX_MESSAGES_BY_TIMESTAMP =
|
||||||
"CREATE INDEX messagesByTimestamp ON messages (timestamp)";
|
"CREATE INDEX messagesByTimestamp ON messages (timestamp)";
|
||||||
|
|
||||||
@@ -385,7 +382,6 @@ abstract class JdbcDatabase implements Database<Connection> {
|
|||||||
s.executeUpdate(insertTypeNames(CREATE_CONTACT_GROUPS));
|
s.executeUpdate(insertTypeNames(CREATE_CONTACT_GROUPS));
|
||||||
s.executeUpdate(insertTypeNames(CREATE_GROUP_VERSIONS));
|
s.executeUpdate(insertTypeNames(CREATE_GROUP_VERSIONS));
|
||||||
s.executeUpdate(insertTypeNames(CREATE_MESSAGES));
|
s.executeUpdate(insertTypeNames(CREATE_MESSAGES));
|
||||||
s.executeUpdate(INDEX_MESSAGES_BY_AUTHOR);
|
|
||||||
s.executeUpdate(INDEX_MESSAGES_BY_TIMESTAMP);
|
s.executeUpdate(INDEX_MESSAGES_BY_TIMESTAMP);
|
||||||
s.executeUpdate(insertTypeNames(CREATE_MESSAGES_TO_ACK));
|
s.executeUpdate(insertTypeNames(CREATE_MESSAGES_TO_ACK));
|
||||||
s.executeUpdate(insertTypeNames(CREATE_STATUSES));
|
s.executeUpdate(insertTypeNames(CREATE_STATUSES));
|
||||||
@@ -1351,31 +1347,6 @@ abstract class JdbcDatabase implements Database<Connection> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Collection<MessageId> getGroupMessages(Connection txn,
|
|
||||||
AuthorId a) throws DbException {
|
|
||||||
PreparedStatement ps = null;
|
|
||||||
ResultSet rs = null;
|
|
||||||
try {
|
|
||||||
String sql = "SELECT messageId"
|
|
||||||
+ " FROM messages AS m"
|
|
||||||
+ " JOIN groups AS g"
|
|
||||||
+ " ON m.groupId = g.groupId"
|
|
||||||
+ " WHERE authorId = ?";
|
|
||||||
ps = txn.prepareStatement(sql);
|
|
||||||
ps.setBytes(1, a.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 Collections.unmodifiableList(ids);
|
|
||||||
} catch(SQLException e) {
|
|
||||||
tryToClose(rs);
|
|
||||||
tryToClose(ps);
|
|
||||||
throw new DbException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map<ContactId, Long> getLastConnected(Connection txn)
|
public Map<ContactId, Long> getLastConnected(Connection txn)
|
||||||
throws DbException {
|
throws DbException {
|
||||||
PreparedStatement ps = null;
|
PreparedStatement ps = null;
|
||||||
|
|||||||
@@ -473,38 +473,6 @@ public class H2DatabaseTest extends BriarTestCase {
|
|||||||
db.close();
|
db.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testGetGroupMessages() throws Exception {
|
|
||||||
AuthorId authorId1 = new AuthorId(TestUtils.getRandomId());
|
|
||||||
Author author1 = new Author(authorId1, "Bob",
|
|
||||||
new byte[MAX_PUBLIC_KEY_LENGTH]);
|
|
||||||
MessageId messageId1 = new MessageId(TestUtils.getRandomId());
|
|
||||||
Message message1 = new TestMessage(messageId1, null, group, author1,
|
|
||||||
contentType, subject, timestamp, raw);
|
|
||||||
Database<Connection> db = open(false);
|
|
||||||
Connection txn = db.startTransaction();
|
|
||||||
|
|
||||||
// Subscribe to a group and store two messages
|
|
||||||
db.addSubscription(txn, group);
|
|
||||||
db.addGroupMessage(txn, message, false);
|
|
||||||
db.addGroupMessage(txn, message1, false);
|
|
||||||
|
|
||||||
// Check that both messages are retrievable by their authors
|
|
||||||
Collection<MessageId> ids = db.getGroupMessages(txn, authorId);
|
|
||||||
Iterator<MessageId> it = ids.iterator();
|
|
||||||
assertTrue(it.hasNext());
|
|
||||||
assertEquals(messageId, it.next());
|
|
||||||
assertFalse(it.hasNext());
|
|
||||||
ids = db.getGroupMessages(txn, authorId1);
|
|
||||||
it = ids.iterator();
|
|
||||||
assertTrue(it.hasNext());
|
|
||||||
assertEquals(messageId1, it.next());
|
|
||||||
assertFalse(it.hasNext());
|
|
||||||
|
|
||||||
db.commitTransaction(txn);
|
|
||||||
db.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetOldMessages() throws Exception {
|
public void testGetOldMessages() throws Exception {
|
||||||
MessageId messageId1 = new MessageId(TestUtils.getRandomId());
|
MessageId messageId1 = new MessageId(TestUtils.getRandomId());
|
||||||
|
|||||||
Reference in New Issue
Block a user