You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/01/16 02:03:18 UTC
[geode] branch develop updated: GEODE-8841: Add version ordinals
for GEODE_1_12_1 and GEODE_1_13_1 (#5914)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 3a57b95 GEODE-8841: Add version ordinals for GEODE_1_12_1 and GEODE_1_13_1 (#5914)
3a57b95 is described below
commit 3a57b956acc098dce083129334bbc2403d626176
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Fri Jan 15 18:02:14 2021 -0800
GEODE-8841: Add version ordinals for GEODE_1_12_1 and GEODE_1_13_1 (#5914)
Authored-by: Jens Deppe <jd...@vmware.com>
---
.../internal/cache/tier/sockets/CommandInitializer.java | 2 ++
.../cache/tier/sockets/CommandInitializerJUnitTest.java | 2 +-
.../apache/geode/internal/serialization/KnownVersion.java | 14 ++++++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index cbce1b2..aa9053b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -340,7 +340,9 @@ public class CommandInitializer {
allCommands.put(KnownVersion.GEODE_1_10_0, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_11_0, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_12_0, geode18Commands);
+ allCommands.put(KnownVersion.GEODE_1_12_1, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_13_0, geode18Commands);
+ allCommands.put(KnownVersion.GEODE_1_13_1, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_14_0, geode18Commands);
return Collections.unmodifiableMap(allCommands);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
index 6a28398..cf549a8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java
@@ -24,7 +24,7 @@ public class CommandInitializerJUnitTest {
public void testCommandMapContainsAllVersions() {
for (KnownVersion version : KnownVersion.getAllVersions()) {
org.junit.Assert.assertNotNull(
- "Please add a commnd set for " + version + " of Geode to CommandInitializer",
+ "Please add a command set for " + version + " of Geode to CommandInitializer",
CommandInitializer.getCommands(version));
}
}
diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
index b4675b7..d3edbd5 100644
--- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
+++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
@@ -285,6 +285,13 @@ public class KnownVersion extends AbstractVersion {
new KnownVersion("GEODE", "1.12.0", (byte) 1, (byte) 12, (byte) 0, (byte) 0,
GEODE_1_12_0_ORDINAL);
+ private static final short GEODE_1_12_1_ORDINAL = 116;
+
+ @Immutable
+ public static final KnownVersion GEODE_1_12_1 =
+ new KnownVersion("GEODE", "1.12.1", (byte) 1, (byte) 12, (byte) 1, (byte) 0,
+ GEODE_1_12_1_ORDINAL);
+
private static final short GEODE_1_13_0_ORDINAL = 120;
@Immutable
@@ -292,6 +299,13 @@ public class KnownVersion extends AbstractVersion {
new KnownVersion("GEODE", "1.13.0", (byte) 1, (byte) 13, (byte) 0, (byte) 0,
GEODE_1_13_0_ORDINAL);
+ private static final short GEODE_1_13_1_ORDINAL = 121;
+
+ @Immutable
+ public static final KnownVersion GEODE_1_13_1 =
+ new KnownVersion("GEODE", "1.13.1", (byte) 1, (byte) 13, (byte) 1, (byte) 0,
+ GEODE_1_13_1_ORDINAL);
+
private static final short GEODE_1_14_0_ORDINAL = 125;
@Immutable