You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2021/06/17 15:41:20 UTC
[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 <eb...@pivotal.io>
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.acquireNonDirectReceiveBuffer(appBufferSize),
+ new ByteBufferSharingImpl(bufferPool.acquireNonDirectReceiveBuffer(appBufferSize),
TRACKED_RECEIVER, bufferPool);
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferConcurrencyTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferConcurrencyTest.java
index bf95963..7c1f383 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferConcurrencyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferConcurrencyTest.java
@@ -47,8 +47,8 @@ public class ByteBufferConcurrencyTest {
throws Exception {
poolMock = mock(BufferPool.class);
ByteBuffer someBuffer = ByteBuffer.allocate(1);
- ByteBufferVendor sharing =
- new ByteBufferVendor(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
+ ByteBufferSharingImpl sharing =
+ new ByteBufferSharingImpl(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
poolMock);
executor.inParallel(() -> {
sharing.destruct();
@@ -78,8 +78,8 @@ public class ByteBufferConcurrencyTest {
}).when(poolMock).releaseBuffer(any(), any());
ByteBuffer someBuffer = ByteBuffer.allocate(1);
- ByteBufferVendor sharing =
- new ByteBufferVendor(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
+ ByteBufferSharingImpl sharing =
+ new ByteBufferSharingImpl(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
poolMock);
executor.inParallel(() -> {
@@ -109,8 +109,8 @@ public class ByteBufferConcurrencyTest {
throws Exception {
poolMock = mock(BufferPool.class);
ByteBuffer someBuffer = ByteBuffer.allocate(1);
- ByteBufferVendor sharing =
- new ByteBufferVendor(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
+ ByteBufferSharingImpl sharing =
+ new ByteBufferSharingImpl(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
poolMock);
final AtomicBoolean inUse = new AtomicBoolean(false);
@@ -134,8 +134,8 @@ public class ByteBufferConcurrencyTest {
throws Exception {
poolMock = mock(BufferPool.class);
ByteBuffer someBuffer = ByteBuffer.allocate(1);
- ByteBufferVendor sharing =
- new ByteBufferVendor(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
+ ByteBufferSharingImpl sharing =
+ new ByteBufferSharingImpl(someBuffer, BufferPool.BufferType.TRACKED_SENDER,
poolMock);
final AtomicBoolean inUse = new AtomicBoolean(false);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferVendorTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferSharingImplTest.java
similarity index 97%
rename from geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferVendorTest.java
rename to geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferSharingImplTest.java
index 359d8aa..d863076 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferVendorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/ByteBufferSharingImplTest.java
@@ -29,14 +29,14 @@ import java.util.concurrent.CountDownLatch;
import org.junit.Before;
import org.junit.Test;
-public class ByteBufferVendorTest {
+public class ByteBufferSharingImplTest {
@FunctionalInterface
private static interface Foo {
void run() throws IOException;
}
- private ByteBufferVendor sharing;
+ private ByteBufferSharingImpl sharing;
private BufferPool poolMock;
private CountDownLatch clientHasOpenedResource;
private CountDownLatch clientMayComplete;
@@ -45,7 +45,7 @@ public class ByteBufferVendorTest {
public void before() {
poolMock = mock(BufferPool.class);
sharing =
- new ByteBufferVendor(mock(ByteBuffer.class), BufferPool.BufferType.TRACKED_SENDER,
+ new ByteBufferSharingImpl(mock(ByteBuffer.class), BufferPool.BufferType.TRACKED_SENDER,
poolMock);
clientHasOpenedResource = new CountDownLatch(1);
clientMayComplete = new CountDownLatch(1);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
index 62a858c..dfd7b90 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
@@ -488,7 +488,7 @@ public class NioSslEngineTest {
unwrappedBuffer.position(7).limit(preexistingBytes + 7); // 7 bytes of message header - ignored
try (final ByteBufferSharing inputSharing = nioSslEngine.shareInputBuffer()) {
- final ByteBufferVendor inputSharingImpl = (ByteBufferVendor) inputSharing;
+ final ByteBufferSharingImpl inputSharingImpl = (ByteBufferSharingImpl) inputSharing;
inputSharingImpl.setBufferForTestingOnly(unwrappedBuffer);
}
@@ -545,7 +545,7 @@ public class NioSslEngineTest {
ByteBuffer unwrappedBuffer = ByteBuffer.allocate(initialUnwrappedBufferSize);
unwrappedBuffer.position(7).limit(preexistingBytes + 7); // 7 bytes of message header - ignored
try (final ByteBufferSharing inputSharing = nioSslEngine.shareInputBuffer()) {
- final ByteBufferVendor inputSharingImpl = (ByteBufferVendor) inputSharing;
+ final ByteBufferSharingImpl inputSharingImpl = (ByteBufferSharingImpl) inputSharing;
inputSharingImpl.setBufferForTestingOnly(unwrappedBuffer);
}