From 21a8c34586d37b6fc59abed2ca2287be3db56e00 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 25 Sep 2019 16:25:08 +0200 Subject: [PATCH] Switch current {ABI,DataStore,Payload}Version to Sodium SR1 This mass-switches versioned resources to use Sodium SR1 streaming format. JIRA: CONTROLLER-1919 Change-Id: Ic712fa04e16c68481eeecccc61d8e6a7dfabac52 Signed-off-by: Robert Varga --- .../opendaylight/controller/cluster/access/ABIVersion.java | 2 +- .../controller/cluster/datastore/DataStoreVersions.java | 2 +- .../persisted/AbstractVersionedShardDataTreeSnapshot.java | 2 +- .../datastore/persisted/MetadataShardDataTreeSnapshot.java | 2 +- .../cluster/datastore/persisted/PayloadVersion.java | 2 +- .../datastore/persisted/CommitTransactionPayloadTest.java | 2 +- .../datastore/persisted/ShardDataTreeSnapshotTest.java | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java index 90949db842..26093c1b23 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java @@ -117,7 +117,7 @@ public enum ABIVersion implements WritableObject { * @return Current {@link ABIVersion} */ public static @NonNull ABIVersion current() { - return NEON_SR2; + return SODIUM_SR1; } /** diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java index 40f06d10ac..79eedd3ef3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java @@ -26,7 +26,7 @@ public final class DataStoreVersions { public static final short NEON_SR2_VERSION = 10; public static final short SODIUM_SR1_VERSION = 11; public static final short MAGNESIUM_VERSION = 12; - public static final short CURRENT_VERSION = NEON_SR2_VERSION; + public static final short CURRENT_VERSION = SODIUM_SR1_VERSION; private DataStoreVersions() { 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 9e6402cda9..2712b24fa7 100644 --- 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 @@ -31,8 +31,8 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps final PayloadVersion version = PayloadVersion.readFrom(in); switch (version) { case BORON: - return new ShardSnapshotState(readSnapshot(in), true); case NEON_SR2: + return new ShardSnapshotState(readSnapshot(in), true); case SODIUM_SR1: case MAGNESIUM: return new ShardSnapshotState(readSnapshot(in), false); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java index 4af3bf77f7..2feb7b78a9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java @@ -135,7 +135,7 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD @Override PayloadVersion version() { - return PayloadVersion.NEON_SR2; + return PayloadVersion.SODIUM_SR1; } private Object writeReplace() { 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 921c9fca96..af85a1336f 100644 --- 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 @@ -134,7 +134,7 @@ public enum PayloadVersion implements WritableObject { * @return Current {@link PayloadVersion} */ public static @NonNull PayloadVersion current() { - return NEON_SR2; + return SODIUM_SR1; } /** diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java index 0886d94fee..e0518a791b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java @@ -107,7 +107,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { @Test public void testCandidateSerialization() throws IOException { final CommitTransactionPayload payload = CommitTransactionPayload.create(nextTransactionId(), candidate); - assertEquals("payload size", 169, payload.size()); + assertEquals("payload size", 156, payload.size()); } @Test diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java index 9327f6262f..5adf2cb6bd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java @@ -48,7 +48,7 @@ public class ShardDataTreeSnapshotTest { } final byte[] bytes = bos.toByteArray(); - assertEquals(242, bytes.length); + assertEquals(236, bytes.length); ShardDataTreeSnapshot deserialized; try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes))) { @@ -77,7 +77,7 @@ public class ShardDataTreeSnapshotTest { } final byte[] bytes = bos.toByteArray(); - assertEquals(390, bytes.length); + assertEquals(384, bytes.length); ShardDataTreeSnapshot deserialized; try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes))) { -- 2.36.6