[geode] branch develop updated: GEODE-9092: Resolve package splitting geode-common (#6216)
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f8793f8 GEODE-9092: Resolve package splitting geode-common (#6216)
f8793f8 is described below
commit f8793f8f51838051b9ed2927f6259dbae48f6224
Author: Udo Kohlmeyer
AuthorDate: Thu Apr 29 14:22:25 2021 +1000
GEODE-9092: Resolve package splitting geode-common (#6216)
Co-authored-by: Udo Kohlmeyer
Co-authored-by: Patrick Johnson
---
.../java/org/apache/geode/internal/lang/ComputeIfAbsentBenchmark.java | 2 ++
.../src/main/java/org/apache/geode/internal/inet/LocalHostUtil.java| 2 +-
.../org/apache/geode/internal/lang/{ => utils}/JavaWorkarounds.java| 2 +-
.../src/main/java/org/apache/geode/internal/{ => utils}/Retry.java | 2 +-
.../src/test/java/org/apache/geode/internal/{ => utils}/RetryTest.java | 3 ++-
.../apache/geode/connectors/jdbc/internal/TableMetaDataManager.java| 2 +-
.../org/apache/geode/cache/query/internal/AttributeDescriptor.java | 2 +-
.../java/org/apache/geode/internal/cache/backup/BackupDefinition.java | 2 +-
.../geode/internal/cache/execute/metrics/FunctionStatsManager.java | 2 +-
.../apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java | 2 +-
.../src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java | 2 +-
.../java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java | 2 +-
.../main/java/org/apache/geode/cache/lucene/FlatFormatSerializer.java | 2 +-
.../geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java | 2 +-
.../distributed/internal/membership/gms/messenger/GMSEncrypt.java | 2 +-
15 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/geode-common/src/jmh/java/org/apache/geode/internal/lang/ComputeIfAbsentBenchmark.java
b/geode-common/src/jmh/java/org/apache/geode/internal/lang/ComputeIfAbsentBenchmark.java
index ec91149..4f28a81 100644
---
a/geode-common/src/jmh/java/org/apache/geode/internal/lang/ComputeIfAbsentBenchmark.java
+++
b/geode-common/src/jmh/java/org/apache/geode/internal/lang/ComputeIfAbsentBenchmark.java
@@ -28,6 +28,8 @@ import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
+import org.apache.geode.internal.lang.utils.JavaWorkarounds;
+
/**
* Test spins up threads that constantly do computeIfAbsent
diff --git
a/geode-common/src/main/java/org/apache/geode/internal/inet/LocalHostUtil.java
b/geode-common/src/main/java/org/apache/geode/internal/inet/LocalHostUtil.java
index b947aaf..2e917f6 100644
---
a/geode-common/src/main/java/org/apache/geode/internal/inet/LocalHostUtil.java
+++
b/geode-common/src/main/java/org/apache/geode/internal/inet/LocalHostUtil.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.inet;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.geode.internal.Retry.tryFor;
+import static org.apache.geode.internal.utils.Retry.tryFor;
import java.net.Inet4Address;
import java.net.Inet6Address;
diff --git
a/geode-common/src/main/java/org/apache/geode/internal/lang/JavaWorkarounds.java
b/geode-common/src/main/java/org/apache/geode/internal/lang/utils/JavaWorkarounds.java
similarity index 96%
rename from
geode-common/src/main/java/org/apache/geode/internal/lang/JavaWorkarounds.java
rename to
geode-common/src/main/java/org/apache/geode/internal/lang/utils/JavaWorkarounds.java
index 29518aa..da5bd4c 100644
---
a/geode-common/src/main/java/org/apache/geode/internal/lang/JavaWorkarounds.java
+++
b/geode-common/src/main/java/org/apache/geode/internal/lang/utils/JavaWorkarounds.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.geode.internal.lang;
+package org.apache.geode.internal.lang.utils;
import java.util.Map;
import java.util.function.Function;
diff --git a/geode-common/src/main/java/org/apache/geode/internal/Retry.java
b/geode-common/src/main/java/org/apache/geode/internal/utils/Retry.java
similarity index 98%
rename from geode-common/src/main/java/org/apache/geode/internal/Retry.java
rename to geode-common/src/main/java/org/apache/geode/internal/utils/Retry.java
index 6189c36..f150ffb 100644
--- a/geode-common/src/main/java/org/apache/geode/internal/Retry.java
+++ b/geode-common/src/main/java/org/apache/geode/internal/utils/Retry.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.internal;
+package org.apache.geode.internal.utils;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
diff --git
a/geode-common/src/test/java/org/apache/geode/internal/RetryTest.java
b/geode-common/src/test/java/org/apache/geode/internal/utils/RetryTest.java
similarity index 98%
rename from
[geode] branch develop updated: GEODE-9093 - Resolve package splitting for geode-connectors (#6217)
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 94104d2 GEODE-9093 - Resolve package splitting for geode-connectors
(#6217)
94104d2 is described below
commit 94104d2ebf5a9a39a7d2babb975ffb9fe4a640a4
Author: Udo Kohlmeyer
AuthorDate: Thu Apr 29 14:22:02 2021 +1000
GEODE-9093 - Resolve package splitting for geode-connectors (#6217)
Co-authored-by: Udo Kohlmeyer
Co-authored-by: Patrick Johnson
---
.../geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java | 6 ++
.../jdbc}/internal/ConnectorsDistributedSystemService.java | 3 ++-
.../management/internal/cli/converters/PoolPropertyConverter.java | 2 +-
.../org.apache.geode.distributed.internal.DistributedSystemService | 2 +-
.../jdbc}/internal/sanctioned-geode-connectors-serializables.txt| 0
.../org/apache/geode/management/internal/cli/CommandManager.java| 4 ++--
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git
a/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
index 88d12c7..9832474 100644
---
a/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
+++
b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
+import
org.apache.geode.connectors.jdbc.internal.ConnectorsDistributedSystemService;
import org.apache.geode.test.junit.categories.SerializationTest;
@Category({SerializationTest.class})
@@ -25,4 +26,9 @@ public class AnalyzeConnectorsSerializablesJUnitTest extends
AnalyzeSerializable
protected String getModuleName() {
return "geode-connectors";
}
+
+ @Override
+ protected Class getModuleClass() {
+return ConnectorsDistributedSystemService.class;
+ }
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectorsDistributedSystemService.java
similarity index 93%
rename from
geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectorsDistributedSystemService.java
index 4643bc1..90eec08 100644
---
a/geode-connectors/src/main/java/org/apache/geode/internal/ConnectorsDistributedSystemService.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectorsDistributedSystemService.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.internal;
+package org.apache.geode.connectors.jdbc.internal;
import java.io.IOException;
import java.net.URL;
@@ -20,6 +20,7 @@ import java.util.Collection;
import org.apache.geode.distributed.internal.DistributedSystemService;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.classloader.ClassPathLoader;
public class ConnectorsDistributedSystemService implements
DistributedSystemService {
diff --git
a/geode-connectors/src/main/java/org/apache/geode/management/internal/cli/converters/PoolPropertyConverter.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/management/internal/cli/converters/PoolPropertyConverter.java
similarity index 96%
rename from
geode-connectors/src/main/java/org/apache/geode/management/internal/cli/converters/PoolPropertyConverter.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/management/internal/cli/converters/PoolPropertyConverter.java
index 6127a18..b80b3a9 100644
---
a/geode-connectors/src/main/java/org/apache/geode/management/internal/cli/converters/PoolPropertyConverter.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/management/internal/cli/converters/PoolPropertyConverter.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.management.internal.cli.converters;
+package org.apache.geode.connectors.jdbc.management.internal.cli.converters;
import java.io.IOException;
import java.util.List;
diff --git
a/geode-connectors/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService
[geode-native] branch develop updated: GEODE-9193: Use local object variable for PING messages. (#792)
This is an automated email from the ASF dual-hosted git repository.
bbender 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 ac6a960 GEODE-9193: Use local object variable for PING messages.
(#792)
ac6a960 is described below
commit ac6a96072faa313814ad77f39e4511f472cfd62d
Author: Blake Bender
AuthorDate: Wed Apr 28 21:01:31 2021 -0700
GEODE-9193: Use local object variable for PING messages. (#792)
Just declare a local variable, rather than attempt to cache the message
- Make DataOutput param to ping message ctor a smart pointer
- Remove unused 'decodeAll' param from ping message ctor
- Remove some unused local vars in test code
---
cppcache/src/TcrEndpoint.cpp | 7 ---
cppcache/src/TcrMessage.cpp | 11 ++-
cppcache/src/TcrMessage.hpp | 5 +
cppcache/test/TcrMessageTest.cpp | 17 ++---
4 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/cppcache/src/TcrEndpoint.cpp b/cppcache/src/TcrEndpoint.cpp
index 7b49104..7735cf7 100644
--- a/cppcache/src/TcrEndpoint.cpp
+++ b/cppcache/src/TcrEndpoint.cpp
@@ -504,14 +504,15 @@ void TcrEndpoint::pingServer(ThinClientPoolDM* poolDM) {
}
if (!m_msgSent && !m_pingSent) {
-TcrMessagePing* pingMsg = TcrMessage::getPingMessage(m_cacheImpl);
+TcrMessagePing pingMsg(std::unique_ptr(
+new DataOutput(m_cacheImpl->createDataOutput(;
TcrMessageReply reply(true, nullptr);
LOGFINEST("Sending ping message to endpoint %s", m_name.c_str());
GfErrType error;
if (poolDM != nullptr) {
- error = poolDM->sendRequestToEP(*pingMsg, reply, this);
+ error = poolDM->sendRequestToEP(pingMsg, reply, this);
} else {
- error = send(*pingMsg, reply);
+ error = send(pingMsg, reply);
}
LOGFINEST("Sent ping message to endpoint %s with error code %d%s",
m_name.c_str(), error, error == GF_NOERR ? " (no error)" : "");
diff --git a/cppcache/src/TcrMessage.cpp b/cppcache/src/TcrMessage.cpp
index cd15912..cd8ca3e 100644
--- a/cppcache/src/TcrMessage.cpp
+++ b/cppcache/src/TcrMessage.cpp
@@ -341,12 +341,6 @@ std::shared_ptr
TcrMessage::getTombstoneKeys() const {
return m_tombstoneKeys;
}
-TcrMessagePing* TcrMessage::getPingMessage(CacheImpl* cacheImpl) {
- static auto pingMsg =
- new TcrMessagePing(new DataOutput(cacheImpl->createDataOutput()), true);
- return pingMsg;
-}
-
TcrMessage* TcrMessage::getAllEPDisMess() {
static auto allEPDisconnected = new TcrMessageReply(true, nullptr);
return allEPDisconnected;
@@ -2088,10 +2082,9 @@ TcrMessageReply::TcrMessageReply(bool decodeAll,
if (connectionDM != nullptr) isSecurityOn = connectionDM->isSecurityOn();
}
-TcrMessagePing::TcrMessagePing(DataOutput* dataOutput, bool decodeAll) {
+TcrMessagePing::TcrMessagePing(std::unique_ptr dataOutput) {
m_msgType = TcrMessage::PING;
- m_decodeAll = decodeAll;
- m_request.reset(dataOutput);
+ m_request = std::move(dataOutput);
writeHeader(m_msgType, 0);
writeMessageLength();
}
diff --git a/cppcache/src/TcrMessage.hpp b/cppcache/src/TcrMessage.hpp
index 82d5d2c..d4e3d7d 100644
--- a/cppcache/src/TcrMessage.hpp
+++ b/cppcache/src/TcrMessage.hpp
@@ -258,9 +258,6 @@ class TcrMessage {
std::chrono::milliseconds getTimeout() const;
void setTimeout(std::chrono::milliseconds timeout);
- /* we need a static method to generate ping */
- /* The caller should not delete the message since it is global. */
- static TcrMessagePing* getPingMessage(CacheImpl* cacheImpl);
static TcrMessage* getAllEPDisMess();
/* we need a static method to generate close connection message */
/* The caller should not delete the message since it is global. */
@@ -911,7 +908,7 @@ class TcrMessageExecuteFunction : public TcrMessage {
class TcrMessagePing : public TcrMessage {
public:
- TcrMessagePing(DataOutput* dataOutput, bool decodeAll);
+ explicit TcrMessagePing(std::unique_ptr dataOutput);
~TcrMessagePing() override = default;
};
diff --git a/cppcache/test/TcrMessageTest.cpp b/cppcache/test/TcrMessageTest.cpp
index 1f811bd..0234834 100644
--- a/cppcache/test/TcrMessageTest.cpp
+++ b/cppcache/test/TcrMessageTest.cpp
@@ -548,8 +548,6 @@ TEST_F(TcrMessageTest, testConstructorGetPdxIdForEnum) {
TEST_F(TcrMessageTest, testConstructorAddPdxEnum) {
using apache::geode::client::TcrMessageAddPdxEnum;
- std::shared_ptr myPtr(CacheableString::createDeserializable());
-
TcrMessageAddPdxEnum message(new DataOutputUnderTest(),
static_cast>(nullptr),
static_cast(nullptr), 42);
@@ -747,9 +745,6 @@ TEST_F(TcrMessageTest, testConstructorExecuteCq) {
TEST_F(TcrMessageTest, testConstructorWithGinormousQueryExecuteCq) {
using apache::geode::client::TcrMessageExecuteCq;
- std::shared_ptr myCacheablePtr(
-
[geode] branch develop updated (8d99d08 -> f6fee95)
This is an automated email from the ASF dual-hosted git repository. moleske pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 8d99d08 GEODE-8977: improve thread monitor to log lock information (#6377) add f6fee95 GEODE-9161: Use not deperacted property in gradle build (#6388) No new revisions were added by this update. Summary of changes: extensions/geode-modules-assembly/build.gradle | 2 +- geode-assembly/build.gradle| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[geode] branch develop updated (3c2035c -> 8d99d08)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 3c2035c GEODE-9079: downsize non-intentensive CI instances (#6206) add 8d99d08 GEODE-8977: improve thread monitor to log lock information (#6377) No new revisions were added by this update. Summary of changes: .../ThreadsMonitoringIntegrationTest.java | 24 ++-- .../monitoring/ThreadsMonitoringProcess.java | 122 ++--- .../monitoring/executor/AbstractExecutor.java | 80 ++ .../monitoring/executor/SuspendableExecutor.java | 4 + .../executor/AbstractExecutorGroupJUnitTest.java | 30 +++-- 5 files changed, 197 insertions(+), 63 deletions(-)
[geode] branch develop updated (97700d3 -> 3c2035c)
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 97700d3 GEODE-8862: Send grant message to remote node using waiting thread pool. (#6361) add 3c2035c GEODE-9079: downsize non-intentensive CI instances (#6206) No new revisions were added by this update. Summary of changes: buildSrc/build.gradle | 1 - ci/pipelines/geode-build/jinja.template.yml | 2 +- ci/pipelines/shared/jinja.variables.yml | 28 ++-- ci/scripts/rsync_code_down.sh | 9 ++--- 4 files changed, 21 insertions(+), 19 deletions(-)
[geode] branch develop updated (d7cf967 -> 97700d3)
This is an automated email from the ASF dual-hosted git repository. eshu11 pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d7cf967 GEODE-9158: Add CLUSTER NODES, SLOTS and INFO commands (#6359) add 97700d3 GEODE-8862: Send grant message to remote node using waiting thread pool. (#6361) No new revisions were added by this update. Summary of changes: .../internal/locks/DLockRequestProcessor.java | 32 +-- .../internal/locks/DLockRequestProcessorTest.java | 101 + 2 files changed, 126 insertions(+), 7 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessorTest.java
[geode] branch develop updated (a533575 -> d7cf967)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from a533575 GEODE-9156: Replace docker-compose-rule with testcontainers
in geode-connectors (#6378)
add d7cf967 GEODE-9158: Add CLUSTER NODES, SLOTS and INFO commands (#6359)
No new revisions were added by this update.
Summary of changes:
geode-apis-compatible-with-redis/build.gradle | 1 +
.../apache/geode/redis/NativeRedisClusterTest.java | 7 +-
.../cluster/ClusterNativeRedisAcceptanceTest.java} | 12 +-
.../proxy/HostPort.java => ClusterNode.java} | 48 ++---
.../java/org/apache/geode/redis/ClusterNodes.java | 126 +
.../NativeRedisClusterTestRule.java| 56 +-
.../apache/geode/test/dunit/rules/ClusterNode.java | 35
.../cluster/ClusterSlotsAndNodesDUnitTest.java | 163 +
.../cluster/JedisAndLettuceClusterDUnitTest.java | 89 +
.../AbstractClusterIntegrationTest.java} | 39 ++--
.../ClusterIntegrationTest.java} | 4 +-
.../geode/redis/internal/GeodeRedisServer.java | 8 +-
...ents.java => ClusterParameterRequirements.java} | 17 +-
.../geode/redis/internal/RedisCommandType.java | 5 +
.../geode/redis/internal/RedisConstants.java | 2 +
.../cluster/BucketInfoRetrievalFunction.java | 118
.../internal/executor/cluster/ClusterExecutor.java | 203 +
.../internal/netty/ExecutionHandlerContext.java| 10 +-
.../redis/internal/netty/NettyRedisServer.java | 7 +-
...de-apis-compatible-with-redis-serializables.txt | 2 +
.../redis/internal/SupportedCommandsJUnitTest.java | 1 +
.../src/test/resources/expected-pom.xml| 16 ++
22 files changed, 814 insertions(+), 155 deletions(-)
copy
geode-apis-compatible-with-redis/src/acceptanceTest/java/org/apache/geode/redis/{CommandPipeliningNativeRedisAcceptanceTest.java
=> internal/executor/cluster/ClusterNativeRedisAcceptanceTest.java} (72%)
copy
geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/{internal/proxy/HostPort.java
=> ClusterNode.java} (51%)
create mode 100644
geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/redis/ClusterNodes.java
rename
geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/{test/dunit/rules
=> redis}/NativeRedisClusterTestRule.java (75%)
delete mode 100644
geode-apis-compatible-with-redis/src/commonTest/java/org/apache/geode/test/dunit/rules/ClusterNode.java
create mode 100644
geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/ClusterSlotsAndNodesDUnitTest.java
create mode 100644
geode-apis-compatible-with-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/cluster/JedisAndLettuceClusterDUnitTest.java
copy
geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/{server/AbstractFlushDBIntegrationTest.java
=> cluster/AbstractClusterIntegrationTest.java} (52%)
copy
geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/{key/PexpireIntegrationTest.java
=> cluster/ClusterIntegrationTest.java} (89%)
copy
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/ParameterRequirements/{MinimumParameterRequirements.java
=> ClusterParameterRequirements.java} (73%)
create mode 100644
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/cluster/BucketInfoRetrievalFunction.java
create mode 100644
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
[geode] branch develop updated (9d0d4d1 -> a533575)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 9d0d4d1 GEODE-9141: (2 of 2) Handle in-buffer concurrency *
Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent
return to pool before socket closer is finished
add a533575 GEODE-9156: Replace docker-compose-rule with testcontainers
in geode-connectors (#6378)
No new revisions were added by this update.
Summary of changes:
geode-connectors/build.gradle | 10 +--
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 6 +-
.../geode/connectors/jdbc/JdbcDistributedTest.java | 91 +++---
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 6 +-
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 6 +-
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 11 +--
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 40 ++
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 11 +--
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 11 +--
.../PostgresJdbcAsyncWriterIntegrationTest.java| 11 +--
.../jdbc/PostgresJdbcDistributedTest.java | 40 ++
.../jdbc/PostgresJdbcLoaderIntegrationTest.java| 22 +++---
.../jdbc/PostgresJdbcWriterIntegrationTest.java| 29 +++
.../connectors/jdbc/TestDataSourceFactory.java | 8 +-
.../MySqlTableMetaDataManagerIntegrationTest.java | 6 +-
...ostgresTableMetaDataManagerIntegrationTest.java | 6 +-
.../jdbc/test/junit/rules/MySqlConnectionRule.java | 23 +++---
.../test/junit/rules/PostgresConnectionRule.java | 18 ++---
.../junit/rules/SqlDatabaseConnectionRule.java | 61 ++-
.../geode/connectors/jdbc/internal => }/mysql.yml | 6 +-
.../org/apache/geode/connectors/jdbc/mysql.yml | 28 ---
.../org/apache/geode/connectors/jdbc/postgres.yml | 28 ---
.../connectors/jdbc/internal => }/postgres.yml | 4 +-
23 files changed, 235 insertions(+), 247 deletions(-)
rename
geode-connectors/src/acceptanceTest/resources/{org/apache/geode/connectors/jdbc/internal
=> }/mysql.yml (92%)
delete mode 100644
geode-connectors/src/acceptanceTest/resources/org/apache/geode/connectors/jdbc/mysql.yml
delete mode 100644
geode-connectors/src/acceptanceTest/resources/org/apache/geode/connectors/jdbc/postgres.yml
rename
geode-connectors/src/acceptanceTest/resources/{org/apache/geode/connectors/jdbc/internal
=> }/postgres.yml (95%)
[geode] branch develop updated (f8b07a0 -> 9d0d4d1)
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 f8b07a0 GEODE-9180: warn when heartbeat thread oversleeps (#6360)
add 38a3540 GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to
ByteBuferVendor
add 9d0d4d1 GEODE-9141: (2 of 2) Handle in-buffer concurrency *
Connection uses a ByteBufferVendor to mediate access to inputBuffer * Prevent
return to pool before socket closer is finished
No new revisions were added by this update.
Summary of changes:
...LSocketHostNameVerificationIntegrationTest.java | 6 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../org/apache/geode/internal/net/BufferPool.java | 4 +-
.../geode/internal/net/ByteBufferSharing.java | 15 ++
.../geode/internal/net/ByteBufferSharingNoOp.java | 7 +-
...ufferSharingImpl.java => ByteBufferVendor.java} | 146
.../apache/geode/internal/net/NioSslEngine.java| 56 +++--
.../apache/geode/internal/net/SocketCreator.java | 5 +-
.../org/apache/geode/internal/tcp/Connection.java | 250 ++---
.../internal/net/ByteBufferConcurrencyTest.java| 16 +-
...ringImplTest.java => ByteBufferVendorTest.java} | 40 ++--
.../geode/internal/net/NioSslEngineTest.java | 41 ++--
.../apache/geode/internal/tcp/ConnectionTest.java | 1 +
14 files changed, 334 insertions(+), 258 deletions(-)
rename
geode-core/src/main/java/org/apache/geode/internal/net/{ByteBufferSharingImpl.java
=> ByteBufferVendor.java} (53%)
rename
geode-core/src/test/java/org/apache/geode/internal/net/{ByteBufferSharingImplTest.java
=> ByteBufferVendorTest.java} (84%)
[geode] branch develop updated (b18836c -> f8b07a0)
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 b18836c GEODE-9163: Mark docs for apis compatible with Redis as experimental (#6374) add f8b07a0 GEODE-9180: warn when heartbeat thread oversleeps (#6360) No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 47 + .../membership/gms/fd/GMSHealthMonitor.java| 190 - 2 files changed, 161 insertions(+), 76 deletions(-)
[geode] branch develop updated (465173c -> b18836c)
This is an automated email from the ASF dual-hosted git repository. sabbey37 pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 465173c GEODE-9174: fix displaying the result of a gfsh query containing a UUID (#6365) add b18836c GEODE-9163: Mark docs for apis compatible with Redis as experimental (#6374) No new revisions were added by this update. Summary of changes: geode-apis-compatible-with-redis/README.md | 3 ++- geode-book/master_middleman/source/subnavs/geode-subnav.erb | 2 +- .../tools_modules/geode_apis_compatible_with_redis.html.md.erb | 6 -- 3 files changed, 7 insertions(+), 4 deletions(-)
[geode] branch develop updated: GEODE-9174: fix displaying the result of a gfsh query containing a UUID (#6365)
This is an automated email from the ASF dual-hosted git repository.
mkevo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 465173c GEODE-9174: fix displaying the result of a gfsh query
containing a UUID (#6365)
465173c is described below
commit 465173cf7de037239f08b27921066fd84e8cc1f9
Author: Mario Kevo <48509719+mk...@users.noreply.github.com>
AuthorDate: Wed Apr 28 08:17:02 2021 +0200
GEODE-9174: fix displaying the result of a gfsh query containing a UUID
(#6365)
---
.../cli/commands/QueryCommandDUnitTestBase.java| 23 ++
.../internal/cli/domain/DataCommandResult.java | 3 +++
2 files changed, 26 insertions(+)
diff --git
a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java
b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java
index 4ece413..52f27f2 100644
---
a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
+import java.util.UUID;
import org.junit.Before;
import org.junit.Rule;
@@ -176,6 +177,21 @@ public class QueryCommandDUnitTestBase {
}
@Test
+ public void testSimpleQueryWithUUID() {
+server1.invoke(() ->
prepareDataForRegionWithUUID(DATA_PAR_REGION_NAME_PATH));
+String uuidKey = String.valueOf(new UUID(1, 1));
+String query = "query --query=\"select key from " +
DATA_PAR_REGION_NAME_PATH
++ ".entries\"";
+String query1 = "query --query=\"select key,value from " +
DATA_PAR_REGION_NAME_PATH
++ ".entries\"";
+
+gfsh.executeAndAssertThat(query).statusIsSuccess()
+.containsOutput(uuidKey);
+gfsh.executeAndAssertThat(query1).statusIsSuccess()
+.containsOutput(uuidKey, "value");
+ }
+
+ @Test
public void testQueryEvictedDataDeserializable() {
server1.invoke(() ->
setupReplicatedRegionWithEviction(DATA_REGION_WITH_EVICTION_NAME));
locator.waitUntilRegionIsReadyOnExactlyThisManyServers(DATA_REGION_WITH_EVICTION_NAME_PATH,
1);
@@ -220,6 +236,13 @@ public class QueryCommandDUnitTestBase {
dataRegion.put(2, "value%");
}
+ private static void prepareDataForRegionWithUUID(String regionPath) {
+InternalCache cache = ClusterStartupRule.getCache();
+Region dataRegion = cache.getRegion(regionPath);
+
+dataRegion.put(new UUID(1, 1), "value");
+ }
+
private static void prepareNotDeserializableDataForRegion(String regionPath)
{
InternalCache cache = ClusterStartupRule.getCache();
Region dataRegion = cache.getRegion(regionPath);
diff --git
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
index 3f00a95..6bd5fcd 100644
---
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
+++
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
@@ -687,6 +688,8 @@ public class DataCommandResult implements Serializable {
resolvePdxToColumns(columnData, (PdxInstance) value);
} else if (value instanceof Struct) {
resolveStructToColumns(columnData, (StructImpl) value);
+ } else if (value instanceof UUID) {
+columnData.put("Result", valueToJson(value));
} else {
ObjectMapper mapper = new ObjectMapper();
JsonNode node = mapper.valueToTree(value);
