X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2Fspi%2Fdata%2FSnapshotBackedReadTransaction.java;h=bb402f8037752b661e095958b9e396dadf615f8e;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hp=8e5957c71a3f76e6f7a62ac146cce8bfbe4e6159;hpb=cac7138ddd81d1cc801d4b6cd9bc4372e0a8ddd3;p=controller.git
diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java
index 8e5957c71a..bb402f8037 100644
--- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java
+++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java
@@ -7,12 +7,13 @@
*/
package org.opendaylight.controller.sal.core.spi.data;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.annotations.Beta;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -21,17 +22,29 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
+ * Implementation of read-only transaction backed by {@link DataTreeSnapshot}.
*
- * Implementation of read-only transaction backed by {@link DataTreeSnapshot}
- *
+ *
* Implementation of read-only transaction backed by {@link DataTreeSnapshot}
* which delegates most of its calls to similar methods provided by underlying snapshot.
*
- * identifier type
+ * @param identifier type
+ *
+ * @deprecated Use {@link org.opendaylight.mdsal.dom.spi.store.SnapshotBackedReadTransaction} instead.
*/
+@Deprecated(forRemoval = true)
@Beta
-public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTransaction implements DOMStoreReadTransaction {
+public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTransaction
+ implements DOMStoreReadTransaction {
private static final Logger LOG = LoggerFactory.getLogger(SnapshotBackedReadTransaction.class);
+
+ @SuppressWarnings("rawtypes")
+ private static final AtomicReferenceFieldUpdater SNAPSHOT_UPDATER =
+ AtomicReferenceFieldUpdater.newUpdater(SnapshotBackedReadTransaction.class, DataTreeSnapshot.class,
+ "stableSnapshot");
+
+ // Guarded by stableSnapshot CAS, hence it does not need to be volatile
+ private TransactionClosePrototype closeImpl;
private volatile DataTreeSnapshot stableSnapshot;
/**
@@ -41,22 +54,34 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran
* @param debug Enable transaction debugging
* @param snapshot Snapshot which will be modified.
*/
- SnapshotBackedReadTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot) {
+ SnapshotBackedReadTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot,
+ final TransactionClosePrototype closeImpl) {
super(identifier, debug);
- this.stableSnapshot = Preconditions.checkNotNull(snapshot);
+ this.stableSnapshot = requireNonNull(snapshot);
+ this.closeImpl = closeImpl;
LOG.debug("ReadOnly Tx: {} allocated with snapshot {}", identifier, snapshot);
}
@Override
public void close() {
+ final DataTreeSnapshot prev = SNAPSHOT_UPDATER.getAndSet(this, null);
+ if (prev == null) {
+ LOG.debug("Store transaction: {} : previously closed", getIdentifier());
+ return;
+ }
+
LOG.debug("Store transaction: {} : Closed", getIdentifier());
- stableSnapshot = null;
+ if (closeImpl != null) {
+ closeImpl.transactionClosed(this);
+ closeImpl = null;
+ }
}
@Override
+ @SuppressWarnings("checkstyle:IllegalCatch")
public CheckedFuture>, ReadFailedException> read(final YangInstanceIdentifier path) {
LOG.debug("Tx: {} Read: {}", getIdentifier(), path);
- checkNotNull(path, "Path must not be null.");
+ requireNonNull(path, "Path must not be null.");
final DataTreeSnapshot snapshot = stableSnapshot;
if (snapshot == null) {
@@ -64,8 +89,8 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran
}
try {
- return Futures.immediateCheckedFuture(snapshot.readNode(path));
- } catch (Exception e) {
+ return Futures.immediateCheckedFuture(Optional.fromJavaUtil(snapshot.readNode(path)));
+ } catch (RuntimeException e) {
LOG.error("Tx: {} Failed Read of {}", getIdentifier(), path, e);
return Futures.immediateFailedCheckedFuture(new ReadFailedException("Read failed",e));
}
@@ -74,7 +99,7 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran
@Override
public CheckedFuture exists(final YangInstanceIdentifier path) {
LOG.debug("Tx: {} Exists: {}", getIdentifier(), path);
- checkNotNull(path, "Path must not be null.");
+ requireNonNull(path, "Path must not be null.");
try {
return Futures.immediateCheckedFuture(read(path).checkedGet().isPresent());
@@ -82,4 +107,23 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran
return Futures.immediateFailedCheckedFuture(e);
}
}
+
+ /**
+ * Prototype implementation of {@link SnapshotBackedReadTransaction#close()}.
+ *
+ *
+ * This class is intended to be implemented by Transaction factories responsible for allocation
+ * of {@link org.opendaylight.mdsal.dom.spi.store.SnapshotBackedReadTransaction} and
+ * providing underlying logic for applying implementation.
+ *
+ * @param identifier type
+ */
+ public interface TransactionClosePrototype {
+ /**
+ * Called when a transaction is closed. This is not invoked at most once for every transaction.
+ *
+ * @param tx Transaction which got closed.
+ */
+ void transactionClosed(SnapshotBackedReadTransaction tx);
+ }
}