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 versions to 4.0.0-SNAPSHOT
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionContext.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java
index 1e23120f0bf6b833ff395b2a5863c6795ff65da7..fe36661e671032d82caf8579967efa92e84b9513 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionContext.java
@@
-9,8
+9,11
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSelection;
import com.google.common.util.concurrent.SettableFuture;
import akka.actor.ActorSelection;
import com.google.common.util.concurrent.SettableFuture;
+import java.util.Optional;
+import java.util.SortedSet;
import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
-import org.opendaylight.controller.cluster.datastore.modification.AbstractModification;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import scala.concurrent.Future;
/*
import scala.concurrent.Future;
/*
@@
-20,19
+23,24
@@
import scala.concurrent.Future;
interface TransactionContext {
void closeTransaction();
interface TransactionContext {
void closeTransaction();
- Future<ActorSelection> readyTransaction();
+ Future<ActorSelection> readyTransaction(
Boolean havePermit, Optional<SortedSet<String>> participatingShardNames
);
-
void executeModification(AbstractModification modification
);
+
<T> void executeRead(AbstractRead<T> readCmd, SettableFuture<T> promise, Boolean havePermit
);
-
<T> void executeRead(AbstractRead<T> readCmd, SettableFuture<T> promise
);
+
void executeDelete(YangInstanceIdentifier path, Boolean havePermit
);
- Future<Object> directCommit();
+ void executeMerge(YangInstanceIdentifier path, NormalizedNode<?, ?> data, Boolean havePermit);
+
+ void executeWrite(YangInstanceIdentifier path, NormalizedNode<?, ?> data, Boolean havePermit);
+
+ Future<Object> directCommit(Boolean havePermit);
/**
* Invoked by {@link TransactionContextWrapper} when it has finished handing
* off operations to this context. From this point on, the context is responsible
* for throttling operations.
/**
* Invoked by {@link TransactionContextWrapper} when it has finished handing
* off operations to this context. From this point on, the context is responsible
* for throttling operations.
- * <p/>
+ *
+ * <p>
* Implementations can rely on the wrapper calling this operation in a synchronized
* block, so they do not need to ensure visibility of this state transition themselves.
*/
* Implementations can rely on the wrapper calling this operation in a synchronized
* block, so they do not need to ensure visibility of this state transition themselves.
*/