From: Robert Varga Date: Thu, 1 Dec 2022 12:31:49 +0000 (+0100) Subject: Switch ABIVersion.current() to CHLORINE_SR2 X-Git-Tag: v7.0.0~19 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=56a1a2d99b0ce96a9bacc5abd01671d8ed3d24dc Switch ABIVersion.current() to CHLORINE_SR2 We should be safe to enable this version by default, reaping serialization overhead benefits. This impacts envelope serialization tests, as those are picking up default versions and flipping it enables new codepath. JIRA: CONTROLLER-2051 Change-Id: I7720871775777bf187137482ad72d473acbece16 Signed-off-by: Robert Varga --- 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 b4278f7d79..7045158de6 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 @@ -123,7 +123,7 @@ public enum ABIVersion implements WritableObject { * @return Current {@link ABIVersion} */ public static @NonNull ABIVersion current() { - return MAGNESIUM; + return CHLORINE_SR2; } /** diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java index 805c0dd528..21d1173c23 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java @@ -58,8 +58,8 @@ public abstract class AbstractRequestFailureTest> @Test public void serializationTest() { final var bytes = SerializationUtils.serialize(object); - assertEquals(legacySize, bytes.length); - assertEquals(expectedSize, SerializationUtils.serialize(object.toVersion(ABIVersion.CHLORINE_SR2)).length); + assertEquals(expectedSize, bytes.length); + assertEquals(legacySize, SerializationUtils.serialize(object.toVersion(ABIVersion.MAGNESIUM)).length); @SuppressWarnings("unchecked") final var deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java index f4ff5eca0d..2cd7c9e6ff 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java @@ -40,8 +40,8 @@ public abstract class AbstractRequestSuccessTest> @Test public void serializationTest() { final var bytes = SerializationUtils.serialize(object); - assertEquals(legacySize, bytes.length); - assertEquals(expectedSize, SerializationUtils.serialize(object.toVersion(ABIVersion.CHLORINE_SR2)).length); + assertEquals(expectedSize, bytes.length); + assertEquals(legacySize, SerializationUtils.serialize(object.toVersion(ABIVersion.MAGNESIUM)).length); @SuppressWarnings("unchecked") final var deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java index 99e72f456a..3c4330417e 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java @@ -60,10 +60,10 @@ public abstract class AbstractRequestTest> { @Test public void serializationTest() { - assertEquals(expectedSize, SerializationUtils.serialize(object.cloneAsVersion(ABIVersion.CHLORINE_SR2)).length); + assertEquals(legacySize, SerializationUtils.serialize(object.cloneAsVersion(ABIVersion.MAGNESIUM)).length); final byte[] bytes = SerializationUtils.serialize(object); - assertEquals(legacySize, bytes.length); + assertEquals(expectedSize, bytes.length); @SuppressWarnings("unchecked") final T deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java index 97015e9aff..a53996676b 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java @@ -21,7 +21,7 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { final var cause = new RuntimeRequestException("msg", new RuntimeException()); final int causeSize = SerializationUtils.serialize(cause).length; return new EnvelopeDetails<>(new FailureEnvelope(new MockFailure(OBJECT, cause, 42), 1L, 2L, 11L), - causeSize + 687); + causeSize + 485); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java index f5e1f28590..30366c99f1 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java @@ -41,7 +41,7 @@ public class RequestEnvelopeTest extends AbstractEnvelopeTest { final int refSize = replyTo.path().toSerializationFormat().length(); return new EnvelopeDetails<>(new RequestEnvelope(new TransactionPurgeRequest(OBJECT, 2L, replyTo), 1L, 2L), - refSize + 584); + refSize + 179); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java index c7a01ef0ec..9d1aa40b61 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java @@ -14,7 +14,7 @@ import org.opendaylight.controller.cluster.access.commands.TransactionAbortSucce public class SuccessEnvelopeTest extends AbstractEnvelopeTest { @Override protected EnvelopeDetails createEnvelope() { - return new EnvelopeDetails<>(new SuccessEnvelope(new TransactionAbortSuccess(OBJECT, 2L), 1L, 2L, 11L), 769); + return new EnvelopeDetails<>(new SuccessEnvelope(new TransactionAbortSuccess(OBJECT, 2L), 1L, 2L, 11L), 180); } @Override