[geode] branch develop updated (f408b6c -> 2271b7f)
This is an automated email from the ASF dual-hosted git repository. donalevans pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f408b6c GEODE-7968: UG - Fix region shortcut table format issues (#6566) add 2271b7f GEODE-9287: Always use Coder for Radish String/byte[] conversion (#6599) No new revisions were added by this update. Summary of changes: geode-apis-compatible-with-redis/build.gradle | 1 + .../java/org/apache/geode/redis/ClusterNodes.java | 6 +- .../internal/executor/key/RenameDUnitTest.java | 6 +- .../internal/executor/sortedset/ZRemDUnitTest.java | 4 +- .../geode/redis/session/SessionDUnitTest.java | 4 +- .../redis/session/SessionExpirationDUnitTest.java | 3 +- .../redis/RedisCommandArgumentsTestHelper.java | 17 +- .../executor/AbstractUnknownIntegrationTest.java | 37 ++-- .../cluster/AbstractClusterIntegrationTest.java| 4 + .../hash/AbstractHScanIntegrationTest.java | 71 --- .../hash/AbstractHashesIntegrationTest.java| 5 +- .../hash/AbstractHincrByFloatIntegrationTest.java | 9 +- .../executor/key/AbstractDelIntegrationTest.java | 3 +- .../executor/key/AbstractKeysIntegrationTest.java | 6 +- .../key/AbstractRenameIntegrationTest.java | 13 +- .../executor/key/AbstractScanIntegrationTest.java | 26 +-- .../key/AbstractUnlinkIntegrationTest.java | 3 +- .../pubsub/AbstractPubSubIntegrationTest.java | 14 +- .../pubsub/AbstractSubCommandsIntegrationTest.java | 12 +- .../executor/set/AbstractSPopIntegrationTest.java | 3 +- .../executor/set/AbstractSScanIntegrationTest.java | 51 +++-- .../executor/set/AbstractSetsIntegrationTest.java | 5 +- .../executor/set/SScanIntegrationTest.java | 9 +- .../sortedset/AbstractZIncrByIntegrationTest.java | 12 +- .../string/AbstractIncrByFloatIntegrationTest.java | 3 +- .../string/AbstractSetIntegrationTest.java | 34 +-- .../pubsub/SubscriptionsIntegrationTest.java | 13 +- .../SlowlogParameterRequirements.java | 22 +- .../SpopParameterRequirements.java | 3 +- .../geode/redis/internal/RedisConstants.java | 5 - .../geode/redis/internal/data/NullRedisString.java | 6 +- .../geode/redis/internal/data/RedisHash.java | 8 +- .../apache/geode/redis/internal/data/RedisKey.java | 4 +- .../apache/geode/redis/internal/data/RedisSet.java | 4 +- .../geode/redis/internal/data/RedisSortedSet.java | 3 +- .../geode/redis/internal/data/RedisString.java | 6 +- .../redis/internal/executor/RedisResponse.java | 2 +- .../redis/internal/executor/UnknownExecutor.java | 6 +- .../redis/internal/executor/cluster/CRC16.java | 5 +- .../internal/executor/cluster/ClusterExecutor.java | 30 +-- .../internal/executor/connection/PingExecutor.java | 13 +- .../internal/executor/connection/QuitExecutor.java | 3 +- .../executor/connection/SelectExecutor.java| 11 +- .../internal/executor/hash/HScanExecutor.java | 13 +- .../redis/internal/executor/key/KeysExecutor.java | 5 +- .../internal/executor/key/RenameExecutor.java | 4 +- .../redis/internal/executor/key/ScanExecutor.java | 11 +- .../executor/pubsub/PsubscribeExecutor.java| 3 +- .../internal/executor/pubsub/PubSubExecutor.java | 11 +- .../executor/pubsub/PunsubscribeExecutor.java | 3 +- .../internal/executor/server/FlushAllExecutor.java | 2 +- .../internal/executor/server/InfoExecutor.java | 73 --- .../internal/executor/server/ShutDownExecutor.java | 3 +- .../internal/executor/server/SlowlogExecutor.java | 29 +-- .../redis/internal/executor/set/SMoveExecutor.java | 11 +- .../redis/internal/executor/set/SPopExecutor.java | 3 +- .../redis/internal/executor/set/SScanExecutor.java | 13 +- .../internal/executor/sortedset/ZAddExecutor.java | 64 +++--- .../executor/sortedset/ZScoreExecutor.java | 6 +- .../internal/executor/string/BitOpExecutor.java| 2 + .../internal/executor/string/DecrByExecutor.java | 5 +- .../executor/string/IncrByFloatExecutor.java | 9 +- .../internal/executor/string/SetEXExecutor.java| 4 +- .../internal/executor/string/SetExecutor.java | 231 +--- .../redis/internal/netty/ByteToCommandDecoder.java | 36 ++-- .../apache/geode/redis/internal/netty/Coder.java | 233 + .../apache/geode/redis/internal/netty/Command.java | 54 +++-- .../redis/internal/netty/NettyRedisServer.java | 4 +- .../redis/internal/netty/StringBytesGlossary.java | 210 +++ .../redis/internal/pubsub/PatternSubscription.java | 7 +- .../geode/redis/internal/pubsub/Subscriptions.java | 9 +- .../redis/internal/SupportedCommandsJUnitTest.java | 5 +- .../geode/redis/internal/data/RedisHashTest.java | 79 +++ .../redis/internal/data/RedisKeyJUnitTest.j
[geode] branch support/1.14 updated: GEODE-7968: UG - Fix region shortcut table format issues (#6566)
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a commit to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.14 by this push: new 2424003 GEODE-7968: UG - Fix region shortcut table format issues (#6566) 2424003 is described below commit 24240037293a9bb0ead74423e09a5a9e3f46b23a Author: Alberto Bustamante Reyes AuthorDate: Thu Jun 17 18:51:56 2021 +0200 GEODE-7968: UG - Fix region shortcut table format issues (#6566) --- .../topics/region_shortcuts_table.html.md.erb | 515 ++--- 1 file changed, 27 insertions(+), 488 deletions(-) diff --git a/geode-docs/reference/topics/region_shortcuts_table.html.md.erb b/geode-docs/reference/topics/region_shortcuts_table.html.md.erb index 6b99e74..e030416 100644 --- a/geode-docs/reference/topics/region_shortcuts_table.html.md.erb +++ b/geode-docs/reference/topics/region_shortcuts_table.html.md.erb @@ -26,494 +26,33 @@ This section provides a quick reference for all region shortcuts. - -Table 1. Region Shortcuts Default Configurations - - - - - - - -Region Shortcut -Region Attributes -Other Attributes - - - - -LOCAL - -scope: -local -data-policy: -NORMAL - - - - -LOCAL_HEAP_LRU - -scope: -local -data-policy: -NORMAL - - -Eviction Attributes - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -local-destroy - - - - - - -[LOCAL_OVERFLOW](region_shortcuts_reference.html#reference_adk_y4y_lk) - -scope: -local -data-policy: -NORMAL - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -overflow-to-disk - - - - - - -[LOCAL_PERSISTENT](region_shortcuts_reference.html#reference_l5r_y4y_lk) - -scope: -local -data-policy: -PERSISTENT\_REPLICATE - - - - -[LOCAL\_PERSISTENT\_OVERFLOW](region_shortcuts_reference.html#reference_a45_y4y_lk) - -scope: -local -data-policy: -PERSISTENT\_REPLICATE - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -overflow-to-disk - - - - - - -[PARTITION](region_shortcuts_reference.html#reference_ow5_4qy_lk) - -data-policy: -PARTITION - - - - -[PARTITION\_HEAP\_LRU](region_shortcuts_reference.html#reference_twx_y4y_lk) - -data-policy: -PARTITION - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -local-destroy - - - - - - -[PARTITION_OVERFLOW](region_shortcuts_reference.html#reference_js1_z4y_lk) - -data-policy: -PARTITION - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -overflow-to-disk - - - - - - -[PARTITION_PERSISTENT](region_shortcuts_reference.html#reference_d4k_jpy_lk) - -data-policy: -PERSISTENT\_PARTITION - - - - -[PARTITION\_PERSISTENT\_OVERFLOW](region_shortcuts_reference.html#reference_v5l_jpy_lk) - -data-policy: -PERSISTENT\_PARTITION - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -overflow-to-disk - - - - - - -[PARTITION_PROXY](region_shortcuts_reference.html#reference_v4m_jpy_lk) - -data-policy: -PARTITION - - -Partition Attributes - - - -local-max-memory: -0 - - - - - - -[PARTITION\_PROXY\_REDUNDANT](region_shortcuts_reference.html#reference_c1n_jpy_lk) - -data-policy: -PARTITION - - -Partition Attributes - - - -redundant-copies: -1 - - -local-max-memory -0 - - - - - - -[PARTITION_REDUNDANT](region_shortcuts_reference.html#reference_shn_jpy_lk) - -data-policy: -PARTITION - - -Partition Attributes - - - -redundant-copies: -1 - - - - - - -[PARTITION\_REDUNDANT\_HEAP_LRU](region_shortcuts_reference.html#reference_m4n_jpy_lk) - -data-policy: -PARTITION - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -local-destroy - - - - - -Partition Attributes - - - -redundant-copies: -1 - - - - - - -[PARTITION\_REDUNDANT\_OVERFLOW](region_shortcuts_reference.html#reference_own_jpy_lk) - -data-policy: -PARTITION - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -overflow-to-disk - - - - - -Partition Attributes - - - -redundant-copies: -1 - - - - - - -[PARTITION\_REDUNDANT\_PERSISTENT](region_shortcuts_reference.html#reference_bd4_jpy_lk) - -data-policy: -PERSISTENT\_PARTITION - - -Partition Attributes - - - -redundant-copies: -1 - - - - - - -[PARTITION\_REDUNDANT\_PERSISTENT_OVERFLOW](region_shortcuts_reference.html#reference_xqq_tvc_lk) - -data-policy: -PERSISTENT\_PARTITION - -Eviction Attributes - - - - -eviction-algorithm: -lru-heap-percentage - - -eviction-action: -overflow-to-disk - - - - - -Partition Attributes - - - -redundant-copies: -1 - - - - - - -[REPLICATE](region_shortcuts_reference.html#reference_wq4_jpy_lk) - -data-policy: -REPLICATE -scope: -distributed-ack - - - - -[REPLICATE\_HEAP\_LRU](region_shortcuts_reference.html#reference_xx4_jpy_lk) - -data-policy: -PRELOADED -scope: -distributed-ack - -Eviction Attributes - - - - - - - - -eviction-a
[geode] branch develop updated (c9d4f68 -> f408b6c)
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c9d4f68 GEODE-9295: Added dunit test add f408b6c GEODE-7968: UG - Fix region shortcut table format issues (#6566) No new revisions were added by this update. Summary of changes: .../topics/region_shortcuts_table.html.md.erb | 515 ++--- 1 file changed, 27 insertions(+), 488 deletions(-)
[geode-native] branch develop updated: GEODE-9358: Initial revision of C bindings (#821)
This is an automated email from the ASF dual-hosted git repository.
echobravo 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 d45a0c8 GEODE-9358: Initial revision of C bindings (#821)
d45a0c8 is described below
commit d45a0c827301329fdb0432f011f50dbc2759dc36
Author: Blake Bender
AuthorDate: Thu Jun 17 09:37:08 2021 -0700
GEODE-9358: Initial revision of C bindings (#821)
Co-authored-by: Blake Bender
Co-authored-by: Matthew Reddington
Co-authored-by: Michael Oleske
---
CMakeLists.txt | 1 +
c_bindings/CMakeLists.txt | 63 +
c_bindings/include/geode/auth_initialize.h | 39 ++
c_bindings/include/geode/cache.h | 82 +++
c_bindings/include/geode/cache/factory.h | 77 +++
c_bindings/include/geode/client.h | 41 ++
c_bindings/include/geode/internal/geode_base.h | 25
c_bindings/include/geode/pool.h| 38 +
c_bindings/include/geode/pool/factory.h| 61
c_bindings/include/geode/pool/manager.h| 46 ++
c_bindings/include/geode/region.h | 61
c_bindings/include/geode/region/factory.h | 52 +++
c_bindings/include/geode/region/shortcut.h | 25
.../integration/CMakeLists.txt | 33 +
c_bindings/integration/test/CAuthInitialize.cpp| 114 +++
c_bindings/integration/test/CCacheCreationTest.cpp | 60
c_bindings/integration/test/CMakeLists.txt | 72 ++
c_bindings/integration/test/ExampleTest.cpp| 85
.../integration/utilities/CMakeLists.txt | 35 ++---
.../integration/utilities/colored_printing.hpp | 31 +
.../utilities/internal/colored_printing.cpp| 31 +
.../utilities/internal/colored_printing.hpp| 45 ++
c_bindings/src/auth_initialize.cpp | 73 ++
c_bindings/src/auth_initialize.hpp | 49 +++
c_bindings/src/cache.cpp | 119
c_bindings/src/cache.hpp | 57
c_bindings/src/cache/factory.cpp | 154 +
c_bindings/src/cache/factory.hpp | 55
c_bindings/src/client.cpp | 93 +
c_bindings/src/client.hpp | 73 ++
c_bindings/src/pool.cpp| 41 ++
c_bindings/src/pool.hpp| 32 +
c_bindings/src/pool/factory.cpp| 67 +
c_bindings/src/pool/factory.hpp| 39 ++
c_bindings/src/pool/manager.cpp| 51 +++
c_bindings/src/pool/manager.hpp| 33 +
c_bindings/src/region.cpp | 134 ++
c_bindings/src/region.hpp | 47 +++
c_bindings/src/region/factory.cpp | 68 +
c_bindings/src/region/factory.hpp | 38 +
c_bindings/symbols | 17 +++
c_bindings/symbols.version | 22 +++
cmake/ApacheGeodeExportHeader.cmake| 1 +
cppcache/include/geode/CacheableString.hpp | 2 +-
cppcache/include/geode/DataOutput.hpp | 14 +-
cppcache/include/geode/PdxInstanceFactory.hpp | 4 -
cppcache/src/PoolManagerImpl.hpp | 1 -
cppcache/src/ThinClientPoolDM.cpp | 2 +-
cppcache/static/CMakeLists.txt | 5 +-
49 files changed, 2338 insertions(+), 70 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc8350a..8faaaf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -380,6 +380,7 @@ if (${BUILD_CLI})
add_subdirectory(templates/security/csharp)
endif()
add_subdirectory(tests)
+add_subdirectory(c_bindings)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/xsds/ DESTINATION xsds)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/defaultSystem/ DESTINATION
defaultSystem)
diff --git a/c_bindings/CMakeLists.txt b/c_bindings/CMakeLists.txt
new file mode 100644
index 000..4b3a217
--- /dev/null
+++ b/c_bindings/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2
[geode] branch support/1.12 updated (1a8eb5a -> f25ec03)
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a change to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 1a8eb5a 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
new c13a621 Revert "GEODE-9141: (2 of 2) Handle in-buffer concurrency"
new f25ec03 Revert "GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to
ByteBuferVendor"
The 2 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.
Summary of changes:
...LSocketHostNameVerificationIntegrationTest.java | 6 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../geode/internal/net/ByteBufferSharing.java | 15 -
...ufferVendor.java => ByteBufferSharingImpl.java} | 144 +++--
.../geode/internal/net/ByteBufferSharingNoOp.java | 7 +-
.../apache/geode/internal/net/NioSslEngine.java| 56 ++--
.../apache/geode/internal/net/SocketCreator.java | 9 +-
.../org/apache/geode/internal/tcp/Connection.java | 334 ++---
.../internal/net/ByteBufferConcurrencyTest.java| 16 +-
...dorTest.java => ByteBufferSharingImplTest.java} | 40 ++-
.../geode/internal/net/NioSslEngineTest.java | 41 ++-
.../apache/geode/internal/tcp/ConnectionTest.java | 1 -
13 files changed, 299 insertions(+), 375 deletions(-)
rename
geode-core/src/main/java/org/apache/geode/internal/net/{ByteBufferVendor.java
=> ByteBufferSharingImpl.java} (53%)
rename
geode-core/src/test/java/org/apache/geode/internal/net/{ByteBufferVendorTest.java
=> ByteBufferSharingImplTest.java} (84%)
[geode] 02/02: Revert "GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to ByteBuferVendor"
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f25ec03371d8287df3b404884fc751bd8c27b38b
Author: Ernest Burghardt
AuthorDate: Thu Jun 17 10:40:14 2021 -0500
Revert "GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to
ByteBuferVendor"
This reverts commit bba424244b8011daf4e7d1285334ad91ce4497fe.
---
...{ByteBufferVendor.java => ByteBufferSharingImpl.java} | 6 +++---
.../apache/geode/internal/net/ByteBufferSharingNoOp.java | 2 +-
.../java/org/apache/geode/internal/net/NioSslEngine.java | 10 +-
.../geode/internal/net/ByteBufferConcurrencyTest.java| 16
...ferVendorTest.java => ByteBufferSharingImplTest.java} | 6 +++---
.../org/apache/geode/internal/net/NioSslEngineTest.java | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferVendor.java
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingImpl.java
similarity index 96%
rename from
geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferVendor.java
rename to
geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingImpl.java
index 4933247..b083d09 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferVendor.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingImpl.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.net.BufferPool.BufferType;
* {@link ByteBuffer}) is available (for reading and modification) in the
scope of the
* try-with-resources.
*/
-class ByteBufferVendor implements ByteBufferSharing {
+class ByteBufferSharingImpl implements ByteBufferSharing {
static class OpenAttemptTimedOut extends Exception {
}
@@ -53,8 +53,8 @@ class ByteBufferVendor implements ByteBufferSharing {
* This constructor acquires no lock. The reference count will be 1 after
this constructor
* completes.
*/
- ByteBufferVendor(final ByteBuffer buffer, final BufferType bufferType,
- final BufferPool bufferPool) {
+ ByteBufferSharingImpl(final ByteBuffer buffer, final BufferType bufferType,
+ final BufferPool bufferPool) {
this.buffer = buffer;
this.bufferType = bufferType;
this.bufferPool = bufferPool;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
index 4a8bc49..bd707e3 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
* meant for use with the {@link NioPlainEngine} only, since that engine keeps
no buffers and so,
* needs no reference counting on buffers, nor any synchronization around
access to buffers.
*
- * See also {@link ByteBufferVendor}
+ * See also {@link ByteBufferSharingImpl}
*/
class ByteBufferSharingNoOp implements ByteBufferSharing {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
index fc91a31..8969ecc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireIOException;
import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.internal.net.BufferPool.BufferType;
-import org.apache.geode.internal.net.ByteBufferVendor.OpenAttemptTimedOut;
+import org.apache.geode.internal.net.ByteBufferSharingImpl.OpenAttemptTimedOut;
import org.apache.geode.logging.internal.log4j.api.LogService;
@@ -62,12 +62,12 @@ public class NioSslEngine implements NioFilter {
/**
* holds bytes wrapped by the SSLEngine; a.k.a. myNetData
*/
- private final ByteBufferVendor outputSharing;
+ private final ByteBufferSharingImpl outputSharing;
/**
* holds the last unwrapped data from a peer; a.k.a. peerAppData
*/
- private final ByteBufferVendor inputSharing;
+ private final ByteBufferSharingImpl inputSharing;
NioSslEngine(SSLEngine engine, BufferPool bufferPool) {
SSLSession session = engine.getSession();
@@ -77,10 +77,10 @@ public class NioSslEngine implements NioFilter {
this.engine = engine;
this.bufferPool = bufferPool;
outputSharing =
-new
ByteBufferVendor(bufferPool.acquireDirectSenderBuffer(packetBufferSize),
+new
ByteBufferSharingImpl(bufferPool.acquireDirectSenderBuffer(packetBufferSize),
TRACKED_SENDER, bufferPool);
inputSharing =
-new
ByteBufferVendor(bufferPool.acquireNonDirectReceiv
[geode] 01/02: Revert "GEODE-9141: (2 of 2) Handle in-buffer concurrency"
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c13a62199a3720c69c142b0dcd2f20130ac3b1a4
Author: Ernest Burghardt
AuthorDate: Thu Jun 17 10:39:47 2021 -0500
Revert "GEODE-9141: (2 of 2) Handle in-buffer concurrency"
This reverts commit 1a8eb5aec580eb75871060793ea65d62f5f2d959.
---
...LSocketHostNameVerificationIntegrationTest.java | 6 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../geode/internal/net/ByteBufferSharing.java | 15 -
.../geode/internal/net/ByteBufferSharingNoOp.java | 5 -
.../geode/internal/net/ByteBufferVendor.java | 144 +++--
.../apache/geode/internal/net/NioSslEngine.java| 50 +--
.../apache/geode/internal/net/SocketCreator.java | 9 +-
.../org/apache/geode/internal/tcp/Connection.java | 334 ++---
.../geode/internal/net/ByteBufferVendorTest.java | 36 +--
.../geode/internal/net/NioSslEngineTest.java | 41 ++-
.../apache/geode/internal/tcp/ConnectionTest.java | 1 -
12 files changed, 285 insertions(+), 361 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index e86bfea..a70f3b1 100755
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,9 +103,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
@Before
public void setUp() throws Exception {
-
-SocketCreatorFactory.close(); // to clear socket creators made in previous
tests
-
IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read
timed out");
this.localHost = InetAddress.getLoopbackAddress();
@@ -175,7 +172,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
try {
this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
- sslEngine, 0,
+ sslEngine, 0, true,
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
new BufferPool(mock(DMStats.class)));
@@ -208,6 +205,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
sc.handshakeSSLSocketChannel(socket.getChannel(),
sslEngine,
timeoutMillis,
+false,
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
new BufferPool(mock(DMStats.class)));
} catch (Throwable throwable) {
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 13e9d5b..e7ac191 100755
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -217,7 +217,7 @@ public class SSLSocketIntegrationTest {
clientSocket = clientChannel.socket();
NioSslEngine engine =
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
true,
ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
clientChannel.configureBlocking(true);
@@ -267,6 +267,7 @@ public class SSLSocketIntegrationTest {
sc.handshakeSSLSocketChannel(socket.getChannel(),
sc.createSSLEngine("localhost", 1234,
false),
timeoutMillis,
+false,
ByteBuffer.allocate(65535),
new BufferPool(mock(DMStats.class)));
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index cd1af3a..af3bd1e 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType
org/apache/geode/cache/query/internal/xml/ElementType$1
org/apache/geode/cache/query/internal/xml/ElementType$2
org/apache/geode/cache/query/internal/xml/ElementType$3
-org/apache/geode/internal/net/ByteBufferVendor$OpenAttemptTimedOut
\ No newline at end of file
+org/apache/geode/intern
[geode] 02/02: 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
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1a8eb5aec580eb75871060793ea65d62f5f2d959
Author: Bill Burcham
AuthorDate: Sat Apr 17 09:12:13 2021 -0700
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
(cherry picked from commit 9d0d4d1d33794d0f6a21c3bcae71e965cbbd7fbd)
(cherry picked from commit 9e8b3972fcf449eed4d41c254cf3f553e517eaa1)
(cherry picked from commit c4730deed48bb4513bd04486d4e8c09cdd3bb5a9)
---
...LSocketHostNameVerificationIntegrationTest.java | 6 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../geode/internal/net/ByteBufferSharing.java | 15 +
.../geode/internal/net/ByteBufferSharingNoOp.java | 5 +
.../geode/internal/net/ByteBufferVendor.java | 144 ++---
.../apache/geode/internal/net/NioSslEngine.java| 50 ++-
.../apache/geode/internal/net/SocketCreator.java | 9 +-
.../org/apache/geode/internal/tcp/Connection.java | 334 +++--
.../geode/internal/net/ByteBufferVendorTest.java | 36 ++-
.../geode/internal/net/NioSslEngineTest.java | 41 +--
.../apache/geode/internal/tcp/ConnectionTest.java | 1 +
12 files changed, 361 insertions(+), 285 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index a70f3b1..e86bfea 100755
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -103,6 +103,9 @@ public class SSLSocketHostNameVerificationIntegrationTest {
@Before
public void setUp() throws Exception {
+
+SocketCreatorFactory.close(); // to clear socket creators made in previous
tests
+
IgnoredException.addIgnoredException("javax.net.ssl.SSLException: Read
timed out");
this.localHost = InetAddress.getLoopbackAddress();
@@ -172,7 +175,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
try {
this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
- sslEngine, 0, true,
+ sslEngine, 0,
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
new BufferPool(mock(DMStats.class)));
@@ -205,7 +208,6 @@ public class SSLSocketHostNameVerificationIntegrationTest {
sc.handshakeSSLSocketChannel(socket.getChannel(),
sslEngine,
timeoutMillis,
-false,
ByteBuffer.allocate(sslEngine.getSession().getPacketBufferSize()),
new BufferPool(mock(DMStats.class)));
} catch (Throwable throwable) {
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index e7ac191..13e9d5b 100755
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -217,7 +217,7 @@ public class SSLSocketIntegrationTest {
clientSocket = clientChannel.socket();
NioSslEngine engine =
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
clientChannel.configureBlocking(true);
@@ -267,7 +267,6 @@ public class SSLSocketIntegrationTest {
sc.handshakeSSLSocketChannel(socket.getChannel(),
sc.createSSLEngine("localhost", 1234,
false),
timeoutMillis,
-false,
ByteBuffer.allocate(65535),
new BufferPool(mock(DMStats.class)));
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index af3bd1e..cd1af3a 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -104,4 +104,4 @@ org/apache/geode/cache/query/internal/xml/ElementType
org/apache/geode
[geode] branch support/1.12 updated (70f6955 -> 1a8eb5a)
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a change to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 70f6955 GEODE-9289: Configuration compatibile with pre-1.12.0
versions. (#6592)
new bba4242 GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to
ByteBuferVendor
new 1a8eb5a 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
The 2 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.
Summary of changes:
...LSocketHostNameVerificationIntegrationTest.java | 6 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../geode/internal/net/ByteBufferSharing.java | 15 +
.../geode/internal/net/ByteBufferSharingNoOp.java | 7 +-
...ufferSharingImpl.java => ByteBufferVendor.java} | 144 ++---
.../apache/geode/internal/net/NioSslEngine.java| 56 ++--
.../apache/geode/internal/net/SocketCreator.java | 9 +-
.../org/apache/geode/internal/tcp/Connection.java | 334 +++--
.../internal/net/ByteBufferConcurrencyTest.java| 16 +-
...ringImplTest.java => ByteBufferVendorTest.java} | 40 +--
.../geode/internal/net/NioSslEngineTest.java | 41 +--
.../apache/geode/internal/tcp/ConnectionTest.java | 1 +
13 files changed, 375 insertions(+), 299 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] 01/02: GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to ByteBuferVendor
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bba424244b8011daf4e7d1285334ad91ce4497fe
Author: Bill Burcham
AuthorDate: Sat Apr 17 13:15:53 2021 -0700
GEODE-9141: (1 of 2) rename ByteBufferSharingImpl to ByteBuferVendor
(cherry picked from commit 38a3540583a1d0a402b026ee0d33ae4b0a2907d3)
(cherry picked from commit e0fa01dd9ec9c61504d517e77d1620f8e7975b73)
---
.../apache/geode/internal/net/ByteBufferSharingNoOp.java | 2 +-
...{ByteBufferSharingImpl.java => ByteBufferVendor.java} | 6 +++---
.../java/org/apache/geode/internal/net/NioSslEngine.java | 10 +-
.../geode/internal/net/ByteBufferConcurrencyTest.java| 16
...ferSharingImplTest.java => ByteBufferVendorTest.java} | 6 +++---
.../org/apache/geode/internal/net/NioSslEngineTest.java | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
index bd707e3..4a8bc49 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingNoOp.java
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
* meant for use with the {@link NioPlainEngine} only, since that engine keeps
no buffers and so,
* needs no reference counting on buffers, nor any synchronization around
access to buffers.
*
- * See also {@link ByteBufferSharingImpl}
+ * See also {@link ByteBufferVendor}
*/
class ByteBufferSharingNoOp implements ByteBufferSharing {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferVendor.java
similarity index 96%
rename from
geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingImpl.java
rename to
geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferVendor.java
index b083d09..4933247 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferSharingImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/net/ByteBufferVendor.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.net.BufferPool.BufferType;
* {@link ByteBuffer}) is available (for reading and modification) in the
scope of the
* try-with-resources.
*/
-class ByteBufferSharingImpl implements ByteBufferSharing {
+class ByteBufferVendor implements ByteBufferSharing {
static class OpenAttemptTimedOut extends Exception {
}
@@ -53,8 +53,8 @@ class ByteBufferSharingImpl implements ByteBufferSharing {
* This constructor acquires no lock. The reference count will be 1 after
this constructor
* completes.
*/
- ByteBufferSharingImpl(final ByteBuffer buffer, final BufferType bufferType,
- final BufferPool bufferPool) {
+ ByteBufferVendor(final ByteBuffer buffer, final BufferType bufferType,
+ final BufferPool bufferPool) {
this.buffer = buffer;
this.bufferType = bufferType;
this.bufferPool = bufferPool;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
index 8969ecc..fc91a31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireIOException;
import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.internal.net.BufferPool.BufferType;
-import org.apache.geode.internal.net.ByteBufferSharingImpl.OpenAttemptTimedOut;
+import org.apache.geode.internal.net.ByteBufferVendor.OpenAttemptTimedOut;
import org.apache.geode.logging.internal.log4j.api.LogService;
@@ -62,12 +62,12 @@ public class NioSslEngine implements NioFilter {
/**
* holds bytes wrapped by the SSLEngine; a.k.a. myNetData
*/
- private final ByteBufferSharingImpl outputSharing;
+ private final ByteBufferVendor outputSharing;
/**
* holds the last unwrapped data from a peer; a.k.a. peerAppData
*/
- private final ByteBufferSharingImpl inputSharing;
+ private final ByteBufferVendor inputSharing;
NioSslEngine(SSLEngine engine, BufferPool bufferPool) {
SSLSession session = engine.getSession();
@@ -77,10 +77,10 @@ public class NioSslEngine implements NioFilter {
this.engine = engine;
this.bufferPool = bufferPool;
outputSharing =
-new
ByteBufferSharingImpl(bufferPool.acquireDirectSenderBuffer(packetBufferSize),
+new
ByteBufferVendor(bufferPool.acquireDirectSenderBuffer(packetBufferSize),
TRACKED_SENDER, bufferPool);
inputShari
