[geode] branch develop updated (a222dbc -> 25d58f6)
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 a222dbc GEODE-8881: add tests for redis HKEYS command (#5972) add 25d58f6 GEODE-8885: move hincrby command to supported (#5973) No new revisions were added by this update. Summary of changes: .../hash/AbstractHashesIntegrationTest.java| 101 + .../geode/redis/internal/RedisCommandType.java | 2 +- .../redis/internal/SupportedCommandsJUnitTest.java | 6 +- 3 files changed, 86 insertions(+), 23 deletions(-)
[geode] 01/01: Revert "Feature/geode 8768 (#5843)"
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-8928
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 526dcbb3e15559d634f381dd09b9d9ff7dd64d03
Author: zhouxh
AuthorDate: Mon Feb 8 15:24:23 2021 -0800
Revert "Feature/geode 8768 (#5843)"
This reverts commit 48a733a576e7db8d558280cfc4491f079c7eefe3.
---
.../admin/remote/DistributionLocatorId.java| 104 +---
.../sanctioned-geode-core-serializables.txt| 2 +-
.../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 24 +---
.../wan/misc/WanLocatorDiscoveryDUnitTest.java | 131 -
.../client/internal/locator/wan/LocatorHelper.java | 33 --
.../locator/wan/LocatorMembershipListenerImpl.java | 12 +-
.../locator/wan/WanLocatorDiscovererImpl.java | 24 +---
7 files changed, 17 insertions(+), 313 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
index b69d6c4..3af2017 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DistributionLocatorId.java
@@ -20,7 +20,6 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
@@ -34,9 +33,7 @@ import org.apache.geode.internal.net.SocketCreator;
/**
* Identifies the host, port, and bindAddress a distribution locator is
listening on.
- * Also identifies member name of the distribution locator. This is used to
improve
- * locator discovery logic.
- * If member name is set to null, then design base logic will be used.
+ *
*
*/
public class DistributionLocatorId implements java.io.Serializable {
@@ -52,14 +49,9 @@ public class DistributionLocatorId implements
java.io.Serializable {
private boolean serverLocator = true;
private String hostnameForClients;
private String hostname;
- // added due to improvement for cloud native environment
- private final String membername;
-
/**
* Constructs a DistributionLocatorId with the given host and port.
- * This constructor is used for design base behavior.
- *
*/
public DistributionLocatorId(InetAddress host, int port, String bindAddress,
SSLConfig sslConfig) {
@@ -67,24 +59,16 @@ public class DistributionLocatorId implements
java.io.Serializable {
this.port = port;
this.bindAddress = validateBindAddress(bindAddress);
this.sslConfig = validateSSLConfig(sslConfig);
-this.membername = null;
}
+ /**
+ * Constructs a DistributionLocatorId with the given port. The host will be
set to the local host.
+ */
public DistributionLocatorId(int port, String bindAddress) {
this(port, bindAddress, null);
}
public DistributionLocatorId(int port, String bindAddress, String
hostnameForClients) {
-this(port, bindAddress, hostnameForClients, null);
- }
-
- /**
- * Constructs a DistributionLocatorId with the given port and member name.
- * The host will be set to the local host.
- *
- */
- public DistributionLocatorId(int port, String bindAddress, String
hostnameForClients,
- String membername) {
try {
this.host = LocalHostUtil.getLocalHost();
} catch (UnknownHostException ex) {
@@ -95,7 +79,6 @@ public class DistributionLocatorId implements
java.io.Serializable {
this.bindAddress = validateBindAddress(bindAddress);
this.sslConfig = validateSSLConfig(null);
this.hostnameForClients = hostnameForClients;
-this.membername = membername;
}
public DistributionLocatorId(InetAddress host, int port, String bindAddress,
SSLConfig sslConfig,
@@ -105,10 +88,8 @@ public class DistributionLocatorId implements
java.io.Serializable {
this.bindAddress = validateBindAddress(bindAddress);
this.sslConfig = validateSSLConfig(sslConfig);
this.hostnameForClients = hostnameForClients;
-this.membername = null;
}
-
/**
* Constructs a DistributionLocatorId with a String of the form:
hostname[port] or
* hostname:bindaddress[port] or hostname@bindaddress[port]
@@ -123,29 +104,6 @@ public class DistributionLocatorId implements
java.io.Serializable {
* two.
*/
public DistributionLocatorId(String marshalled) {
-this(marshalled, null);
- }
-
- /**
- * Constructs a DistributionLocatorId with a String of the form:
hostname[port] or
- * hostname:bindaddress[port] or hostname@bindaddress[port]
- * and membername
- *
- * The :bindaddress portion is optional. hostname[port] is the more common
form.
- *
- * Example: merry.gemstone.com[7056]
- * Example w/ bind address: merry.gemstone.com:81.240.0.1[7056], or
- *
[geode] branch feature/GEODE-8928 created (now 526dcbb)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-8928 in repository https://gitbox.apache.org/repos/asf/geode.git. at 526dcbb Revert "Feature/geode 8768 (#5843)" This branch includes the following new commits: new 526dcbb Revert "Feature/geode 8768 (#5843)" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode-native] branch develop updated: GEODE-8562: Use standard .NET types in .NET ClassAsKey Example (#742)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 453324b GEODE-8562: Use standard .NET types in .NET ClassAsKey
Example (#742)
453324b is described below
commit 453324b7460c575424b8cb96878b1e4118ff7bd4
Author: Michael Martell
AuthorDate: Mon Feb 8 13:55:08 2021 -0800
GEODE-8562: Use standard .NET types in .NET ClassAsKey Example (#742)
* Use standard .NET types (e.g. String instead of CacheableString)
* Use new Objects.Hash() API so client and server match
* Remove public from CacheableString since no longer needed
* Print matching hashCode output and add to README.md
---
clicache/src/CacheableString.hpp| 2 +-
examples/dotnet/classaskey/PhotosKey.cs | 39 +++-
examples/dotnet/classaskey/Program.cs | 42 +++--
examples/dotnet/classaskey/README.md| 80 +
examples/utilities/PhotosKey.java | 15 ++-
5 files changed, 87 insertions(+), 91 deletions(-)
diff --git a/clicache/src/CacheableString.hpp b/clicache/src/CacheableString.hpp
index b4f1c37..c15d7f3 100644
--- a/clicache/src/CacheableString.hpp
+++ b/clicache/src/CacheableString.hpp
@@ -40,7 +40,7 @@ namespace Apache
/// An immutable string wrapper that can serve as a distributable
/// key object for caching as well as being a string value.
///
- public ref class CacheableString
+ ref class CacheableString
: public IDataSerializablePrimitive, public CacheableKey
{
public:
diff --git a/examples/dotnet/classaskey/PhotosKey.cs
b/examples/dotnet/classaskey/PhotosKey.cs
index eb8bb9a..f94c4ef 100644
--- a/examples/dotnet/classaskey/PhotosKey.cs
+++ b/examples/dotnet/classaskey/PhotosKey.cs
@@ -22,18 +22,22 @@ namespace Apache.Geode.Examples.ClassAsKey
{
public class PhotosKey : IDataSerializable, ICacheableKey
{
-public List people;
-public CacheableDate rangeStart;
-public CacheableDate rangeEnd;
+public List people;
+public DateTime rangeStart;
+public DateTime rangeEnd;
// A default constructor is required for deserialization
public PhotosKey() { }
-public PhotosKey(List names, CacheableDate start,
CacheableDate end)
+public PhotosKey(List names, DateTime start, DateTime end)
{
people = names;
- rangeStart = start;
- rangeEnd = end;
+
+ // Geode server defaults to Utc to ensure hashes match between client and
+ // server
+ TimeZone tz = TimeZone.CurrentTimeZone;
+ rangeStart = tz.ToUniversalTime(start);
+ rangeEnd = tz.ToUniversalTime(end);
}
public override string ToString()
@@ -53,15 +57,15 @@ namespace Apache.Geode.Examples.ClassAsKey
public void ToData(DataOutput output)
{
output.WriteObject(people);
- output.WriteObject(rangeStart);
- output.WriteObject(rangeEnd);
+ output.WriteDate(rangeStart);
+ output.WriteDate(rangeEnd);
}
public void FromData(DataInput input)
{
- people = (List)input.ReadObject();
- rangeStart = (CacheableDate)input.ReadObject();
- rangeEnd = (CacheableDate)input.ReadObject();
+ people = (List)input.ReadObject();
+ rangeStart = (DateTime)input.ReadDate();
+ rangeEnd = (DateTime)input.ReadDate();
}
public ulong ObjectSize
@@ -94,17 +98,7 @@ namespace Apache.Geode.Examples.ClassAsKey
public override int GetHashCode()
{
- int prime = 31;
- int result = 1;
- foreach (CacheableString cs in people)
- {
-result = result * prime + cs.GetHashCode();
- }
-
- result = result * prime + rangeStart.GetHashCode();
- result = result * prime + rangeEnd.GetHashCode();
-
- return result;
+ return Objects.Hash(people, rangeStart, rangeEnd);
}
public static ISerializable CreateDeserializable()
@@ -114,4 +108,3 @@ namespace Apache.Geode.Examples.ClassAsKey
}
}
-
diff --git a/examples/dotnet/classaskey/Program.cs
b/examples/dotnet/classaskey/Program.cs
index e51093d..0352440 100644
--- a/examples/dotnet/classaskey/Program.cs
+++ b/examples/dotnet/classaskey/Program.cs
@@ -39,8 +39,8 @@ namespace Apache.Geode.Examples.ClassAsKey
PhotosKey[] keys = new PhotosKey[MAXPHOTOKEYS];
PhotosValue[] values = new PhotosValue[MAXPHOTOKEYS];
- CacheableDate start;
- CacheableDate end;
+ DateTime start;
+ DateTime end;
rand = new Random();
int numPhotos;
@@ -62,7 +62,8 @@ namespace Apache.Geode.Examples.ClassAsKey
}
values[i] = new PhotosValue(metaData);
-Console.WriteLine("Inserting " + numPhotos + " photos for key: " +
keys[i].ToString());
+Console.WriteLine("Inserting " + numPhotos + " photos for key: " +
[geode] branch develop updated (5b0cf7f -> a222dbc)
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 5b0cf7f GEODE-8901: Surviving side server forcefully disconnected
after network drop (#5984)
add a222dbc GEODE-8881: add tests for redis HKEYS command (#5972)
No new revisions were added by this update.
Summary of changes:
.../{HExistsDUnitTest.java => HKeysDUnitTest.java} | 90 +-
.../hash/AbstractHashesIntegrationTest.java| 31 +++-
.../geode/redis/internal/RedisCommandType.java | 2 +-
.../redis/internal/SupportedCommandsJUnitTest.java | 2 +-
4 files changed, 86 insertions(+), 39 deletions(-)
copy
geode-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/hash/{HExistsDUnitTest.java
=> HKeysDUnitTest.java} (59%)
[geode] branch develop updated (39d2d2b -> 5b0cf7f)
This is an automated email from the ASF dual-hosted git repository. burcham pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 39d2d2b GEODE-8917: Revise gfsh export stack-traces docs (#6009) add 5b0cf7f GEODE-8901: Surviving side server forcefully disconnected after network drop (#5984) No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 44 ++ .../gms/membership/GMSJoinLeaveJUnitTest.java | 25 .../membership/gms/fd/GMSHealthMonitor.java| 8 +++- .../membership/gms/interfaces/HealthMonitor.java | 12 ++ .../membership/gms/membership/GMSJoinLeave.java| 14 --- 5 files changed, 90 insertions(+), 13 deletions(-)
[geode] branch develop updated (32ac6e1 -> 39d2d2b)
This is an automated email from the ASF dual-hosted git repository. kmiller pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 32ac6e1 GEODE-8923: Bump shiro from 1.7.0 to 1.7.1 (#6010) add 39d2d2b GEODE-8917: Revise gfsh export stack-traces docs (#6009) No new revisions were added by this update. Summary of changes: .../gfsh/command-pages/export.html.md.erb| 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-)
