Define PayloadVersion.SODIUM_SR1

This adds the PayloadVersion which uses Sodium SR1 normalized node
stream.

JIRA: CONTROLLER-1919
Change-Id: I3dfa6ea053ea356bb68b458f3d6787904b2904c0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
index 9e8c5f02c219dc8859b166b412f12f5193c093de..96ab0ca5e6cb21c6342b4284c5ea7964b3880217 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java
@@ -33,6 +33,7 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps
             case BORON:
                 return new ShardSnapshotState(readSnapshot(in), true);
             case NEON_SR2:
             case BORON:
                 return new ShardSnapshotState(readSnapshot(in), true);
             case NEON_SR2:

+            case SODIUM_SR1:

                 return new ShardSnapshotState(readSnapshot(in), false);
             case TEST_FUTURE_VERSION:
             case TEST_PAST_VERSION:
                 return new ShardSnapshotState(readSnapshot(in), false);
             case TEST_FUTURE_VERSION:
             case TEST_PAST_VERSION:


@@ -76,7 +77,8 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps
         switch (version) {
             case BORON:
             case NEON_SR2:
         switch (version) {
             case BORON:
             case NEON_SR2:

-                // Boron and Sodium snapshots use Java Serialization, but differ in stream format
+            case SODIUM_SR1:
+                // Boron, NeonSR2 and Sodium snapshots use Java Serialization, but differ in stream format

                 out.writeObject(this);
                 return;
             case TEST_FUTURE_VERSION:
                 out.writeObject(this);
                 return;
             case TEST_FUTURE_VERSION:

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java
index 819ede782592945c446feed9eadbe2df32c77b21..272cc7e80e430b5bfbf9bd5590b4543f02a304da 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java
@@ -71,6 +71,17 @@ public enum PayloadVersion implements WritableObject {
         }
     },
 
         }
     },
 

+    /**
+     * Revised payload version. Payloads remain the same as {@link #NEON_SR2}, but messages bearing QNames in any shape
+     * are using {@link NormalizedNodeStreamVersion#SODIUM_SR1}, which improves encoding.
+     */
+    SODIUM_SR1(7) {
+        @Override
+        public NormalizedNodeStreamVersion getStreamVersion() {
+            return NormalizedNodeStreamVersion.SODIUM_SR1;
+        }
+    },
+

     /**
      * Version which is newer than any other version. This version exists purely for testing purposes.
      */
     /**
      * Version which is newer than any other version. This version exists purely for testing purposes.
      */


@@ -137,8 +148,10 @@ public enum PayloadVersion implements WritableObject {
                 return BORON;
             case 6:
                 return NEON_SR2;
                 return BORON;
             case 6:
                 return NEON_SR2;

+            case 7:
+                return SODIUM_SR1;

             default:
             default:

-                throw new FutureVersionException(version, NEON_SR2);
+                throw new FutureVersionException(version, SODIUM_SR1);

         }
     }
 
         }
     }