Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove clientTxVersion from ShardTransaction
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardWriteTransaction.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
index 1a50d9b06f1b62f93c488d19c9d57c686ca76b3a..07f9c90fa2e42baf47677d4f33f8449377d7bf7f 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
@@
-30,8
+30,8
@@
public class ShardWriteTransaction extends ShardTransaction {
private final ReadWriteShardDataTreeTransaction transaction;
public ShardWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor,
private final ReadWriteShardDataTreeTransaction transaction;
public ShardWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor,
- ShardStats shardStats, String transactionID
, short clientTxVersion
) {
- super(shardActor, shardStats, transactionID
, clientTxVersion
);
+ ShardStats shardStats, String transactionID) {
+ super(shardActor, shardStats, transactionID);
this.transaction = transaction;
}
this.transaction = transaction;
}
@@
-75,7
+75,7
@@
public class ShardWriteTransaction extends ShardTransaction {
totalBatchedModificationsReceived, batched.getTotalMessagesSent()));
}
totalBatchedModificationsReceived, batched.getTotalMessagesSent()));
}
- readyTransaction(false, batched.isDoCommitOnReady());
+ readyTransaction(false, batched.isDoCommitOnReady()
, batched.getVersion()
);
} else {
getSender().tell(new BatchedModificationsReply(batched.getModifications().size()), getSelf());
}
} else {
getSender().tell(new BatchedModificationsReply(batched.getModifications().size()), getSelf());
}
@@
-106,12
+106,12
@@
public class ShardWriteTransaction extends ShardTransaction {
}
}
}
}
- private void readyTransaction(boolean returnSerialized, boolean doImmediateCommit) {
+ private void readyTransaction(boolean returnSerialized, boolean doImmediateCommit
, short clientTxVersion
) {
String transactionID = getTransactionID();
LOG.debug("readyTransaction : {}", transactionID);
String transactionID = getTransactionID();
LOG.debug("readyTransaction : {}", transactionID);
- getShardActor().forward(new ForwardedReadyTransaction(transactionID,
getClientTxVersion()
,
+ getShardActor().forward(new ForwardedReadyTransaction(transactionID,
clientTxVersion
,
transaction, returnSerialized, doImmediateCommit), getContext());
// The shard will handle the commit from here so we're no longer needed - self-destruct.
transaction, returnSerialized, doImmediateCommit), getContext());
// The shard will handle the commit from here so we're no longer needed - self-destruct.