You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2021/08/17 18:17:33 UTC
[geode] 01/18: GEODE-8870: Remove GFE_80
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f85bc83e4d45f7529fcd293769fa5c86388e51e5
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Thu May 20 14:24:24 2021 -0700
GEODE-8870: Remove GFE_80
* Fixes missing Geode 1.6 version in CliFunctionResult.
---
.../codeAnalysis/sanctionedDataSerializables.txt | 39 +++++--------
.../client/internal/ClientSideHandshakeImpl.java | 6 +-
.../internal/admin/remote/ClientHealthStats.java | 16 +-----
.../internal/cache/AbstractUpdateOperation.java | 9 +--
.../apache/geode/internal/cache/DiskInitFile.java | 9 +--
.../org/apache/geode/internal/cache/EventID.java | 17 +-----
.../geode/internal/cache/FilterRoutingInfo.java | 48 +---------------
.../internal/cache/InitialImageOperation.java | 41 +------------
.../geode/internal/cache/PartitionedRegion.java | 9 ---
.../internal/cache/tier/sockets/BaseCommand.java | 6 +-
.../tier/sockets/ServerSideHandshakeImpl.java | 7 +--
.../cache/tier/sockets/VersionedObjectList.java | 30 +---------
.../sockets/command/GatewayReceiverCommand.java | 13 -----
.../tier/sockets/command/RegisterInterest61.java | 7 +--
.../sockets/command/RegisterInterestList66.java | 7 +--
.../internal/cache/wan/GatewaySenderAdvisor.java | 67 +---------------------
.../org/apache/geode/internal/tcp/Connection.java | 11 ++--
.../internal/functions/CliFunctionResult.java | 20 ++-----
.../sockets/command/RegisterInterest61Test.java | 2 +-
.../command/RegisterInterestList66Test.java | 2 +-
.../serialization/DataSerializableFixedID.java | 18 +++---
.../geode/internal/serialization/KnownVersion.java | 9 ---
22 files changed, 56 insertions(+), 337 deletions(-)
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 7dc9a4d..5ae2b40 100644
--- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -404,13 +404,11 @@ org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage,2
fromData,17
toData,17
-org/apache/geode/internal/admin/remote/ClientHealthStats,6
+org/apache/geode/internal/admin/remote/ClientHealthStats,4
fromData,73
-fromDataPre_GEODE_1_9_0_0,15
-fromDataPre_GFE_8_0_0_0,68
+fromDataPre_GEODE_1_9_0_0,76
toData,73
-toDataPre_GEODE_1_9_0_0,15
-toDataPre_GFE_8_0_0_0,68
+toDataPre_GEODE_1_9_0_0,76
org/apache/geode/internal/admin/remote/CompactRequest,2
fromData,7
@@ -897,11 +895,9 @@ org/apache/geode/internal/cache/EntrySnapshot,2
fromData,50
toData,22
-org/apache/geode/internal/cache/EventID,4
+org/apache/geode/internal/cache/EventID,2
fromData,53
-fromDataPre_GFE_8_0_0_0,33
toData,106
-toDataPre_GFE_8_0_0_0,24
org/apache/geode/internal/cache/EvictionAttributesImpl,2
fromData,33
@@ -923,11 +919,9 @@ org/apache/geode/internal/cache/FilterRoutingInfo,2
fromData,88
toData,88
-org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4
+org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,2
fromData,9
-fromDataPre_GFE_8_0_0_0,50
toData,247
-toDataPre_GFE_8_0_0_0,213
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
fromData,25
@@ -979,14 +973,14 @@ toData,109
org/apache/geode/internal/cache/InitialImageOperation$FilterInfoMessage,2
fromData,231
-toData,285
+toData,231
org/apache/geode/internal/cache/InitialImageOperation$ImageReplyMessage,2
-fromData,237
+fromData,243
toData,246
org/apache/geode/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2
-fromData,422
+fromData,418
toData,407
org/apache/geode/internal/cache/InitialImageOperation$RVVReplyMessage,2
@@ -994,7 +988,7 @@ fromData,36
toData,53
org/apache/geode/internal/cache/InitialImageOperation$RegionStateMessage,2
-fromData,69
+fromData,75
toData,102
org/apache/geode/internal/cache/InitialImageOperation$RequestFilterInfoMessage,2
@@ -1771,16 +1765,13 @@ org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage,2
fromData,55
toData,33
-org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,4
+org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,2
fromData,558
-fromDataPre_GFE_8_0_0_0,7
-toDataPre_GFE_8_0_0_0,11
toData,636
-org/apache/geode/internal/cache/tier/sockets/VersionedObjectList$Chunker,3
+org/apache/geode/internal/cache/tier/sockets/VersionedObjectList$Chunker,2
fromData,10
toData,41
-toDataPre_GFE_8_0_0_0,21
org/apache/geode/internal/cache/tx/DistTxEntryEvent,2
fromData,104
@@ -1906,13 +1897,11 @@ org/apache/geode/internal/cache/versions/VersionTag,2
fromData,225
toData,254
-org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,6
+org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,4
fromData,17
fromDataPre_GEODE_1_14_0_0,283
-fromDataPre_GFE_8_0_0_0,188
toData,17
toDataPre_GEODE_1_14_0_0,271
-toDataPre_GFE_8_0_0_0,236
org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2
fromData,65
@@ -2004,13 +1993,11 @@ org/apache/geode/management/internal/configuration/messages/SharedConfigurationS
fromData,22
toData,20
-org/apache/geode/management/internal/functions/CliFunctionResult,6
+org/apache/geode/management/internal/functions/CliFunctionResult,4
fromData,20
fromDataPre_GEODE_1_6_0_0,86
-fromDataPre_GFE_8_0_0_0,39
toData,15
toDataPre_GEODE_1_6_0_0,65
-toDataPre_GFE_8_0_0_0,33
org/apache/geode/management/internal/messages/CompactRequest,2
fromData,15
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
index 2c14ff2..287c137 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
@@ -245,11 +245,9 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand
+ " matches this sites distributed system id " + localDistributedSystemId);
}
}
+
// Read the PDX registry size from the remote size
- if (communicationMode.isWAN()
- && KnownVersion.GFE_80
- .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0
- && currentClientVersion.isNotOlderThan(KnownVersion.GFE_80)) {
+ if (communicationMode.isWAN()) {
int remotePdxSize = dis.readInt();
serverQStatus.setPdxSize(remotePdxSize);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
index edfef14..b8ec756 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
@@ -96,7 +96,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
/** The versions in which this message was modified */
@Immutable
private static final KnownVersion[] dsfidVersions =
- new KnownVersion[] {KnownVersion.GFE_80, KnownVersion.GEODE_1_9_0};
+ new KnownVersion[] {KnownVersion.GEODE_1_9_0};
public ClientHealthStats() {}
@@ -238,7 +238,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
DataSerializer.writeHashMap((poolStats), out);
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out, SerializationContext context)
+ public void toDataPre_GEODE_1_9_0_0(DataOutput out, SerializationContext context)
throws IOException {
DataSerializer.writePrimitiveInt((int) numOfGets, out);
DataSerializer.writePrimitiveInt((int) numOfPuts, out);
@@ -248,11 +248,6 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
DataSerializer.writePrimitiveInt(cpus, out);
DataSerializer.writePrimitiveLong(processCpuTime, out);
DataSerializer.writeDate(updateTime, out);
- }
-
- public void toDataPre_GEODE_1_9_0_0(DataOutput out, SerializationContext context)
- throws IOException {
- toDataPre_GFE_8_0_0_0(out, context);
DataSerializer.writeHashMap((poolStats), out);
}
@@ -270,7 +265,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
this.poolStats = DataSerializer.readHashMap(in);
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in, DeserializationContext context)
+ public void fromDataPre_GEODE_1_9_0_0(DataInput in, DeserializationContext context)
throws IOException, ClassNotFoundException {
this.numOfGets = DataSerializer.readPrimitiveInt(in);
this.numOfPuts = DataSerializer.readPrimitiveInt(in);
@@ -280,11 +275,6 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
this.cpus = DataSerializer.readPrimitiveInt(in);
this.processCpuTime = DataSerializer.readPrimitiveLong(in);
this.updateTime = DataSerializer.readDate(in);
- }
-
- public void fromDataPre_GEODE_1_9_0_0(DataInput in, DeserializationContext context)
- throws IOException, ClassNotFoundException {
- fromDataPre_GFE_8_0_0_0(in, context);
this.poolStats = DataSerializer.readHashMap(in);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
index 66eb2a2..69bfa39 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.InternalGemFireException;
import org.apache.geode.InvalidVersionException;
import org.apache.geode.annotations.internal.MutableForTesting;
import org.apache.geode.cache.CacheEvent;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.serialization.DeserializationContext;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.internal.serialization.SerializationContext;
import org.apache.geode.logging.internal.log4j.api.LogService;
@@ -342,11 +340,8 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
logger.debug("Version tag is missing the memberID: {}", tag);
}
- String msg =
- String.format("memberID cannot be null for persistent regions: %s", tag);
- RuntimeException ex = (sender.getVersion().isOlderThan(KnownVersion.GFE_80))
- ? new InternalGemFireException(msg) : new InvalidVersionException(msg);
- throw ex;
+ throw new InvalidVersionException(
+ String.format("memberID cannot be null for persistent regions: %s", tag));
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
index b6fc6c2..fb6b2d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
@@ -541,16 +541,11 @@ public class DiskInitFile implements DiskInitFileInterpreter {
String compressorClassName, boolean offHeap) {
DiskRegionView dr = getDiskRegionById(drId);
if (dr != null) {
- // We need to add the IS_WITH_VERSIONING to persistent regions
- // during the upgrade. Previously, all regions had versioning enabled
- // but now only regions that have this flag will have versioning enabled.
- //
// We don't want gateway queues to turn on versioning. Unfortunately, the only
// way to indentify that a region is a gateway queue is by the region
// name.
- if (KnownVersion.GFE_80.compareTo(currentRecoveredGFVersion()) > 0
- && !dr.getName().contains("_SERIAL_GATEWAY_SENDER_QUEUE")
- && !dr.getName().contains("_PARALLEL__GATEWAY__SENDER__QUEUE")) {
+ if (!(dr.getName().contains("_SERIAL_GATEWAY_SENDER_QUEUE")
+ || dr.getName().contains("_PARALLEL__GATEWAY__SENDER__QUEUE"))) {
flags.add(DiskRegionFlag.IS_WITH_VERSIONING);
}
dr.setConfig(lruAlgorithm, lruAction, lruLimit, concurrencyLevel, initialCapacity, loadFactor,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
index 5a790da..a359fa4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
@@ -87,7 +87,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
/** The versions in which this message was modified */
@Immutable
- private static final KnownVersion[] dsfidVersions = new KnownVersion[] {KnownVersion.GFE_80};
+ private static final KnownVersion[] dsfidVersions = new KnownVersion[0];
private static final ThreadLocal threadIDLocal = new ThreadLocal() {
@@ -370,13 +370,6 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
dop.writeByte(this.breadcrumbCounter);
}
- public void toDataPre_GFE_8_0_0_0(DataOutput dop, SerializationContext context)
- throws IOException {
- DataSerializer.writeByteArray(this.membershipID, dop);
- DataSerializer.writeByteArray(getOptimizedByteArrayForEventID(this.threadID, this.sequenceID),
- dop);
- }
-
@Override
public void fromData(DataInput di,
DeserializationContext context) throws IOException, ClassNotFoundException {
@@ -388,14 +381,6 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
this.breadcrumbCounter = di.readByte();
}
- public void fromDataPre_GFE_8_0_0_0(DataInput di, DeserializationContext context)
- throws IOException, ClassNotFoundException {
- this.membershipID = DataSerializer.readByteArray(di);
- ByteBuffer eventIdParts = ByteBuffer.wrap(DataSerializer.readByteArray(di));
- this.threadID = readEventIdPartsFromOptmizedByteArray(eventIdParts);
- this.sequenceID = readEventIdPartsFromOptmizedByteArray(eventIdParts);
- }
-
@Override
public void writeExternal(ObjectOutput out) throws IOException {
DataSerializer.writeByteArray(this.membershipID, out);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index 13dceb1..ca7c4b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -30,7 +30,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.ObjToByteArraySerializer;
import org.apache.geode.internal.VersionedDataSerializable;
import org.apache.geode.internal.serialization.ByteArrayDataInput;
import org.apache.geode.internal.serialization.KnownVersion;
@@ -306,8 +305,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
}
@Immutable
- private static final KnownVersion[] serializationVersions =
- new KnownVersion[] {KnownVersion.GFE_80};
+ private static final KnownVersion[] serializationVersions = new KnownVersion[0];
@Override
public KnownVersion[] getSerializationVersions() {
@@ -348,50 +346,6 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
DataSerializer.writeByteArray(myData, hdos.size(), out);
}
- @SuppressWarnings("unused") // used by deserialization
- public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
- if (OLD_MEMBERS_OPTIMIZED) {
- myDataVersion = StaticSerialization.getVersionForDataStreamOrNull(in);
- myData = DataSerializer.readByteArray(in);
- } else {
- cqs = DataSerializer.readHashMap(in);
- interestedClients = InternalDataSerializer.readSetOfLongs(in);
- interestedClientsInv = InternalDataSerializer.readSetOfLongs(in);
- }
- }
-
- @SuppressWarnings("unused") // used by serialization
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
- if (OLD_MEMBERS_OPTIMIZED) {
- HeapDataOutputStream hdos =
- new HeapDataOutputStream(1000, StaticSerialization.getVersionForDataStream(out));
- if (cqs == null) {
- hdos.writeBoolean(false);
- } else {
- hdos.writeBoolean(true);
- InternalDataSerializer.writeArrayLength(cqs.size(), hdos);
- for (final Map.Entry<Long, Integer> longIntegerEntry : cqs.entrySet()) {
- // most cq IDs and all event types are small ints, so we use an optimized
- // write that serializes 7 bits at a time in a compact form
- InternalDataSerializer.writeUnsignedVL(longIntegerEntry.getKey(), hdos);
- InternalDataSerializer.writeUnsignedVL(longIntegerEntry.getValue(), hdos);
- }
- }
- InternalDataSerializer.writeSetOfLongs(interestedClients, longIDs, hdos);
- InternalDataSerializer.writeSetOfLongs(interestedClientsInv, longIDs, hdos);
- if (out instanceof HeapDataOutputStream) {
- ((ObjToByteArraySerializer) out).writeAsSerializedByteArray(hdos);
- } else {
- byte[] myData = hdos.toByteArray();
- DataSerializer.writeByteArray(myData, out);
- }
- } else {
- DataSerializer.writeHashMap(cqs, out);
- InternalDataSerializer.writeSetOfLongs(interestedClients, longIDs, out);
- InternalDataSerializer.writeSetOfLongs(interestedClientsInv, longIDs, out);
- }
- }
-
public HashMap<Long, Integer> getCQs() {
if (cqs == null && myData != null) {
deserialize();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index e5b51d6..f434784 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -338,15 +338,11 @@ public class InitialImageOperation {
}
final ClusterDistributionManager dm =
(ClusterDistributionManager) this.region.getDistributionManager();
- boolean allowDeltaGII = true;
- if (FORCE_FULL_GII || recipient.getVersion().isOlderThan(KnownVersion.GFE_80)) {
- allowDeltaGII = false;
- }
+ final boolean allowDeltaGII = !FORCE_FULL_GII;
Set keysOfUnfinishedOps = null;
RegionVersionVector received_rvv = null;
RegionVersionVector remote_rvv = null;
- if (this.region.getConcurrencyChecksEnabled()
- && recipient.getVersion().isNotOlderThan(KnownVersion.GFE_80)) {
+ if (this.region.getConcurrencyChecksEnabled()) {
if (internalBeforeRequestRVV != null
&& internalBeforeRequestRVV.getRegionName().equals(this.region.getName())) {
internalBeforeRequestRVV.run();
@@ -746,12 +742,6 @@ public class InitialImageOperation {
msg.regionPath = this.region.getFullPath();
msg.lostVersionSources = needsSync.toArray(new VersionSource[0]);
Set recipients = this.region.getCacheDistributionAdvisor().adviseReplicates();
- for (Iterator it = recipients.iterator(); it.hasNext();) {
- InternalDistributedMember mbr = (InternalDistributedMember) it.next();
- if (mbr.getVersion().isOlderThan(KnownVersion.GFE_80)) {
- it.remove();
- }
- }
if (!recipients.isEmpty()) {
msg.setRecipients(recipients);
if (logger.isDebugEnabled()) {
@@ -1176,22 +1166,6 @@ public class InitialImageOperation {
msg.getSender());
region.recordEventState(msg.getSender(), msg.eventState);
}
- if (msg.versionVector != null
- && msg.getSender().getVersion().isOlderThan(KnownVersion.GFE_80)
- && region.getConcurrencyChecksEnabled()) {
- // for older version, save received rvv from RegionStateMessage
- logger.debug("Applying version vector to {}: {}", region.getName(), msg.versionVector);
- // pack the original RVV, then save the received one
- if (internalBeforeSavedReceivedRVV != null
- && internalBeforeSavedReceivedRVV.getRegionName().equals(region.getName())) {
- internalBeforeSavedReceivedRVV.run();
- }
- saveReceivedRVV(msg.versionVector);
- if (internalAfterSavedReceivedRVV != null
- && internalAfterSavedReceivedRVV.getRegionName().equals(region.getName())) {
- internalAfterSavedReceivedRVV.run();
- }
- }
}
/**
@@ -1587,10 +1561,6 @@ public class InitialImageOperation {
}
public boolean goWithFullGII(DistributedRegion rgn, RegionVersionVector requesterRVV) {
- if (getSender().getVersion().isOlderThan(KnownVersion.GFE_80)) {
- // pre-8.0 could not handle a delta-GII
- return true;
- }
if (!rgn.getDataPolicy().withPersistence()) {
// non-persistent regions always do full GII
if (logger.isDebugEnabled()) {
@@ -1734,13 +1704,6 @@ public class InitialImageOperation {
if (eventState != null && eventState.size() > 0) {
RegionStateMessage.send(dm, getSender(), this.processorId, eventState, true);
}
- } else if (getSender().getVersion().isOlderThan(KnownVersion.GFE_80)) {
- // older versions of the product expect a RegionStateMessage at this point
- if (rgn.getConcurrencyChecksEnabled() && this.versionVector == null
- && !recoveringForLostMember) {
- RegionVersionVector rvv = rgn.getVersionVector().getCloneForTransmission();
- RegionStateMessage.send(dm, getSender(), this.processorId, rvv, false);
- }
}
if (this.checkTombstoneVersions && this.versionVector != null
&& rgn.getConcurrencyChecksEnabled()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 7289a6f..e7c4f21 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -247,7 +247,6 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.sequencelog.RegionLogger;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.internal.size.Sizeable;
import org.apache.geode.internal.statistics.StatisticsClock;
import org.apache.geode.internal.util.TransformUtils;
@@ -4713,10 +4712,6 @@ public class PartitionedRegion extends LocalRegion
oneBucketKeys.clear();
oneBucketKeys.put(e.getKey(), e.getValue());
try {
- if (entry.getKey().getVersion().isOlderThan(KnownVersion.GFE_80)) {
- failures.putAll(nodeToBuckets.get(entry.getKey()));
- continue;
- }
fber =
FetchBulkEntriesMessage.send(entry.getKey(), this, oneBucketKeys, null, null, true);
@@ -4765,10 +4760,6 @@ public class PartitionedRegion extends LocalRegion
bucketId.clear();
bucketId.add(bucket);
try {
- if (entry.getKey().getVersion().isOlderThan(KnownVersion.GFE_80)) {
- failures.addAll(nodeToBuckets.get(entry.getKey()));
- continue;
- }
fber = FetchBulkEntriesMessage.send(entry.getKey(), this, null, bucketId, regex, true);
BucketDump[] bds = fber.waitForEntries();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index eeecdd8..dcb1626 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -80,7 +80,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.sequencelog.EntryLogger;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.util.internal.GeodeGlossary;
@@ -857,7 +856,7 @@ public abstract class BaseCommand implements Command {
sendRegisterInterestResponseChunk(region, riKey, new ArrayList<>(), true, servConn);
return;
}
- if (policy.isKeysValues() && servConn.getClientVersion().isNotOlderThan(KnownVersion.GFE_80)) {
+ if (policy.isKeysValues()) {
handleKeysValuesPolicy(region, riKey, interestType, serializeValues, servConn);
return;
}
@@ -974,8 +973,7 @@ public abstract class BaseCommand implements Command {
*/
private static boolean sendTombstonesInRIResults(ServerConnection servConn,
InterestResultPolicy policy) {
- return policy == InterestResultPolicy.KEYS_VALUES
- && servConn.getClientVersion().isNotOlderThan(KnownVersion.GFE_80);
+ return policy == InterestResultPolicy.KEYS_VALUES;
}
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
index 2751f4b..9c44b8e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java
@@ -181,11 +181,8 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand
dos.writeByte(
((InternalDistributedSystem) system).getDistributionManager().getDistributedSystemId());
- if (clientVersion.isNotOlderThan(KnownVersion.GFE_80)
- && currentServerVersion.isNotOlderThan(KnownVersion.GFE_80)) {
- int pdxSize = PeerTypeRegistration.getPdxRegistrySize();
- dos.writeInt(pdxSize);
- }
+ int pdxSize = PeerTypeRegistration.getPdxRegistrySize();
+ dos.writeInt(pdxSize);
}
// Flush
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
index 023690f..a1f96b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
@@ -298,25 +298,13 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
}
@Immutable
- private static final KnownVersion[] serializationVersions =
- new KnownVersion[] {KnownVersion.GFE_80};
+ private static final KnownVersion[] serializationVersions = new KnownVersion[0];
@Override
public KnownVersion[] getSerializationVersions() {
return serializationVersions;
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out, SerializationContext context)
- throws IOException {
- getCanonicalIDs();
- toData(out, context);
- }
-
- public void fromDataPre_GFE_8_0_0_0(DataInput in, DeserializationContext context)
- throws IOException, ClassNotFoundException {
- fromData(in, context);
- }
-
/*
* for backward compatibility we need to make sure the IDs in the version tags aren't the partial
* IDs sent in serialized tags but the full tags. See bug #50063
@@ -762,22 +750,6 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
throw new IOException("this fromData method should never be invoked");
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out, SerializationContext context)
- throws IOException {
- if (this.index == 0) {
- this.list.getCanonicalIDs();
- }
- toData(out, context);
- }
-
- // when deserialized a VersionedObjectList is created, not a Chunker, so this method isn't
- // needed
- // public void fromDataPre_GFE_8_0_0_0(DataInput in, SerializationContext context) throws
- // IOException, ClassNotFoundException
- // {
- // fromData(in);
- // }
-
@Override
public KnownVersion[] getSerializationVersions() {
return this.list.getSerializationVersions();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index c345130..861e71e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -45,9 +45,7 @@ import org.apache.geode.internal.cache.wan.BatchException70;
import org.apache.geode.internal.cache.wan.GatewayReceiverStats;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.pdx.PdxConfigurationException;
import org.apache.geode.pdx.PdxRegistryMismatchException;
import org.apache.geode.pdx.internal.EnumId;
import org.apache.geode.pdx.internal.EnumInfo;
@@ -798,17 +796,6 @@ public class GatewayReceiverCommand extends BaseCommand {
errorMsg.setMessageType(MessageType.EXCEPTION);
errorMsg.setNumberOfParts(2);
errorMsg.setTransactionId(origMsg.getTransactionId());
-
- // For older gateway senders, we need to send back an exception
- // they can deserialize.
- if ((servConn.getClientVersion() == null
- || servConn.getClientVersion().isOlderThan(KnownVersion.GFE_80))
- && exception instanceof PdxRegistryMismatchException) {
- PdxConfigurationException newException =
- new PdxConfigurationException(exception.getMessage());
- newException.setStackTrace(exception.getStackTrace());
- exception = newException;
- }
errorMsg.addObjPart(exception);
// errorMsg.addStringPart(be.toString());
errorMsg.send(servConn);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
index d40b094..888bcfd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.vmotion.VMotionObserver;
import org.apache.geode.internal.cache.vmotion.VMotionObserverHolder;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
@@ -98,10 +97,8 @@ public class RegisterInterest61 extends BaseCommand {
try {
Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
regionDataPolicyPartBytes = (byte[]) regionDataPolicyPart.getObject();
- if (serverConnection.getClientVersion().isNotOlderThan(KnownVersion.GFE_80)) {
- // The second byte here is serializeValues
- serializeValues = regionDataPolicyPartBytes[1] == (byte) 0x01;
- }
+ // The second byte here is serializeValues
+ serializeValues = regionDataPolicyPartBytes[1] == (byte) 0x01;
} catch (Exception e) {
writeChunkedException(clientMessage, e, serverConnection);
serverConnection.setAsTrue(RESPONDED);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
index c95a433..cc5aad4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
@@ -95,10 +94,8 @@ public class RegisterInterestList66 extends BaseCommand {
try {
Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1);
regionDataPolicyPartBytes = (byte[]) regionDataPolicyPart.getObject();
- if (serverConnection.getClientVersion().isNotOlderThan(KnownVersion.GFE_80)) {
- // The second byte here is serializeValues
- serializeValues = regionDataPolicyPartBytes[1] == (byte) 0x01;
- }
+ // The second byte here is serializeValues
+ serializeValues = regionDataPolicyPartBytes[1] == (byte) 0x01;
} catch (Exception e) {
writeChunkedException(clientMessage, e, serverConnection);
serverConnection.setAsTrue(RESPONDED);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index 8704ee0..401296c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -642,74 +642,9 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
}
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in, DeserializationContext context)
- throws IOException, ClassNotFoundException {
- super.fromData(in, context);
- this.Id = DataSerializer.readString(in);
- this.startTime = in.readLong();
- this.remoteDSId = in.readInt();
- this.isRunning = in.readBoolean();
- this.isPrimary = in.readBoolean();
- this.isParallel = in.readBoolean();
- this.isBatchConflationEnabled = in.readBoolean();
- this.isPersistenceEnabled = in.readBoolean();
- this.alertThreshold = in.readInt();
- this.manualStart = in.readBoolean();
- this.eventFiltersClassNames = DataSerializer.readArrayList(in);
- this.transFiltersClassNames = DataSerializer.readArrayList(in);
- this.senderEventListenerClassNames = DataSerializer.readArrayList(in);
- this.isDiskSynchronous = in.readBoolean();
- this.dispatcherThreads = in.readInt();
- this.orderPolicy = DataSerializer.readObject(in);
- boolean serverLocationFound = DataSerializer.readPrimitiveBoolean(in);
- if (serverLocationFound) {
- this.serverLocation = new ServerLocation();
- InternalDataSerializer.invokeFromData(this.serverLocation, in);
- }
- }
-
- public void toDataPre_GFE_8_0_0_0(DataOutput out, SerializationContext context)
- throws IOException {
- super.toData(out, context);
- DataSerializer.writeString(Id, out);
- out.writeLong(startTime);
- out.writeInt(remoteDSId);
- out.writeBoolean(isRunning);
- out.writeBoolean(isPrimary);
- out.writeBoolean(isParallel);
- out.writeBoolean(isBatchConflationEnabled);
- out.writeBoolean(isPersistenceEnabled);
- out.writeInt(alertThreshold);
- out.writeBoolean(manualStart);
- DataSerializer.writeArrayList(eventFiltersClassNames, out);
- DataSerializer.writeArrayList(transFiltersClassNames, out);
- DataSerializer.writeArrayList(senderEventListenerClassNames, out);
- out.writeBoolean(isDiskSynchronous);
- // out.writeInt(dispatcherThreads);
- if (isParallel) {
- out.writeInt(1);// it was 1 on previous version of gemfire
- } else if (orderPolicy == null) {
- out.writeInt(1);// it was 1 on previous version of gemfire
- } else {
- out.writeInt(dispatcherThreads);
- }
-
- if (isParallel) {
- DataSerializer.writeObject(null, out);
- } else {
- DataSerializer.writeObject(orderPolicy, out);
- }
-
- boolean serverLocationFound = (this.serverLocation != null);
- DataSerializer.writePrimitiveBoolean(serverLocationFound, out);
- if (serverLocationFound) {
- InternalDataSerializer.invokeToData(serverLocation, out);
- }
- }
-
@Immutable
private static final KnownVersion[] serializationVersions =
- new KnownVersion[] {KnownVersion.GFE_80, KnownVersion.GEODE_1_14_0};
+ new KnownVersion[] {KnownVersion.GEODE_1_14_0};
@Override
public KnownVersion[] getSerializationVersions() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 8f55fa9..8969ab5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -2893,14 +2893,11 @@ public class Connection implements Runnable {
Versioning.getVersion(VersioningIO.readOrdinal(dis)),
null);
int dominoNumber = 0;
- if (remoteVersion == null
- || remoteVersion.isNotOlderThan(KnownVersion.GFE_80)) {
- dominoNumber = dis.readInt();
- if (sharedResource) {
- dominoNumber = 0;
- }
- dominoCount.set(dominoNumber);
+ dominoNumber = dis.readInt();
+ if (sharedResource) {
+ dominoNumber = 0;
}
+ dominoCount.set(dominoNumber);
if (!sharedResource) {
if (tipDomino()) {
logger.info("thread owned receiver forcing itself to send on thread owned sockets");
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/functions/CliFunctionResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/functions/CliFunctionResult.java
index 5b33e21..4fd8990 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/functions/CliFunctionResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/functions/CliFunctionResult.java
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.geode.DataSerializer;
+import org.apache.geode.annotations.Immutable;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.serialization.DataSerializableFixedID;
import org.apache.geode.internal.serialization.DeserializationContext;
@@ -35,6 +36,9 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSerializableFixedID {
+ @Immutable
+ private static final KnownVersion[] KNOWN_VERSIONS = {KnownVersion.GEODE_1_6_0};
+
static {
InternalDataSerializer.getDSFIDSerializer().registerDSFID(CLI_FUNCTION_RESULT,
CliFunctionResult.class);
@@ -236,13 +240,6 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer
DataSerializer.writeByteArray(this.byteData, out);
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out, SerializationContext context)
- throws IOException {
- DataSerializer.writeString(this.memberIdOrName, out);
- DataSerializer.writeObjectArray(this.serializables, out);
- context.getSerializer().writeObject(this.resultObject, out);
- }
-
@Override
public void fromData(DataInput in,
DeserializationContext context) throws IOException, ClassNotFoundException {
@@ -260,13 +257,6 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer
this.byteData = DataSerializer.readByteArray(in);
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in, DeserializationContext context)
- throws IOException, ClassNotFoundException {
- this.memberIdOrName = DataSerializer.readString(in);
- this.resultObject = context.getDeserializer().readObject(in);
- this.serializables = (Serializable[]) DataSerializer.readObjectArray(in);
- }
-
public boolean isSuccessful() {
return this.state == StatusState.OK;
}
@@ -358,6 +348,6 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer
@Override
public KnownVersion[] getSerializationVersions() {
- return new KnownVersion[] {KnownVersion.GFE_80};
+ return KNOWN_VERSIONS;
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
index 03bc8cb..eb63157 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
@@ -120,7 +120,7 @@ public class RegisterInterest61Test {
when(this.serverConnection.getAuthzRequest()).thenReturn(this.authzRequest);
when(this.serverConnection.getCachedRegionHelper()).thenReturn(mock(CachedRegionHelper.class));
when(this.serverConnection.getChunkedResponseMessage()).thenReturn(this.chunkedResponseMessage);
- when(this.serverConnection.getClientVersion()).thenReturn(KnownVersion.GFE_80);
+ when(this.serverConnection.getClientVersion()).thenReturn(KnownVersion.GFE_8009);
when(this.serverConnection.getAcceptor()).thenReturn(mock(AcceptorImpl.class));
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
index 587227b..c0640b3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
@@ -130,7 +130,7 @@ public class RegisterInterestList66Test {
when(this.serverConnection.getAuthzRequest()).thenReturn(this.authzRequest);
when(this.serverConnection.getCachedRegionHelper()).thenReturn(mock(CachedRegionHelper.class));
when(this.serverConnection.getChunkedResponseMessage()).thenReturn(this.chunkedResponseMessage);
- when(this.serverConnection.getClientVersion()).thenReturn(KnownVersion.GFE_80);
+ when(this.serverConnection.getClientVersion()).thenReturn(KnownVersion.GFE_8009);
when(this.serverConnection.getAcceptor()).thenReturn(mock(AcceptorImpl.class));
}
diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
index 4f3001a..a39a406 100644
--- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
+++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
@@ -710,11 +710,11 @@ public interface DataSerializableFixedID extends SerializationVersions, BasicSer
* Writes the state of this object as primitive data to the given <code>DataOutput</code>.<br>
* <br>
* Note: For rolling upgrades, if there is a change in the object format from previous version,
- * add a new toDataPre_GFE_X_X_X_X() method and add an entry for the current {@link
- * KnownVersion} in the getSerializationVersions array of the
- * implementing class. e.g. if msg format changed in version 80, create toDataPre_GFE_8_0_0_0, add
- * Version.GFE_80 to the getSerializationVersions array and copy previous toData contents to this
- * newly created toDataPre_GFE_X_X_X_X() method.
+ * add a new toDataPre_GEODE_X_X_X_X() method and add an entry for the current {@link
+ * KnownVersion} in the getSerializationVersions array of the implementing class. e.g. if msg
+ * format changed in version 1.2, create toDataPre_GEODE_1_2_0_0, add {@link
+ * KnownVersion#GEODE_1_2_0} to the getSerializationVersions array and copy previous toData
+ * contents to this newly created toDataPre_GFE_X_X_X_X() method.
*
* @throws IOException A problem occurs while writing to <code>out</code>
*/
@@ -725,10 +725,10 @@ public interface DataSerializableFixedID extends SerializationVersions, BasicSer
* <br>
* Note: For rolling upgrades, if there is a change in the object format from previous version,
* add a new fromDataPre_GFE_X_X_X_X() method and add an entry for the current {@link
- * KnownVersion} in the getSerializationVersions array of the
- * implementing class. e.g. if msg format changed in version 80, create fromDataPre_GFE_8_0_0_0,
- * add Version.GFE_80 to the getSerializationVersions array and copy previous fromData contents to
- * this newly created fromDataPre_GFE_X_X_X_X() method.
+ * KnownVersion} in the getSerializationVersions array of the implementing class. e.g. if msg
+ * format changed in version 1.2, create fromDataPre_GEODE_1_2_0_0, add {@link
+ * KnownVersion#GEODE_1_2_0} to the getSerializationVersions array and copy previous fromData
+ * contents to this newly created fromDataPre_GFE_X_X_X_X() method.
*
* @throws IOException A problem occurs while reading from <code>in</code>
* @throws ClassNotFoundException A class could not be loaded while reading from <code>in</code>
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 553a424..68d0c2c 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
@@ -63,15 +63,6 @@ public class KnownVersion extends AbstractVersion {
public static final KnownVersion TOKEN =
new KnownVersion("", "TOKEN", (byte) -1, (byte) 0, (byte) 0, (byte) 0, TOKEN_ORDINAL, true);
- private static final short GFE_80_ORDINAL = 30;
-
- @Immutable
- @Deprecated
- public static final KnownVersion GFE_80 =
- new KnownVersion("GFE", "8.0", (byte) 8, (byte) 0, (byte) 0, (byte) 0, GFE_80_ORDINAL, true);
-
- // 31-34 available for 8.0.x variants
-
private static final short GFE_8009_ORDINAL = 31;
@Immutable