Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump upstream versions
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
LocalTransactionContext.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
index 5435bb548d5c58e91e2f20d07dc7895f97755df8..6b3006941817e05e4a7de6789e67871dda506846 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
@@
-33,7
+33,7
@@
import scala.concurrent.Future;
*
* @author Thomas Pantelis
*/
*
* @author Thomas Pantelis
*/
-abstract class LocalTransactionContext extends
Abstract
TransactionContext {
+abstract class LocalTransactionContext extends TransactionContext {
private final DOMStoreTransaction txDelegate;
private final LocalTransactionReadySupport readySupport;
private Exception operationError;
private final DOMStoreTransaction txDelegate;
private final LocalTransactionReadySupport readySupport;
private Exception operationError;
@@
-45,9
+45,9
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
this.readySupport = readySupport;
}
this.readySupport = readySupport;
}
-
protected
abstract DOMStoreWriteTransaction getWriteDelegate();
+ abstract DOMStoreWriteTransaction getWriteDelegate();
-
protected
abstract DOMStoreReadTransaction getReadDelegate();
+ abstract DOMStoreReadTransaction getReadDelegate();
@SuppressWarnings("checkstyle:IllegalCatch")
private void executeModification(final Consumer<DOMStoreWriteTransaction> consumer) {
@SuppressWarnings("checkstyle:IllegalCatch")
private void executeModification(final Consumer<DOMStoreWriteTransaction> consumer) {
@@
-62,22
+62,22
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
}
@Override
}
@Override
-
public
void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+ void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
executeModification(transaction -> transaction.delete(path));
}
@Override
executeModification(transaction -> transaction.delete(path));
}
@Override
-
public
void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
+ void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
executeModification(transaction -> transaction.merge(path, data));
}
@Override
executeModification(transaction -> transaction.merge(path, data));
}
@Override
-
public
void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
+ void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
executeModification(transaction -> transaction.write(path, data));
}
@Override
executeModification(transaction -> transaction.write(path, data));
}
@Override
-
public
<T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
+ <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
final Boolean havePermit) {
Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
@Override
final Boolean havePermit) {
Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
@Override
@@
-93,26
+93,26
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
}, MoreExecutors.directExecutor());
}
}, MoreExecutors.directExecutor());
}
- private LocalThreePhaseCommitCohort ready() {
- logModificationCount();
- return readySupport.onTransactionReady(getWriteDelegate(), operationError);
- }
-
@Override
@Override
-
public
Future<ActorSelection> readyTransaction(final Boolean havePermit,
+ Future<ActorSelection> readyTransaction(final Boolean havePermit,
final Optional<SortedSet<String>> participatingShardNames) {
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateCoordinatedCommit(participatingShardNames);
}
@Override
final Optional<SortedSet<String>> participatingShardNames) {
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateCoordinatedCommit(participatingShardNames);
}
@Override
-
public
Future<Object> directCommit(final Boolean havePermit) {
+ Future<Object> directCommit(final Boolean havePermit) {
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateDirectCommit();
}
@Override
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateDirectCommit();
}
@Override
-
public
void closeTransaction() {
+ void closeTransaction() {
txDelegate.close();
}
txDelegate.close();
}
+
+ private LocalThreePhaseCommitCohort ready() {
+ logModificationCount();
+ return readySupport.onTransactionReady(getWriteDelegate(), operationError);
+ }
}
}