[geode] 16/16: GEODE-8870: Removes GFE_6622.
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 010065e76daab8afd66422c54217db4804785b6c
Author: Jacob Barrett
AuthorDate: Sat Jan 16 14:35:06 2021 -0800
GEODE-8870: Removes GFE_6622.
---
.../cache/persistence/DiskInitFileParser.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java| 27 +-
.../cache/tier/sockets/ClientPingMessageImpl.java | 15 +---
.../geode/internal/serialization/KnownVersion.java | 7 --
4 files changed, 13 insertions(+), 38 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index aa06390..623ee75 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -65,7 +65,7 @@ public class DiskInitFileParser {
private transient boolean gotEOF;
public DiskStoreID parse() throws IOException, ClassNotFoundException {
-KnownVersion gfversion = KnownVersion.GFE_6622;
+KnownVersion gfversion = KnownVersion.GFE_70;
DiskStoreID result = null;
boolean endOfFile = false;
while (!(endOfFile || dis.atEndOfFile())) {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index 7f4fe13..da3c345 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -1870,23 +1870,18 @@ public class CacheClientNotifier {
// Determine clients to ping
for (CacheClientProxy proxy : getClientProxies()) {
logger.debug("Checking whether to ping {}", proxy);
- // Ping clients whose version is GE 6.6.2.2
- if (proxy.getVersion().isNotOlderThan(KnownVersion.GFE_6622)) {
-// Send the ping message directly to the client. Do not qo through
-// the queue. If the queue were used, the secondary connection
would
-// not be pinged. Instead, pings would just build up in secondary
-// queue and never be sent. The counter is used to help
scalability.
-// If normal messages are sent by the proxy, then the counter will
-// be reset and no pings will be sent.
-if (proxy.incrementAndGetPingCounter() >=
CLIENT_PING_TASK_COUNTER) {
- logger.debug("Pinging {}", proxy);
- proxy.sendMessageDirectly(message);
- logger.debug("Done pinging {}", proxy);
-} else {
- logger.debug("Not pinging because not idle: {}", proxy);
-}
+ // Send the ping message directly to the client. Do not qo through
+ // the queue. If the queue were used, the secondary connection would
+ // not be pinged. Instead, pings would just build up in secondary
+ // queue and never be sent. The counter is used to help scalability.
+ // If normal messages are sent by the proxy, then the counter will
+ // be reset and no pings will be sent.
+ if (proxy.incrementAndGetPingCounter() >= CLIENT_PING_TASK_COUNTER) {
+logger.debug("Pinging {}", proxy);
+proxy.sendMessageDirectly(message);
+logger.debug("Done pinging {}", proxy);
} else {
-logger.debug("Ignoring because of version: {}", proxy);
+logger.debug("Not pinging because not idle: {}", proxy);
}
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
index cc74f0a..fc082c7 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
@@ -43,19 +43,6 @@ public class ClientPingMessageImpl implements ClientMessage {
@Override
public Message getMessage(CacheClientProxy proxy, boolean notify) throws
IOException {
-KnownVersion clientVersion = proxy.getVersion();
-Message message = null;
-if (clientVersion.isNotOlderThan(KnownVersion.GFE_6622)) {
- message = getGFEMessage();
-} else {
- throw new IOException(
- "Unsupported client version for server-to-client message creation: "
+ clientVersion);
-}
-
-return message;
- }
-
- protected Message getGFEMessage() throws IOException {
[geode] 13/16: GEODE-6588: Static analyzer cleanup
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 cc1841a59dbb34c7a07ab9c685f7c8f05e169e5e
Author: Jacob Barrett
AuthorDate: Fri Jan 22 07:39:38 2021 -0800
GEODE-6588: Static analyzer cleanup
---
.../geode/internal/cache/PartitionedRegion.java| 2 +-
.../internal/cache/tier/sockets/BaseCommand.java | 145 +++--
.../internal/cache/tier/sockets/command/Get70.java | 109 +---
.../cache/tier/sockets/command/PutAll80.java | 77 ---
.../cache/tier/sockets/command/RemoveAll.java | 54 +++-
5 files changed, 127 insertions(+), 260 deletions(-)
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 4cb63d3..cd89363 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
@@ -4534,7 +4534,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Fetches entries from local and remote nodes and appends these to
register-interest response.
*/
- public void fetchEntries(HashMap bucketKeys,
VersionedObjectList values,
+ public void fetchEntries(HashMap> bucketKeys,
VersionedObjectList values,
ServerConnection servConn) throws IOException {
int retryAttempts = calcRetry();
RetryTimeKeeper retryTime = null;
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 d418616..8000d1e 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
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
+import static org.apache.geode.util.internal.UncheckedUtils.uncheckedCast;
+
import java.io.EOFException;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -161,7 +163,7 @@ public abstract class BaseCommand implements Command {
SecurityService securityService) {
// Read the request and update the statistics
long start = DistributionStats.getStatTime();
-if (EntryLogger.isEnabled() && serverConnection != null) {
+if (EntryLogger.isEnabled()) {
EntryLogger.setSource(serverConnection.getMembershipID(), "c2s");
}
boolean shouldMasquerade = shouldMasqueradeForTx(clientMessage);
@@ -227,7 +229,7 @@ public abstract class BaseCommand implements Command {
*/
public boolean recoverVersionTagForRetriedOperation(EntryEventImpl
clientEvent) {
InternalRegion r = clientEvent.getRegion();
-VersionTag tag = r.findVersionTagForEvent(clientEvent.getEventId());
+VersionTag tag = r.findVersionTagForEvent(clientEvent.getEventId());
if (tag == null) {
if (r instanceof DistributedRegion || r instanceof PartitionedRegion) {
// TODO this could be optimized for partitioned regions by sending the
key
@@ -254,8 +256,8 @@ public abstract class BaseCommand implements Command {
* The client event should have the event identifier from the client and the
region affected by
* the operation.
*/
- protected VersionTag findVersionTagsForRetriedBulkOp(LocalRegion region,
EventID eventID) {
-VersionTag tag = region.findVersionTagForClientBulkOp(eventID);
+ protected VersionTag findVersionTagsForRetriedBulkOp(LocalRegion region,
EventID eventID) {
+VersionTag tag = region.findVersionTagForClientBulkOp(eventID);
if (tag != null) {
if (logger.isDebugEnabled()) {
logger.debug("recovered version tag {} for replayed bulk operation
{}", tag, eventID);
@@ -292,22 +294,6 @@ public abstract class BaseCommand implements Command {
}
}
- protected void writeReplyWithRefreshMetadata(Message origMsg,
ServerConnection serverConnection,
- PartitionedRegion pr, byte nwHop) throws IOException {
-Message replyMsg = serverConnection.getReplyMessage();
-
serverConnection.getCache().getCancelCriterion().checkCancelInProgress(null);
-replyMsg.setMessageType(MessageType.REPLY);
-replyMsg.setNumberOfParts(1);
-replyMsg.setTransactionId(origMsg.getTransactionId());
-replyMsg.addBytesPart(new byte[] {pr.getMetadataVersion(), nwHop});
-replyMsg.send(serverConnection);
-pr.getPrStats().incPRMetaDataSentCount();
-if (logger.isTraceEnabled()) {
- logger.trace("{}: rpl with REFRESH_METADATA tx: {}",
serverConnection.getName(),
- origMsg.getTransactionId());
-}
- }
-
private static void handleEOFException(Message msg, ServerConnection
serverConnection,
Exception eof) {
CachedRegionHelper
[geode] 15/16: GEODE-6588: Static analyzer cleanup.
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 43c1195df32ac992bf0db32c6710742b9656d93b
Author: Jacob Barrett
AuthorDate: Fri Jan 22 07:52:36 2021 -0800
GEODE-6588: Static analyzer cleanup.
---
.../cache/persistence/DiskInitFileParser.java | 27 +-
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index acf89bc..aa06390 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -51,7 +51,7 @@ public class DiskInitFileParser {
private static final Logger logger = LogService.getLogger();
private final CountingDataInputStream dis;
- private DiskInitFileInterpreter interpreter;
+ private final DiskInitFileInterpreter interpreter;
public DiskInitFileParser(CountingDataInputStream dis,
DiskInitFileInterpreter interpreter) {
this.dis = dis;
@@ -68,11 +68,7 @@ public class DiskInitFileParser {
KnownVersion gfversion = KnownVersion.GFE_6622;
DiskStoreID result = null;
boolean endOfFile = false;
-while (!endOfFile) {
- if (dis.atEndOfFile()) {
-endOfFile = true;
-break;
- }
+while (!(endOfFile || dis.atEndOfFile())) {
byte opCode = dis.readByte();
if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE, "DiskInitFile
opcode={}", opCode);
@@ -217,11 +213,11 @@ public class DiskInitFileParser {
long drId = readDiskRegionID(dis);
int size = dis.readInt();
ConcurrentHashMap>
memberToVersion =
- new ConcurrentHashMap>(size);
+ new ConcurrentHashMap<>(size);
for (int i = 0; i < size; i++) {
DiskStoreID id = new DiskStoreID();
InternalDataSerializer.invokeFromData(id, dis);
-RegionVersionHolder holder = new RegionVersionHolder(dis);
+RegionVersionHolder holder = new
RegionVersionHolder<>(dis);
memberToVersion.put(id, holder);
}
readEndOfRecord(dis);
@@ -438,7 +434,7 @@ public class DiskInitFileParser {
if (gfversion == null) {
throw new DiskAccessException(
String.format("Unknown version ordinal %s found when
recovering Oplogs", ver),
-this.interpreter.getNameForError());
+interpreter.getNameForError());
}
interpreter.cmnGemfireVersion(gfversion);
break;
@@ -469,7 +465,7 @@ public class DiskInitFileParser {
readEndOfRecord(dis);
if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE,
-"IFREC_REVOKE_DISK_STORE_ID id={}" + pattern);
+"IFREC_REVOKE_DISK_STORE_ID id={}", pattern);
}
interpreter.cmnRevokeDiskStoreId(pattern);
}
@@ -477,7 +473,7 @@ public class DiskInitFileParser {
default:
throw new DiskAccessException(
String.format("Unknown opCode %s found in disk initialization
file.", opCode),
- this.interpreter.getNameForError());
+ interpreter.getNameForError());
}
if (interpreter.isClosing()) {
break;
@@ -502,7 +498,7 @@ public class DiskInitFileParser {
if (logger.isTraceEnabled(LogMarker.PERSIST_RECOVERY_VERBOSE)) {
StringBuffer sb = new StringBuffer();
for (int i = 0; i < OPLOG_TYPE.getLen(); i++) {
-sb.append(" " + seq[i]);
+sb.append(" ").append(seq[i]);
}
logger.trace(LogMarker.PERSIST_RECOVERY_VERBOSE, "oplog magic code: {}",
sb);
}
@@ -615,10 +611,9 @@ public class DiskInitFileParser {
private static DiskInitFileInterpreter createPrintingInterpreter(
DiskInitFileInterpreter wrapped) {
-DiskInitFileInterpreter interpreter = (DiskInitFileInterpreter)
Proxy.newProxyInstance(
+return (DiskInitFileInterpreter) Proxy.newProxyInstance(
DiskInitFileInterpreter.class.getClassLoader(), new Class[]
{DiskInitFileInterpreter.class},
new PrintingInterpreter(wrapped));
-return interpreter;
}
@@ -627,7 +622,7 @@ public class DiskInitFileParser {
private final DiskInitFileInterpreter delegate;
public PrintingInterpreter(DiskInitFileInterpreter wrapped) {
- this.delegate = wrapped;
+ delegate = wrapped;
}
@Override
@@ -664,6 +659,6 @@ public class DiskInitFileParser {
}
public boolean gotEOF() {
-return this.gotEOF;
+
[geode] 14/16: GEODE-8870: Removes GFE_662.
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 4f795b727bda2510f26766a0b79ba233e50edc57
Author: Jacob Barrett
AuthorDate: Fri Jan 22 07:48:22 2021 -0800
GEODE-8870: Removes GFE_662.
---
.../geode/internal/cache/persistence/DiskInitFileParser.java | 2 +-
.../java/org/apache/geode/internal/serialization/KnownVersion.java | 7 ---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index a5744ff..acf89bc 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -65,7 +65,7 @@ public class DiskInitFileParser {
private transient boolean gotEOF;
public DiskStoreID parse() throws IOException, ClassNotFoundException {
-KnownVersion gfversion = KnownVersion.GFE_662;
+KnownVersion gfversion = KnownVersion.GFE_6622;
DiskStoreID result = null;
boolean endOfFile = false;
while (!endOfFile) {
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 a39613f..4796ef8 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_662_ORDINAL = 17;
-
- @Immutable
- @Deprecated
- public static final KnownVersion GFE_662 =
- new KnownVersion("GFE", "6.6.2", (byte) 6, (byte) 6, (byte) 2, (byte) 0,
GFE_662_ORDINAL);
-
private static final short GFE_6622_ORDINAL = 18;
@Immutable
[geode] 11/16: GEODE-8870: Removes GFE_6516.
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 aa35166cafaaffb410ff5b0c660c21fe651634e9
Author: Jacob Barrett
AuthorDate: Sat Jan 16 10:19:50 2021 -0800
GEODE-8870: Removes GFE_6516.
---
.../cache/tier/sockets/ClientDataSerializerMessage.java | 15 +--
.../internal/cache/tier/sockets/SocketMessageWriter.java | 14 +-
.../apache/geode/internal/serialization/KnownVersion.java | 7 ---
3 files changed, 6 insertions(+), 30 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 31d18b4..eb70ad9 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
@@ -25,7 +25,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;
public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
@@ -65,16 +64,6 @@ public class ClientDataSerializerMessage extends
ClientUpdateMessageImpl {
*/
@Override
protected Message getMessage(CacheClientProxy proxy, byte[] latestValue)
throws IOException {
-if (proxy.getVersion().isNotOlderThan(KnownVersion.GFE_6516)) {
- return getGFE6516Message(proxy.getVersion());
-} else {
- throw new IOException("Unsupported client version for server-to-client
message creation: "
- + proxy.getVersion());
-}
- }
-
- private Message getGFE6516Message(KnownVersion clientVersion) {
-
// The format:
// part 0: serializer1 classname
// part 1: serializer1 id
@@ -103,10 +92,8 @@ public class ClientDataSerializerMessage extends
ClientUpdateMessageImpl {
}
}
numOfParts += 1; // one for eventID
-// this._logger.fine("Number of parts for ClientDataSerializerMessage: "
-// + numOfParts + ", with eventID: " + this.getEventId());
-final Message message = new Message(numOfParts, clientVersion);
+final Message message = new Message(numOfParts, proxy.getVersion());
// Set message type
message.setMessageType(MessageType.REGISTER_DATASERIALIZERS);
for (int i = 0; i < dsLength; i = i + 2) {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
index 0a4ef53..a966620 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SocketMessageWriter.java
@@ -69,19 +69,15 @@ public class SocketMessageWriter {
for (DataSerializer dataSerializer : dataSerializers) {
dataSerializersMap.put(dataSerializer.getId(),
dataSerializer.getClass().toString().substring(6));
-if (clientVersion.isNotOlderThan(KnownVersion.GFE_6516)) {
- ArrayList supportedClassNames = new ArrayList<>();
- for (Class clazz : dataSerializer.getSupportedClasses()) {
-supportedClassNames.add(clazz.getName());
- }
- dsToSupportedClasses.put(dataSerializer.getId(),
supportedClassNames);
+ArrayList supportedClassNames = new ArrayList<>();
+for (Class clazz : dataSerializer.getSupportedClasses()) {
+ supportedClassNames.add(clazz.getName());
}
+dsToSupportedClasses.put(dataSerializer.getId(), supportedClassNames);
}
}
DataSerializer.writeHashMap(dataSerializersMap, dos);
-if (clientVersion.isNotOlderThan(KnownVersion.GFE_6516)) {
- DataSerializer.writeHashMap(dsToSupportedClasses, dos);
-}
+DataSerializer.writeHashMap(dsToSupportedClasses, dos);
if (clientVersion.isNotOlderThan(KnownVersion.GEODE_1_5_0)) {
dos.writeInt(CLIENT_PING_TASK_PERIOD);
}
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 42d24d8..8dd16ec 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 {
[geode] 10/16: GEODE-8870: Removes GFE_651.
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 3555e4ba1615bd0a128b43088daecdd3d2bfab3d
Author: Jacob Barrett
AuthorDate: Thu Jan 21 20:02:08 2021 -0800
GEODE-8870: Removes GFE_651.
---
.../java/org/apache/geode/internal/serialization/KnownVersion.java | 7 ---
1 file changed, 7 deletions(-)
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 5114f00..42d24d8 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_651_ORDINAL = 7;
-
- @Immutable
- @Deprecated
- public static final KnownVersion GFE_651 =
- new KnownVersion("GFE", "6.5.1", (byte) 6, (byte) 5, (byte) 1, (byte) 0,
GFE_651_ORDINAL);
-
private static final short GFE_6516_ORDINAL = 12;
@Immutable
[geode] 12/16: GEODE-8870: Removes GFE_66.
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 bf94d0978a0f4b7c6e562f3077cbe33286bfcc44
Author: Jacob Barrett
AuthorDate: Thu Jan 21 20:13:10 2021 -0800
GEODE-8870: Removes GFE_66.
---
.../client/internal/ClientSideHandshakeImpl.java | 5 +---
.../org/apache/geode/internal/cache/Oplog.java | 32 ++
.../internal/cache/tier/sockets/BaseCommand.java | 11 +++-
.../tier/sockets/ServerSideHandshakeImpl.java | 27 --
.../geode/internal/serialization/KnownVersion.java | 7 -
5 files changed, 24 insertions(+), 58 deletions(-)
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 f0de522..5378df8 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
@@ -234,10 +234,7 @@ public class ClientSideHandshakeImpl extends Handshake
implements ClientSideHand
}
// validate that the remote side has a different distributed system id.
- if (communicationMode.isWAN()
- && KnownVersion.GFE_66
- .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0
- && currentClientVersion.isNotOlderThan(KnownVersion.GFE_66)) {
+ if (communicationMode.isWAN()) {
int remoteDistributedSystemId = in.read();
int localDistributedSystemId =
((InternalDistributedSystem)
system).getDistributionManager().getDistributedSystemId();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
index f3146fd..026a549 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -6395,20 +6395,12 @@ public class Oplog implements CompactableOplog,
Flushable {
*/
public KnownVersion getProductVersionIfOld() {
final KnownVersion version = this.gfversion;
-if (version == null) {
- // check for the case of diskstore upgrade from 6.6 to >= 7.0
- if (getParent().isUpgradeVersionOnly()) {
-// assume previous release version
-return KnownVersion.GFE_66;
- } else {
-return null;
- }
-} else if (version == KnownVersion.CURRENT) {
+if (version == KnownVersion.CURRENT) {
return null;
-} else {
- // version changed so return that for VersionedDataStream
- return version;
}
+
+// version changed so return that for VersionedDataStream
+return version;
}
/**
@@ -6417,20 +6409,12 @@ public class Oplog implements CompactableOplog,
Flushable {
*/
public KnownVersion getDataVersionIfOld() {
final KnownVersion version = this.dataVersion;
-if (version == null) {
- // check for the case of diskstore upgrade from 6.6 to >= 7.0
- if (getParent().isUpgradeVersionOnly()) {
-// assume previous release version
-return KnownVersion.GFE_66;
- } else {
-return null;
- }
-} else if (version == KnownVersion.CURRENT) {
+if (version == KnownVersion.CURRENT) {
return null;
-} else {
- // version changed so return that for VersionedDataStream
- return version;
}
+
+// version changed so return that for VersionedDataStream
+return version;
}
public enum OPLOG_TYPE {
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 02ef1a7..d418616 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
@@ -164,7 +164,7 @@ public abstract class BaseCommand implements Command {
if (EntryLogger.isEnabled() && serverConnection != null) {
EntryLogger.setSource(serverConnection.getMembershipID(), "c2s");
}
-boolean shouldMasquerade = shouldMasqueradeForTx(clientMessage,
serverConnection);
+boolean shouldMasquerade = shouldMasqueradeForTx(clientMessage);
try {
if (shouldMasquerade) {
InternalCache cache = serverConnection.getCache();
@@ -208,15 +208,12 @@ public abstract class BaseCommand implements Command {
}
/**
- * checks to see if this thread needs to masquerade as a transactional
thread. clients after
- * GFE_66 should be able to start a transaction.
+ * checks to see if this thread needs to masquerade as a transactional
thread.
*
* @return true if thread should
[geode] 09/16: GEODE-6588: Static analyzer cleanup.
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 088e08b10ee9af6e16d37f18ab54f5552c6e56b7
Author: Jacob Barrett
AuthorDate: Sat Jan 16 09:58:12 2021 -0800
GEODE-6588: Static analyzer cleanup.
---
.../cache/tier/sockets/BaseCommandQuery.java | 105 -
.../cache/tier/sockets/ChunkedMessage.java | 82 +++-
.../cache/tier/sockets/ServerConnection.java | 12 +--
3 files changed, 75 insertions(+), 124 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
index b2933fd..bbf81ef 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.cache.tier.sockets;
import java.io.IOException;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -57,7 +56,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
protected boolean processQuery(final Message msg,
final Query query,
final String queryString,
- final Set regionNames,
+ final Set regionNames,
final long start,
final ServerCQ cqQuery,
final QueryOperationContext queryContext,
@@ -77,7 +76,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
protected boolean processQueryUsingParams(final Message msg,
final Query query,
final String queryString,
- final Set regionNames,
+ final Set regionNames,
long start,
final ServerCQ cqQuery,
QueryOperationContext queryContext,
@@ -114,8 +113,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
// For now we assume the results are a SelectResults
// which is the only possibility now, but this may change
// in the future if we support arbitrary queries
- Object result = null;
-
+ Object result;
if (params != null) {
result = query.execute(params);
} else {
@@ -126,9 +124,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
// of the regions involved in the query have been destroyed
// or not. If yes, throw an Exception.
// This is a workaround/fix for Bug 36969
- Iterator itr = regionNames.iterator();
- while (itr.hasNext()) {
-String regionName = (String) itr.next();
+ for (final String regionName : regionNames) {
if (crHelper.getRegion(regionName) == null) {
throw new RegionDestroyedException(
"Region destroyed during the execution of the query",
@@ -148,17 +144,13 @@ public abstract class BaseCommandQuery extends
BaseCommand {
}
if (result instanceof SelectResults) {
-SelectResults selectResults = (SelectResults) result;
+SelectResults selectResults = (SelectResults) result;
if (logger.isDebugEnabled()) {
logger.debug("Query Result size for : {} is {}",
query.getQueryString(),
selectResults.size());
}
-CollectionType collectionType = null;
-boolean sendCqResultsWithKey = true;
-boolean isStructs = false;
-
// check if resultset has serialized objects, so that they could be
sent
// as ObjectPartList
boolean hasSerializedObjects = ((DefaultQuery)
query).isKeepSerialized();
@@ -177,20 +169,15 @@ public abstract class BaseCommandQuery extends
BaseCommand {
// Get the collection type (which includes the element type)
// (used to generate the appropriate instance on the client)
-collectionType = getCollectionType(selectResults);
-isStructs = collectionType.getElementType().isStructType();
+CollectionType collectionType = getCollectionType(selectResults);
+boolean isStructs = collectionType.getElementType().isStructType();
// Check if the Query is from CQ execution.
if (cqQuery != null) {
- // Check if the key can be sent to the client based on its version.
- sendCqResultsWithKey = sendCqResultsWithKey(servConn);
-
- if (sendCqResultsWithKey) {
-// Update the collection type to include key info.
-collectionType = new CollectionTypeImpl(Collection.class,
-new StructTypeImpl(new String[] {"key", "value"}));
-isStructs = collectionType.getElementType().isStructType();
- }
+ // Update the collection type to include key info.
+ collectionType = new CollectionTypeImpl(Collection.class,
+ new StructTypeImpl(new String[] {"key", "value"}));
+
[geode] 08/16: GEODE-8870: Removes GFE_65.
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 63e223d49ba50b7427a1fcbebbfacb08fe4e9ce1
Author: Jacob Barrett
AuthorDate: Thu Jan 21 19:54:46 2021 -0800
GEODE-8870: Removes GFE_65.
---
.../cache/tier/sockets/BaseCommandQuery.java | 6 +-
.../cache/tier/sockets/ChunkedMessage.java | 4 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 163 -
.../cache/tier/sockets/ServerConnection.java | 6 +-
.../tier/sockets/ServerSideHandshakeImpl.java | 2 +-
.../internal/cache/tier/sockets/command/Put70.java | 26
.../cache/tier/sockets/ServerConnectionTest.java | 14 +-
.../geode/internal/serialization/KnownVersion.java | 7 -
8 files changed, 9 insertions(+), 219 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
index 7a5cb6e..b2933fd 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java
@@ -309,11 +309,7 @@ public abstract class BaseCommandQuery extends BaseCommand
{
}
private boolean sendCqResultsWithKey(ServerConnection servConn) {
-KnownVersion clientVersion = servConn.getClientVersion();
-if (clientVersion.isNotOlderThan(KnownVersion.GFE_65)) {
- return true;
-}
-return false;
+return true;
}
protected void sendCqResponse(int msgType, String msgStr, int txId,
Throwable e,
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
index 0be09bf..793891d 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ChunkedMessage.java
@@ -151,9 +151,7 @@ public class ChunkedMessage extends Message {
public void setLastChunkAndNumParts(boolean lastChunk, int numParts) {
setLastChunk(lastChunk);
-if (this.serverConnection != null
-&&
this.serverConnection.getClientVersion().isNotOlderThan(KnownVersion.GFE_65)) {
- // we us e three bits for number of parts in last chunk byte
+if (this.serverConnection != null) {
// we us e three bits for number of parts in last chunk byte
byte localLastChunk = (byte) (numParts << 5);
this.lastChunk |= localLastChunk;
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 2e33fde..6fc67a0 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
@@ -373,8 +373,6 @@ public class ClientUpdateMessageImpl implements
ClientUpdateMessage, Sizeable, N
}
if (clientVersion.isNotOlderThan(KnownVersion.GFE_70)) {
message = getGFE70Message(proxy, serializedValue, conflation,
clientVersion);
-} else if (clientVersion.isNotOlderThan(KnownVersion.GFE_65)) {
- message = getGFE65Message(proxy, serializedValue, conflation,
clientVersion);
} else {
throw new IOException(
"Unsupported client version for server-to-client message creation: "
+ clientVersion);
@@ -383,167 +381,6 @@ public class ClientUpdateMessageImpl implements
ClientUpdateMessage, Sizeable, N
return message;
}
- private Message getGFE65Message(CacheClientProxy proxy, byte[] p_latestValue,
- boolean conflation, KnownVersion clientVersion) throws IOException {
-byte[] latestValue = p_latestValue;
-Message message;
-ClientProxyMembershipID proxyId = proxy.getProxyID();
-
-// Add CQ info.
-int cqMsgParts = 0;
-boolean clientHasCq = _hasCqs && (getCqs(proxyId) != null);
-
-if (clientHasCq) {
- cqMsgParts = (getCqs(proxyId).length * 2) + 1;
-}
-
-if (isCreate() || isUpdate()) {
- // Create or update event
- if (_clientInterestListInv != null &&
_clientInterestListInv.contains(proxyId)) {
-// Client is registered for invalidates.
-if (cqMsgParts > 0) {
- cqMsgParts++; // To store base operation type for CQ.
-}
-
-message = new Message(6 + cqMsgParts, clientVersion);
-message.setMessageType(MessageType.LOCAL_INVALIDATE);
-
-// Add the region name
-message.addStringPart(_regionName, true);
-
-// Add the key
-// Currently serializing the key here instead of when
[geode] 07/16: GEODE-6588: Static analyzer cleanup.
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 8d44f027ec1cb491d700b19ca3e30c5c474aee90
Author: Jacob Barrett
AuthorDate: Sat Jan 16 08:58:28 2021 -0800
GEODE-6588: Static analyzer cleanup.
---
.../client/internal/ClientSideHandshakeImpl.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java| 110 +-
.../cache/tier/sockets/ClientHealthMonitor.java| 31 ++---
.../cache/tier/sockets/MessageDispatcher.java | 127 ++---
.../cache/tier/sockets/SocketMessageWriter.java| 16 +--
5 files changed, 137 insertions(+), 149 deletions(-)
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 eb5fcf9..f0de522 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
@@ -169,7 +169,7 @@ public class ClientSideHandshakeImpl extends Handshake
implements ClientSideHand
// if running in a loner system, use the new port number in the ID to
// help differentiate from other clients
DistributionManager dm = ((InternalDistributedSystem)
system).getDistributionManager();
- InternalDistributedMember idm = dm.getDistributionManagerId();
+ final InternalDistributedMember idm = dm.getDistributionManagerId();
synchronized (idm) {
if (idm.getMembershipPort() == 0 && dm instanceof
LonerDistributionManager) {
int port = sock.getLocalPort();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index a3a67a3..7f4fe13 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache.tier.sockets;
import static org.apache.geode.cache.Region.SEPARATOR;
import static
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP;
import static
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static org.apache.geode.util.internal.UncheckedUtils.uncheckedCast;
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
@@ -71,6 +72,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.ClassLoadUtil;
import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.cache.CacheClientStatus;
@@ -480,8 +482,7 @@ public class CacheClientNotifier {
removeClientInitProxy(l_proxy);
}
}
-boolean status = false;
-return status;
+return false;
}
/**
@@ -620,7 +621,7 @@ public class CacheClientNotifier {
}
private boolean hasClientProxies() {
-return !this._initClientProxies.isEmpty() ||
!this._clientProxies.isEmpty();
+return !_initClientProxies.isEmpty() || !_clientProxies.isEmpty();
}
/**
@@ -745,7 +746,8 @@ public class CacheClientNotifier {
// Add interestList info.
if (filterInfo.getInterestedClientsInv() != null) {
- Set rawIDs =
regionProfile.getRealClientIDs(filterInfo.getInterestedClientsInv());
+ Set rawIDs =
+
uncheckedCast(regionProfile.getRealClientIDs(filterInfo.getInterestedClientsInv()));
Set ids = getProxyIDs(rawIDs);
incMessagesNotQueuedOriginatorStat(event, ids);
if (!ids.isEmpty()) {
@@ -757,7 +759,8 @@ public class CacheClientNotifier {
}
}
if (filterInfo.getInterestedClients() != null) {
- Set rawIDs =
regionProfile.getRealClientIDs(filterInfo.getInterestedClients());
+ Set rawIDs =
+
uncheckedCast(regionProfile.getRealClientIDs(filterInfo.getInterestedClients()));
Set ids = getProxyIDs(rawIDs);
incMessagesNotQueuedOriginatorStat(event, ids);
if (!ids.isEmpty()) {
@@ -801,7 +804,7 @@ public class CacheClientNotifier {
FilterInfo filterInfo) {
FilterProfile regionProfile = ((InternalRegion)
event.getRegion()).getFilterProfile();
if (event.getOperation().isEntry() && filterInfo.getCQs() != null) {
- EntryEvent entryEvent = (EntryEvent) event;
+ EntryEvent entryEvent = (EntryEvent) event;
for (Map.Entry e :
[geode] 06/16: GEODE-8870: Removes GFE_61.
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 01812dfe4b5c40d67ed0c28b42e7d0458e3fb61a
Author: Jacob Barrett
AuthorDate: Thu Jan 21 18:55:31 2021 -0800
GEODE-8870: Removes GFE_61.
---
.../client/internal/ClientSideHandshakeImpl.java | 11 +-
.../cache/tier/sockets/ClientHealthMonitor.java| 2 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 166 -
.../cache/tier/sockets/MessageDispatcher.java | 7 +-
.../tier/sockets/ServerSideHandshakeImpl.java | 2 +-
.../cache/tier/sockets/SocketMessageWriter.java| 67 -
.../cache/tier/sockets/ServerConnectionTest.java | 22 ---
.../geode/internal/serialization/KnownVersion.java | 7 -
8 files changed, 39 insertions(+), 245 deletions(-)
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 8a17041..eb5fcf9 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
@@ -229,9 +229,7 @@ public class ClientSideHandshakeImpl extends Handshake
implements ClientSideHand
readMessage(dis, dos, acceptanceCode, member);
// Read delta-propagation property value from server.
- // [sumedh] Static variable below? Client can connect to different
- // DSes with different values of this. It shoule be a member variable.
- if (!communicationMode.isWAN() &&
currentClientVersion.isNotOlderThan(KnownVersion.GFE_61)) {
+ if (!communicationMode.isWAN()) {
((InternalDistributedSystem)
system).setDeltaEnabledOnServer(dis.readBoolean());
}
@@ -319,13 +317,6 @@ public class ClientSideHandshakeImpl extends Handshake
implements ClientSideHand
// Read the message (if any)
readMessage(dis, dos, acceptanceCode, member);
- // nothing more to be done for older clients used in tests
- // there is a difference in serializer map registration for >= 6.5.1.6
- // clients but that is not used in tests
- if (currentClientVersion.isOlderThan(KnownVersion.GFE_61)) {
-return new ServerQueueStatus(endpointType, queueSize, member);
- }
-
final Map> instantiatorMap =
DataSerializer.readHashMap(dis);
for (final Map.Entry> entry :
instantiatorMap.entrySet()) {
final Integer id = entry.getKey();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
index 45e6cc4..70a1897 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -674,7 +674,7 @@ public class ClientHealthMonitor {
}
public boolean hasDeltaClients() {
-return getNumberOfClientsAtOrAboveVersion(KnownVersion.GFE_61) > 0;
+return getNumberOfClientsAtOrAboveVersion(KnownVersion.OLDEST) > 0;
}
private int getMaximumTimeBetweenPings(ClientProxyMembershipID proxyID) {
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 11cc3e8..2e33fde 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
@@ -375,8 +375,6 @@ public class ClientUpdateMessageImpl implements
ClientUpdateMessage, Sizeable, N
message = getGFE70Message(proxy, serializedValue, conflation,
clientVersion);
} else if (clientVersion.isNotOlderThan(KnownVersion.GFE_65)) {
message = getGFE65Message(proxy, serializedValue, conflation,
clientVersion);
-} else if (clientVersion.isNotOlderThan(KnownVersion.GFE_61)) {
- message = getGFE61Message(proxy, serializedValue, conflation,
clientVersion);
} else {
throw new IOException(
"Unsupported client version for server-to-client message creation: "
+ clientVersion);
@@ -385,170 +383,6 @@ public class ClientUpdateMessageImpl implements
ClientUpdateMessage, Sizeable, N
return message;
}
- private Message getGFE61Message(CacheClientProxy proxy, byte[] latestValue,
boolean conflation,
- KnownVersion clientVersion) throws IOException {
-Message message;
-ClientProxyMembershipID proxyId = proxy.getProxyID();
-
-// Add CQ info.
-int cqMsgParts = 0;
-boolean clientHasCq = _hasCqs &&
[geode] 04/16: GEODE-8870: Removes GFE_603.
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 50717fffcaf4afa1fd577aca0992e3c54ed5ebf0
Author: Jacob Barrett
AuthorDate: Thu Jan 21 18:24:27 2021 -0800
GEODE-8870: Removes GFE_603.
---
.../client/internal/ClientSideHandshakeImpl.java | 25 --
.../tier/sockets/ClientRegistrationMetadata.java | 13 ++-
.../tier/sockets/ServerSideHandshakeImpl.java | 6 +-
.../geode/internal/serialization/KnownVersion.java | 7 --
4 files changed, 7 insertions(+), 44 deletions(-)
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 50c1515..8a17041 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
@@ -124,15 +124,7 @@ public class ClientSideHandshakeImpl extends Handshake
implements ClientSideHand
private void setOverrides() {
clientConflation = determineClientConflation();
-
-// As of May 2009 ( GFE 6.0 ):
-// Note that this.clientVersion is used by server side for accepting
-// handshakes.
-// Client side handshake code uses this.currentClientVersion which can be
-// set via tests.
-if (currentClientVersion.isNotOlderThan(KnownVersion.GFE_603)) {
- overrides = new byte[] {clientConflation};
-}
+overrides = new byte[] {clientConflation};
}
// used by the client side
@@ -393,18 +385,9 @@ public class ClientSideHandshakeImpl extends Handshake
implements ClientSideHand
DataOutput idOut = new VersionedDataOutputStream(hdos,
KnownVersion.GFE_81);
DataSerializer.writeObject(id, idOut);
- if (currentClientVersion.isNotOlderThan(KnownVersion.GFE_603)) {
-byte[] overrides = getOverrides();
-for (final byte override : overrides) {
- hdos.writeByte(override);
-}
- } else {
-// write the client conflation setting byte
-if (setClientConflationForTesting) {
- hdos.writeByte(clientConflationForTesting);
-} else {
- hdos.writeByte(clientConflation);
-}
+ byte[] overrides = getOverrides();
+ for (final byte override : overrides) {
+hdos.writeByte(override);
}
if (isCallbackConnection || communicationMode.isWAN()) {
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 1b369b1..1693ec6 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
@@ -158,10 +158,6 @@ class ClientRegistrationMetadata {
return false;
}
- private boolean doesClientSupportExtractOverrides() {
-return clientVersion.isNotOlderThan(KnownVersion.GFE_603);
- }
-
private boolean oldClientRequiresVersionedStreams(final KnownVersion
clientVersion) {
return KnownVersion.CURRENT.compareTo(clientVersion) > 0;
}
@@ -177,13 +173,8 @@ class ClientRegistrationMetadata {
private boolean getAndValidateClientConflation()
throws IOException {
-if (doesClientSupportExtractOverrides()) {
- byte[] overrides =
- Handshake.extractOverrides(new byte[] {(byte)
dataInputStream.read()});
- clientConflation = overrides[0];
-} else {
- clientConflation = (byte) dataInputStream.read();
-}
+final byte[] overrides = Handshake.extractOverrides(new byte[] {(byte)
dataInputStream.read()});
+clientConflation = overrides[0];
switch (clientConflation) {
case Handshake.CONFLATION_DEFAULT:
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 44d71af..9203b97 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
@@ -94,13 +94,9 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
new VersionedDataOutputStream(dataOutputStream, clientVersion);
}
this.id = ClientProxyMembershipID.readCanonicalized(dataInputStream);
+setOverrides(new byte[] {dataInputStream.readByte()});
// Note: credentials should always be the last piece in handshake for
// Diffie-Hellman key exchange
[geode] 05/16: GEODE-6588: Static analyzer cleanup.
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 9e50cf1917f1176835f6aa981a12002ca33d2d85
Author: Jacob Barrett
AuthorDate: Thu Jan 21 18:26:09 2021 -0800
GEODE-6588: Static analyzer cleanup.
---
.../tier/sockets/ServerSideHandshakeImpl.java | 42 +++---
1 file changed, 21 insertions(+), 21 deletions(-)
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 9203b97..89f1e23 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
@@ -46,7 +46,7 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
@Immutable
private static final KnownVersion currentServerVersion =
ServerSideHandshakeFactory.currentServerVersion;
- private KnownVersion clientVersion;
+ private final KnownVersion clientVersion;
private final byte replyCode;
@@ -64,9 +64,9 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
throws IOException, AuthenticationRequiredException {
this.clientVersion = clientVersion;
-this.system = sys;
+system = sys;
this.securityService = securityService;
-this.encryptor = new EncryptorImpl(sys.getSecurityLogWriter());
+encryptor = new EncryptorImpl(sys.getSecurityLogWriter());
int soTimeout = -1;
try {
@@ -78,7 +78,7 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
throw new EOFException(
"HandShake: EOF reached before client code could be read");
}
- this.replyCode = (byte) valRead;
+ replyCode = (byte) valRead;
if (replyCode != REPLY_OK) {
throw new IOException(
"HandShake reply code is not ok");
@@ -86,22 +86,22 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
try {
DataInputStream dataInputStream = new DataInputStream(inputStream);
DataOutputStream dataOutputStream = new
DataOutputStream(sock.getOutputStream());
-this.clientReadTimeout = dataInputStream.readInt();
+clientReadTimeout = dataInputStream.readInt();
if (clientVersion.isOlderThan(KnownVersion.CURRENT)) {
// versioned streams allow object serialization code to deal with
older clients
dataInputStream = new VersionedDataInputStream(dataInputStream,
clientVersion);
dataOutputStream =
new VersionedDataOutputStream(dataOutputStream, clientVersion);
}
-this.id = ClientProxyMembershipID.readCanonicalized(dataInputStream);
+id = ClientProxyMembershipID.readCanonicalized(dataInputStream);
setOverrides(new byte[] {dataInputStream.readByte()});
// Note: credentials should always be the last piece in handshake for
// Diffie-Hellman key exchange to work
if (this.clientVersion.isOlderThan(KnownVersion.GFE_65) ||
communicationMode.isWAN()) {
- this.credentials =
+ credentials =
readCredentials(dataInputStream, dataOutputStream, sys,
this.securityService);
} else {
- this.credentials = this.readCredential(dataInputStream,
dataOutputStream, sys);
+ credentials = readCredential(dataInputStream, dataOutputStream, sys);
}
} catch (ClassNotFoundException cnfe) {
throw new IOException(
@@ -118,12 +118,12 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
}
public KnownVersion getClientVersion() {
-return this.clientVersion;
+return clientVersion;
}
@Override
public KnownVersion getVersion() {
-return this.clientVersion;
+return clientVersion;
}
@Override
@@ -154,11 +154,11 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
dos.writeInt(queueSize);
// Write the server's member
-DistributedMember member = this.system.getDistributedMember();
+DistributedMember member = system.getDistributedMember();
KnownVersion v = KnownVersion.CURRENT;
if (dos instanceof VersionedDataStream) {
- v = (KnownVersion) ((VersionedDataStream) dos).getVersion();
+ v = ((VersionedDataStream) dos).getVersion();
}
HeapDataOutputStream hdos = new HeapDataOutputStream(v);
DataSerializer.writeObject(member, hdos);
@@ -169,8 +169,8 @@ public class ServerSideHandshakeImpl extends Handshake
implements ServerSideHand
dos.writeUTF("");
// Write delta-propagation property value if this is not WAN.
-if (!communicationMode.isWAN()
[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
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:
[geode] 02/16: GEODE-6588: Static analyzer cleanup.
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 5e744c606fbbcf15699fc00e74f7539c86508c5c
Author: Jacob Barrett
AuthorDate: Fri Jan 15 14:48:09 2021 -0800
GEODE-6588: Static analyzer cleanup.
---
.../codeAnalysis/sanctionedDataSerializables.txt | 4 +-
.../tier/sockets/ClientDataSerializerMessage.java | 66 ++-
.../tier/sockets/ClientInstantiatorMessage.java| 44 +-
.../tier/sockets/ClientInterestMessageImpl.java| 98 ++---
.../tier/sockets/ClientMarkerMessageImpl.java | 12 +-
.../tier/sockets/ClientRegistrationMetadata.java | 2 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 450 ++---
7 files changed, 322 insertions(+), 354 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 075b99d..058733c 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
@@ -1713,7 +1713,7 @@ toData,17
org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage,2
fromData,82
-toData,85
+toData,99
org/apache/geode/internal/cache/tier/sockets/ClientDenylistProcessor$ClientDenylistMessage,2
fromData,25
@@ -1721,7 +1721,7 @@ toData,25
org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage,2
fromData,82
-toData,85
+toData,99
org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl,2
fromData,84
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 78c55d9..31d18b4 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
@@ -31,12 +31,12 @@ import
org.apache.geode.internal.serialization.SerializationContext;
public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
private byte[][] serializedDataSerializer;
- private Class[][] supportedClasses;
+ private Class[][] supportedClasses;
public ClientDataSerializerMessage(EnumListenerEvent operation, byte[][]
dataSerializer,
- ClientProxyMembershipID memberId, EventID eventIdentifier, Class[][]
supportedClasses) {
+ ClientProxyMembershipID memberId, EventID eventIdentifier, Class[][]
supportedClasses) {
super(operation, memberId, eventIdentifier);
-this.serializedDataSerializer = dataSerializer;
+serializedDataSerializer = dataSerializer;
this.supportedClasses = supportedClasses;
}
@@ -73,23 +73,7 @@ public class ClientDataSerializerMessage extends
ClientUpdateMessageImpl {
}
}
- protected Message getGFEMessage(KnownVersion clientVersion) {
-Message message = null;
-int dataSerializerLength = this.serializedDataSerializer.length;
-message = new Message(dataSerializerLength + 1, clientVersion); // one for
eventID
-// Set message type
-message.setMessageType(MessageType.REGISTER_DATASERIALIZERS);
-for (int i = 0; i < dataSerializerLength - 1; i += 2) {
- message.addBytesPart(this.serializedDataSerializer[i]);
- message.addBytesPart(this.serializedDataSerializer[i + 1]);
-}
-message.setTransactionId(0);
-message.addObjPart(this.getEventId());
-return message;
- }
-
- protected Message getGFE6516Message(KnownVersion clientVersion) {
-Message message = null;
+ private Message getGFE6516Message(KnownVersion clientVersion) {
// The format:
// part 0: serializer1 classname
@@ -106,34 +90,34 @@ public class ClientDataSerializerMessage extends
ClientUpdateMessageImpl {
// ...
// Last part: event ID
-int dsLength = this.serializedDataSerializer.length; // multiple of 2
+int dsLength = serializedDataSerializer.length; // multiple of 2
assert (dsLength % 2) == 0;
-int numOfDS = (this.supportedClasses != null) ?
this.supportedClasses.length : 0;
+int numOfDS = (supportedClasses != null) ? supportedClasses.length : 0;
assert (dsLength / 2) == numOfDS;
// Calculate total number of parts
int numOfParts = dsLength + numOfDS;
for (int i = 0; i < numOfDS; i++) {
- if (this.supportedClasses[i] != null) {
-numOfParts += this.supportedClasses[i].length;
+ if (supportedClasses[i] != null) {
+numOfParts += supportedClasses[i].length;
}
}
numOfParts += 1; // one for eventID
// this._logger.fine("Number of parts for
[geode] 03/16: GEODE-8870: Removes GFE_58.
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 a4d6810ab928d552c654ff00182c19c76f1f3b81
Author: Jacob Barrett
AuthorDate: Fri Jan 15 15:18:33 2021 -0800
GEODE-8870: Removes GFE_58.
---
.../java/org/apache/geode/internal/serialization/KnownVersion.java | 7 ---
1 file changed, 7 deletions(-)
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 edde979..1ad966f 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_58_ORDINAL = 3;
-
- @Immutable
- @Deprecated
- public static final KnownVersion GFE_58 =
- new KnownVersion("GFE", "5.8", (byte) 5, (byte) 8, (byte) 0, (byte) 0,
GFE_58_ORDINAL);
-
private static final short GFE_603_ORDINAL = 4;
@Immutable
[geode] branch feature/GEODE-8278-2 updated (b145fc3 -> ae4c0bb)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278-2 in repository https://gitbox.apache.org/repos/asf/geode.git. from b145fc3 GEODE-8278: Added debug logging to Alberto's test add ae4c0bb GEODE-8278: Added additional logging for dunit test No new revisions were added by this update. Summary of changes: .../internal/cache/InitialImageOperation.java | 27 -- ...nderOverflowMBeanAttributesDistributedTest.java | 12 -- 2 files changed, 25 insertions(+), 14 deletions(-)
[geode] branch feature/GEODE-8278 created (now 7c3e2ab)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278 in repository https://gitbox.apache.org/repos/asf/geode.git. at 7c3e2ab GEODE-8278: Update spotless No new revisions were added by this update.
[geode] branch develop updated (dafd288 -> 61a5d2d)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from dafd288 GEODE-8867: Add tests for HLEN (#5955) add 61a5d2d GEODE-8880: skip Redis PR check in 1.13 and older support branches which do not have it (#5964) No new revisions were added by this update. Summary of changes: ci/scripts/execute_tests.sh | 5 + 1 file changed, 5 insertions(+)
[geode] branch develop updated (f8987ed -> dafd288)
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from f8987ed GEODE-8811: Fix new value in events for failing client (#5953)
add dafd288 GEODE-8867: Add tests for HLEN (#5955)
No new revisions were added by this update.
Summary of changes:
.../tools_modules/redis_api_for_geode.html.md.erb | 4 +-
geode-redis/README.md | 80 ++---
.../{HdelDUnitTest.java => HlenDUnitTest.java} | 124 -
.../hash/AbstractHashesIntegrationTest.java| 20 +++-
.../geode/redis/internal/RedisCommandType.java | 8 +-
.../redis/internal/SupportedCommandsJUnitTest.java | 8 +-
6 files changed, 137 insertions(+), 107 deletions(-)
copy
geode-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/{HdelDUnitTest.java
=> HlenDUnitTest.java} (55%)
