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/01/28 01:05:32 UTC
[geode] 01/16: GEODE-8870: Removes GFE_57.
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 8b6a06e842261325e41621b08ac3dc560182accc
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Thu Jan 21 17:05:00 2021 -0800
GEODE-8870: Removes GFE_57.
---
.../tier/sockets/ClientDataSerializerMessage.java | 2 -
.../tier/sockets/ClientInstantiatorMessage.java | 22 +----
.../tier/sockets/ClientInterestMessageImpl.java | 13 ---
.../tier/sockets/ClientMarkerMessageImpl.java | 13 ---
.../tier/sockets/ClientRegistrationMetadata.java | 7 --
.../tier/sockets/ClientUpdateMessageImpl.java | 110 ---------------------
.../geode/internal/serialization/KnownVersion.java | 7 --
7 files changed, 3 insertions(+), 171 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
index ea25d31..78c55d9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
@@ -67,8 +67,6 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
protected Message getMessage(CacheClientProxy proxy, byte[] latestValue) throws IOException {
if (proxy.getVersion().isNotOlderThan(KnownVersion.GFE_6516)) {
return getGFE6516Message(proxy.getVersion());
- } else if (proxy.getVersion().isNotOlderThan(KnownVersion.GFE_57)) {
- return getGFEMessage(proxy.getVersion());
} else {
throw new IOException("Unsupported client version for server-to-client message creation: "
+ proxy.getVersion());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
index 54a9f0d..6dc8602 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
@@ -26,7 +26,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.serialization.DataSerializableFixedID;
import org.apache.geode.internal.serialization.DeserializationContext;
-import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.internal.serialization.SerializationContext;
/**
@@ -106,24 +105,9 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
@Override
protected Message getMessage(CacheClientProxy proxy, byte[] latestValue) throws IOException {
- KnownVersion clientVersion = proxy.getVersion();
- Message message = null;
- if (clientVersion.isNotOlderThan(KnownVersion.GFE_57)) {
- message = getGFEMessage(proxy.getProxyID(), null, clientVersion);
- } else {
- throw new IOException(
- "Unsupported client version for server-to-client message creation: " + clientVersion);
- }
-
- return message;
- }
-
- @Override
- protected Message getGFEMessage(ClientProxyMembershipID proxy, byte[] latestValue,
- KnownVersion clientVersion) throws IOException {
- Message message = null;
- int instantiatorsLength = this.serializedInstantiators.length;
- message = new Message(instantiatorsLength + 1, clientVersion); // one for eventID
+ final int instantiatorsLength = serializedInstantiators.length;
+ // one for eventID
+ final Message message = new Message(instantiatorsLength + 1, proxy.getVersion());
// Set message type
message.setMessageType(MessageType.REGISTER_INSTANTIATORS);
for (int i = 0; i < instantiatorsLength - 2; i += 3) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index 028f536..bb69b09 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -135,19 +135,6 @@ public class ClientInterestMessageImpl implements ClientMessage {
@Override
public Message getMessage(CacheClientProxy proxy, boolean notify) throws IOException {
- KnownVersion clientVersion = proxy.getVersion();
- Message message = null;
- if (clientVersion.isNotOlderThan(KnownVersion.GFE_57)) {
- message = getGFEMessage();
- } else {
- throw new IOException(
- "Unsupported client version for server-to-client message creation: " + clientVersion);
- }
-
- return message;
- }
-
- protected Message getGFEMessage() throws IOException {
Message message = new Message(isRegister() ? 7 : 6, KnownVersion.CURRENT);
message.setTransactionId(0);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
index 70717bf..85d9e7b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
@@ -59,19 +59,6 @@ public class ClientMarkerMessageImpl implements ClientMessage {
@Override
public Message getMessage(CacheClientProxy proxy, boolean notify) throws IOException {
- KnownVersion clientVersion = proxy.getVersion();
- Message message = null;
- if (clientVersion.isNotOlderThan(KnownVersion.GFE_57)) {
- message = getGFEMessage();
- } else {
- throw new IOException(
- "Unsupported client version for server-to-client message creation: " + clientVersion);
- }
-
- return message;
- }
-
- protected Message getGFEMessage() throws IOException {
Message message = new Message(1, KnownVersion.CURRENT);
message.setMessageType(MessageType.CLIENT_MARKER);
message.setTransactionId(0);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
index 3d7e926..b537851 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java
@@ -131,9 +131,6 @@ class ClientRegistrationMetadata {
if (commands == null) {
message = "No commands registered for version " + clientVersion + ".";
} else {
- if (isVersionOlderThan57(clientVersion)) {
- throw new IOException(new UnsupportedVersionException(clientVersionOrdinal));
- }
if (logger.isDebugEnabled()) {
logger.debug("{}: Registering client with version: {}", this, clientVersion);
}
@@ -169,10 +166,6 @@ class ClientRegistrationMetadata {
return KnownVersion.CURRENT.compareTo(clientVersion) > 0;
}
- private boolean isVersionOlderThan57(final KnownVersion clientVersion) {
- return KnownVersion.GFE_57.compareTo(clientVersion) > 0;
- }
-
private void getAndValidateClientProxyMembershipID()
throws IOException {
try {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
index aa60118..dcf7102 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
@@ -377,8 +377,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
message = getGFE65Message(proxy, serializedValue, conflation, clientVersion);
} else if (clientVersion.isNotOlderThan(KnownVersion.GFE_61)) {
message = getGFE61Message(proxy, serializedValue, conflation, clientVersion);
- } else if (clientVersion.isNotOlderThan(KnownVersion.GFE_57)) {
- message = getGFEMessage(proxy.getProxyID(), latestValue, clientVersion);
} else {
throw new IOException(
"Unsupported client version for server-to-client message creation: " + clientVersion);
@@ -387,114 +385,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
return message;
}
- protected Message getGFEMessage(ClientProxyMembershipID proxyId, byte[] latestValue,
- KnownVersion clientVersion) throws IOException {
- Message message;
- // Add CQ info.
- int cqMsgParts = 0;
- boolean clientHasCq = this._hasCqs && (this.getCqs(proxyId) != null);
-
- if (clientHasCq) {
- cqMsgParts = (this.getCqs(proxyId).length * 2) + 1;
- }
-
- if (isCreate() || isUpdate()) {
- // Create or update event
- if (this._clientInterestListInv != null && this._clientInterestListInv.contains(proxyId)) {
- // Notify all - do not send the value
- message = new Message(6, clientVersion);
- message.setMessageType(MessageType.LOCAL_INVALIDATE);
- message.addStringPart(this._regionName, true);
- // Currently serializing the key here instead of when the message
- // is put in the queue so that it can be conflated it later
- message.addStringOrObjPart(this._keyOfInterest);
- message.addObjPart(this._callbackArgument);
- message.addObjPart(isClientInterested(proxyId));
- message.addObjPart(Boolean.FALSE);
-
- } else {
- // Notify by subscription - send the value
- message = new Message(7 + cqMsgParts, clientVersion);
-
- // Set message type
- if (isCreate()) {
- message.setMessageType(MessageType.LOCAL_CREATE);
- } else {
- message.setMessageType(MessageType.LOCAL_UPDATE);
- }
- message.addStringPart(this._regionName, true);
- // Currently serializing the key here instead of when the message
- // is put in the queue so that it can be conflated it later
- message.addStringOrObjPart(this._keyOfInterest);
- message.addRawPart(latestValue, (this._valueIsObject == 0x01));
- message.addObjPart(this._callbackArgument);
- message.addObjPart(isClientInterested(proxyId));
- message.addObjPart(clientHasCq);
-
- if (clientHasCq) {
- this.addCqsToMessage(proxyId, message);
- }
- }
- } else if (isDestroy() || isInvalidate()) {
- message = new Message(6 + cqMsgParts, clientVersion);
- if (isDestroy()) {
- message.setMessageType(MessageType.LOCAL_DESTROY);
- } else {
- message.setMessageType(MessageType.LOCAL_INVALIDATE);
- }
- message.addStringPart(this._regionName, true);
-
- // Currently serializing the key here instead of when the message
- // is put in the queue so that it can be conflated it later
- message.addStringOrObjPart(this._keyOfInterest);
- message.addObjPart(this._callbackArgument);
- message.addObjPart(isClientInterested(proxyId));
- message.addObjPart(clientHasCq);
-
- if (clientHasCq) {
- this.addCqsToMessage(proxyId, message);
- }
- } else if (isDestroyRegion()) {
- message = new Message(4 + cqMsgParts, clientVersion);
- message.setMessageType(MessageType.LOCAL_DESTROY_REGION);
- message.addStringPart(this._regionName, true);
- message.addObjPart(this._callbackArgument);
- message.addObjPart(clientHasCq);
-
- if (clientHasCq) {
- this.addCqsToMessage(proxyId, message);
- }
- } else if (isClearRegion()) {
- message = new Message(4 + cqMsgParts, clientVersion);
- message.setMessageType(MessageType.CLEAR_REGION);
- message.addStringPart(this._regionName, true);
- message.addObjPart(this._callbackArgument);
- message.addObjPart(clientHasCq);
-
- if (clientHasCq) {
- this.addCqsToMessage(proxyId, message);
- }
- } else if (isInvalidateRegion()) {
- message = new Message(4 + cqMsgParts, clientVersion);
- message.setMessageType(MessageType.INVALIDATE_REGION);
- message.addStringPart(this._regionName, true);
- message.addObjPart(this._callbackArgument);
- message.addObjPart(clientHasCq);
-
- if (clientHasCq) {
- this.addCqsToMessage(proxyId, message);
- }
- } else {
- throw new InternalGemFireError("Don't know what kind of message");
- }
-
- message.setTransactionId(0);
- // Add the EventId since 5.1 (used to prevent duplicate events
- // received on the client side after a failover)
- message.addObjPart(this._eventIdentifier);
- return message;
- }
-
private Message getGFE61Message(CacheClientProxy proxy, byte[] latestValue, boolean conflation,
KnownVersion clientVersion) throws IOException {
Message message;
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 434c2d7..edde979 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
@@ -62,13 +62,6 @@ public class KnownVersion extends AbstractVersion {
public static final KnownVersion TOKEN =
new KnownVersion("", "TOKEN", (byte) -1, (byte) 0, (byte) 0, (byte) 0, TOKEN_ORDINAL);
- private static final short GFE_57_ORDINAL = 1;
-
- @Immutable
- @Deprecated
- public static final KnownVersion GFE_57 =
- new KnownVersion("GFE", "5.7", (byte) 5, (byte) 7, (byte) 0, (byte) 0, GFE_57_ORDINAL);
-
private static final short GFE_58_ORDINAL = 3;
@Immutable