Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Deprecate ReadData/DataExists protobuff messages
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardTransaction.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
index c6d13dcc8180553af87e0d75364999203e4b8636..82770a20bd4c87ea04a65728b54a89631c9b9b70 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
@@
-41,9
+41,6
@@
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
* </p>
*/
public abstract class ShardTransaction extends AbstractUntypedActorWithMetering {
* </p>
*/
public abstract class ShardTransaction extends AbstractUntypedActorWithMetering {
-
- protected static final boolean SERIALIZED_REPLY = true;
-
private final ActorRef shardActor;
private final ShardStats shardStats;
private final String transactionID;
private final ActorRef shardActor;
private final ShardStats shardStats;
private final String transactionID;
@@
-115,31
+112,25
@@
public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
return ret;
}
return ret;
}
- protected void readData(AbstractShardDataTreeTransaction<?> transaction, ReadData message,
- final boolean returnSerialized) {
-
+ protected void readData(AbstractShardDataTreeTransaction<?> transaction, ReadData message) {
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
Optional<NormalizedNode<?, ?>> optional = transaction.getSnapshot().readNode(path);
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
Optional<NormalizedNode<?, ?>> optional = transaction.getSnapshot().readNode(path);
- ReadDataReply readDataReply = new ReadDataReply(optional.orNull(),
clientTxVersion
);
- sender().tell(
(returnSerialized ? readDataReply.toSerializable(): readDataReply
), self());
+ ReadDataReply readDataReply = new ReadDataReply(optional.orNull(),
message.getVersion()
);
+ sender().tell(
readDataReply.toSerializable(
), self());
}
}
- protected void dataExists(AbstractShardDataTreeTransaction<?> transaction, DataExists message,
- final boolean returnSerialized) {
-
+ protected void dataExists(AbstractShardDataTreeTransaction<?> transaction, DataExists message) {
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
boolean exists = transaction.getSnapshot().readNode(path).isPresent();
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
boolean exists = transaction.getSnapshot().readNode(path).isPresent();
- DataExistsReply dataExistsReply = DataExistsReply.create(exists);
- getSender().tell(returnSerialized ? dataExistsReply.toSerializable() :
- dataExistsReply, getSelf());
+ getSender().tell(new DataExistsReply(exists, message.getVersion()).toSerializable(), getSelf());
}
private static class ShardTransactionCreator implements Creator<ShardTransaction> {
}
private static class ShardTransactionCreator implements Creator<ShardTransaction> {