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

Expose transactions through DatabaseComponent interface.

Browse Source
This commit is contained in:
akwizgran
2016-02-08 15:18:05 +00:00
parent 2460e1feb0
commit 3fa1bbe33e
5 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
View File

@@ -14,6 +14,7 @@ import org.briarproject.api.db.NoSuchLocalAuthorException;
import org.briarproject.api.db.NoSuchMessageException;
import org.briarproject.api.db.NoSuchTransportException;
import org.briarproject.api.db.StorageStatus;
import org.briarproject.api.db.Transaction;
import org.briarproject.api.event.EventBus;
import org.briarproject.api.event.GroupAddedEvent;
import org.briarproject.api.event.GroupRemovedEvent;
@@ -77,6 +78,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
Logger.getLogger(DatabaseComponentImpl.class.getName());
private final Database<T> db;
private final Class<T> txnClass;
private final EventBus eventBus;
private final ShutdownManager shutdown;
private final AtomicBoolean closed = new AtomicBoolean(false);
@@ -84,9 +86,10 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
private volatile int shutdownHandle = -1;
@Inject
DatabaseComponentImpl(Database<T> db, EventBus eventBus,
DatabaseComponentImpl(Database<T> db, Class<T> txnClass, EventBus eventBus,
ShutdownManager shutdown) {
this.db = db;
this.txnClass = txnClass;
this.eventBus = eventBus;
this.shutdown = shutdown;
}
@@ -116,6 +119,18 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
db.close();
}
public Transaction startTransaction() throws DbException {
return new Transaction(db.startTransaction());
}
public void abortTransaction(Transaction txn) {
db.abortTransaction(txnClass.cast(txn.unbox()));
}
public void commitTransaction(Transaction txn) throws DbException {
db.commitTransaction(txnClass.cast(txn.unbox()));
}
public ContactId addContact(Author remote, AuthorId local)
throws DbException {
T txn = db.startTransaction();
@@ -975,7 +990,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
public void setVisibleToContact(ContactId c, GroupId g, boolean visible)
throws DbException {
boolean wasVisible = false;
boolean wasVisible;
T txn = db.startTransaction();
try {
if (!db.containsContact(txn, c))

3
briar-core/src/org/briarproject/db/DatabaseModule.java
View File

@@ -51,7 +51,8 @@ public class DatabaseModule extends AbstractModule {
@Provides @Singleton
DatabaseComponent getDatabaseComponent(Database<Connection> db,
EventBus eventBus, ShutdownManager shutdown) {
return new DatabaseComponentImpl<Connection>(db, eventBus, shutdown);
return new DatabaseComponentImpl<Connection>(db, Connection.class,
eventBus, shutdown);
}
@Provides @Singleton @DatabaseExecutor