X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractTransactionContext.java;h=bc8efa6c5ae2b9d87dd94cac8e7386a4a6a1d06b;hp=d94e1c691e704051a81f74c2ba3ec135e1da002e;hb=35dfbc096623d860b6e24b2d17ac6e2c6a3dca1c;hpb=a039b8a0d1592967542b199ed1634a04c40a99c5

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java
index d94e1c691e..bc8efa6c5a 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java
@@ -7,40 +7,62 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
-import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
-import scala.concurrent.Future;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 abstract class AbstractTransactionContext implements TransactionContext {
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractTransactionContext.class);
+    private final TransactionIdentifier transactionIdentifier;
+    private long modificationCount = 0;
+    private boolean handOffComplete;
+    private final short transactionVersion;
 
-    private final List<Future<Object>> recordedOperationFutures = new ArrayList<>();
-    private final TransactionIdentifier identifier;
+    protected AbstractTransactionContext(TransactionIdentifier transactionIdentifier) {
+        this(transactionIdentifier, DataStoreVersions.CURRENT_VERSION);
+    }
 
-    protected AbstractTransactionContext(TransactionIdentifier identifier) {
-        this.identifier = identifier;
+    protected AbstractTransactionContext(TransactionIdentifier transactionIdentifier, short transactionVersion) {
+        // FIXME: requireNonNull()?
+        this.transactionIdentifier = transactionIdentifier;
+        this.transactionVersion = transactionVersion;
     }
 
-    @Override
-    public final void copyRecordedOperationFutures(Collection<Future<Object>> target) {
-        target.addAll(recordedOperationFutures);
+    /**
+     * Get the transaction identifier associated with this context.
+     *
+     * @return Transaction identifier.
+     */
+    // FIXME: does this imply Identifiable?
+    protected final @NonNull TransactionIdentifier getIdentifier() {
+        return transactionIdentifier;
     }
 
-    protected final TransactionIdentifier getIdentifier() {
-        return identifier;
+    protected final void incrementModificationCount() {
+        modificationCount++;
     }
 
-    protected final Collection<Future<Object>> copyRecordedOperationFutures() {
-        return ImmutableList.copyOf(recordedOperationFutures);
+    protected final void logModificationCount() {
+        LOG.debug("Total modifications on Tx {} = [ {} ]", getIdentifier(), modificationCount);
+    }
+
+    @Override
+    public final void operationHandOffComplete() {
+        handOffComplete = true;
     }
 
-    protected final int recordedOperationCount() {
-        return recordedOperationFutures.size();
+    protected boolean isOperationHandOffComplete() {
+        return handOffComplete;
     }
 
-    protected final void recordOperationFuture(Future<Object> future) {
-        recordedOperationFutures.add(future);
+    @Override
+    public boolean usesOperationLimiting() {
+        return false;
+    }
+
+    @Override
+    public short getTransactionVersion() {
+        return transactionVersion;
     }
 }