X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fconcepts%2FLocalHistoryIdentifier.java;h=29e3df74f5657a9697731d4cdc60c526a8baf14d;hb=cd2a6fa0d8fa6281be28d3c7b9828ecf4e932811;hp=4eb26270c4e078b099f32b9f0d2e721e5e03e810;hpb=a06a30a33507689464c736cb37c26445f232280e;p=controller.git

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java
index 4eb26270c4..29e3df74f5 100644
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java
@@ -15,63 +15,93 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import org.opendaylight.yangtools.concepts.Identifier;
+import org.opendaylight.yangtools.concepts.WritableIdentifier;
+import org.opendaylight.yangtools.concepts.WritableObjects;
 
 /**
- * Globally-unique identifier of a local history.
+ * Globally-unique identifier of a local history. This identifier is assigned on the frontend and is composed of
+ * - a {@link ClientIdentifier}, which uniquely identifies a single instantiation of a particular frontend
+ * - an unsigned long, which uniquely identifies the history on the backend
+ * - an unsigned long cookie, assigned by the client and meaningless on the backend, which just reflects it back
  *
  * @author Robert Varga
  */
-public final class LocalHistoryIdentifier implements Identifier, WritableObject {
+public final class LocalHistoryIdentifier implements WritableIdentifier {
+    /*
+     * Implementation note: cookie is currently required only for module-based sharding, which is implemented as part
+     *                      of normal DataBroker interfaces. For DOMDataTreeProducer cookie will always be zero, hence
+     *                      we may end up not needing cookie at all.
+     *
+     *                      We use WritableObjects.writeLongs() to output historyId and cookie (in that order). If we
+     *                      end up not needing the cookie at all, we can switch to writeLong() and use zero flags for
+     *                      compatibility.
+     */
     private static final class Proxy implements Externalizable {
         private static final long serialVersionUID = 1L;
         private ClientIdentifier clientId;
         private long historyId;
+        private long cookie;
 
+        // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to
+        // be able to create instances via reflection.
+        @SuppressWarnings("checkstyle:RedundantModifier")
         public Proxy() {
             // For Externalizable
         }
 
-        Proxy(final ClientIdentifier frontendId, final long historyId) {
+        Proxy(final ClientIdentifier frontendId, final long historyId, final long cookie) {
             this.clientId = Preconditions.checkNotNull(frontendId);
             this.historyId = historyId;
+            this.cookie = cookie;
         }
 
         @Override
         public void writeExternal(final ObjectOutput out) throws IOException {
             clientId.writeTo(out);
-            WritableObjects.writeLong(out, historyId);
+            WritableObjects.writeLongs(out, historyId, cookie);
         }
 
         @Override
         public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
             clientId = ClientIdentifier.readFrom(in);
-            historyId = WritableObjects.readLong(in);
+
+            final byte header = WritableObjects.readLongHeader(in);
+            historyId = WritableObjects.readFirstLong(in, header);
+            cookie = WritableObjects.readSecondLong(in, header);
         }
 
         private Object readResolve() {
-            return new LocalHistoryIdentifier(clientId, historyId);
+            return new LocalHistoryIdentifier(clientId, historyId, cookie);
         }
     }
 
     private static final long serialVersionUID = 1L;
     private final ClientIdentifier clientId;
     private final long historyId;
+    private final long cookie;
 
     public LocalHistoryIdentifier(final ClientIdentifier frontendId, final long historyId) {
+        this(frontendId, historyId, 0);
+    }
+
+    public LocalHistoryIdentifier(final ClientIdentifier frontendId, final long historyId, final long cookie) {
         this.clientId = Preconditions.checkNotNull(frontendId);
         this.historyId = historyId;
+        this.cookie = cookie;
     }
 
     public static LocalHistoryIdentifier readFrom(final DataInput in) throws IOException {
         final ClientIdentifier clientId = ClientIdentifier.readFrom(in);
-        return new LocalHistoryIdentifier(clientId, WritableObjects.readLong(in));
+
+        final byte header = WritableObjects.readLongHeader(in);
+        return new LocalHistoryIdentifier(clientId, WritableObjects.readFirstLong(in, header),
+            WritableObjects.readSecondLong(in, header));
     }
 
     @Override
     public void writeTo(final DataOutput out) throws IOException {
         clientId.writeTo(out);
-        WritableObjects.writeLong(out, historyId);
+        WritableObjects.writeLongs(out, historyId, cookie);
     }
 
     public ClientIdentifier getClientId() {
@@ -82,31 +112,39 @@ public final class LocalHistoryIdentifier implements Identifier, WritableObject
         return historyId;
     }
 
+    public long getCookie() {
+        return cookie;
+    }
+
     @Override
     public int hashCode() {
-        return clientId.hashCode() * 31 + Long.hashCode(historyId);
+        int ret = clientId.hashCode();
+        ret = 31 * ret + Long.hashCode(historyId);
+        ret = 31 * ret + Long.hashCode(cookie);
+        return ret;
     }
 
     @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
+    public boolean equals(final Object obj) {
+        if (this == obj) {
             return true;
         }
-        if (!(o instanceof LocalHistoryIdentifier)) {
+        if (!(obj instanceof LocalHistoryIdentifier)) {
             return false;
         }
 
-        final LocalHistoryIdentifier other = (LocalHistoryIdentifier) o;
-        return historyId == other.historyId && clientId.equals(other.clientId);
+        final LocalHistoryIdentifier other = (LocalHistoryIdentifier) obj;
+        return historyId == other.historyId && cookie == other.cookie && clientId.equals(other.clientId);
     }
 
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(LocalHistoryIdentifier.class).add("client", clientId)
-                .add("history", Long.toUnsignedString(historyId)).toString();
+                .add("history", Long.toUnsignedString(historyId, 16))
+                .add("cookie", Long.toUnsignedString(cookie, 16)).toString();
     }
 
     private Object writeReplace() {
-        return new Proxy(clientId, historyId);
+        return new Proxy(clientId, historyId, cookie);
     }
 }