You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by pn...@apache.org on 2019/06/04 10:12:52 UTC
[flink] 03/03: [hotfix][network] Drop redundant getSizeUnsafe from
Buffer interface
This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit a36ec7fcecf909a1d6a8c2b85a125d0ccc8b0934
Author: Zhijiang <wa...@aliyun.com>
AuthorDate: Fri May 31 16:47:38 2019 +0800
[hotfix][network] Drop redundant getSizeUnsafe from Buffer interface
The implementations of getSize and getSizeUnsafe are exactly the same now, which do not need the synchronized way.
So We could remove the getSizeUnsafe to make it clean and clear.
---
.../org/apache/flink/runtime/io/network/buffer/Buffer.java | 11 -----------
.../apache/flink/runtime/io/network/buffer/NetworkBuffer.java | 5 -----
.../io/network/buffer/ReadOnlySlicedNetworkBuffer.java | 5 -----
.../io/network/partition/consumer/LocalInputChannel.java | 2 +-
.../io/network/partition/consumer/RemoteInputChannel.java | 2 +-
.../flink/runtime/io/network/buffer/NetworkBufferTest.java | 6 ------
.../runtime/io/network/buffer/ReadOnlySlicedBufferTest.java | 10 ++--------
7 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java
index 96b18ee..8e5d85f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/Buffer.java
@@ -159,17 +159,6 @@ public interface Buffer {
void setReaderIndex(int readerIndex) throws IndexOutOfBoundsException;
/**
- * Returns the size of the written data, i.e. the <tt>writer index</tt>, of this buffer in an
- * non-synchronized fashion.
- *
- * <p>This is where writable bytes start in the backing memory segment.
- *
- * @return writer index (from 0 (inclusive) to the size of the backing {@link MemorySegment}
- * (inclusive))
- */
- int getSizeUnsafe();
-
- /**
* Returns the size of the written data, i.e. the <tt>writer index</tt>, of this buffer.
*
* <p>This is where writable bytes start in the backing memory segment.
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBuffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBuffer.java
index 05b7582..56afbb8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBuffer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/NetworkBuffer.java
@@ -291,11 +291,6 @@ public class NetworkBuffer extends AbstractReferenceCountedByteBuf implements Bu
}
@Override
- public int getSizeUnsafe() {
- return writerIndex();
- }
-
- @Override
public int getSize() {
return writerIndex();
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedNetworkBuffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedNetworkBuffer.java
index 00e1154..dd421b7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedNetworkBuffer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedNetworkBuffer.java
@@ -153,11 +153,6 @@ public final class ReadOnlySlicedNetworkBuffer extends ReadOnlyByteBuf implement
}
@Override
- public int getSizeUnsafe() {
- return writerIndex();
- }
-
- @Override
public int getSize() {
return writerIndex();
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java
index feb6b72..3a54310 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/LocalInputChannel.java
@@ -193,7 +193,7 @@ public class LocalInputChannel extends InputChannel implements BufferAvailabilit
}
}
- numBytesIn.inc(next.buffer().getSizeUnsafe());
+ numBytesIn.inc(next.buffer().getSize());
numBuffersIn.inc();
return Optional.of(new BufferAndAvailability(next.buffer(), next.isMoreAvailable(), next.buffersInBacklog()));
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java
index 50bf1d0..a42a93b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannel.java
@@ -201,7 +201,7 @@ public class RemoteInputChannel extends InputChannel implements BufferRecycler,
moreAvailable = !receivedBuffers.isEmpty();
}
- numBytesIn.inc(next.getSizeUnsafe());
+ numBytesIn.inc(next.getSize());
numBuffersIn.inc();
return Optional.of(new BufferAndAvailability(next, moreAvailable, getSenderBacklog()));
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferTest.java
index 47615d9..1cc4fc3 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/NetworkBufferTest.java
@@ -216,7 +216,6 @@ public class NetworkBufferTest extends AbstractByteBufTest {
assertEquals(0, slice.getReaderIndex());
assertEquals(10, slice.getSize());
- assertEquals(10, slice.getSizeUnsafe());
assertSame(buffer, slice.unwrap().unwrap());
// slice indices should be independent:
@@ -224,7 +223,6 @@ public class NetworkBufferTest extends AbstractByteBufTest {
buffer.setReaderIndex(2);
assertEquals(0, slice.getReaderIndex());
assertEquals(10, slice.getSize());
- assertEquals(10, slice.getSizeUnsafe());
}
@Test
@@ -244,7 +242,6 @@ public class NetworkBufferTest extends AbstractByteBufTest {
assertEquals(0, slice.getReaderIndex());
assertEquals(10, slice.getSize());
- assertEquals(10, slice.getSizeUnsafe());
assertSame(buffer, slice.unwrap().unwrap());
// slice indices should be independent:
@@ -252,7 +249,6 @@ public class NetworkBufferTest extends AbstractByteBufTest {
buffer.setReaderIndex(2);
assertEquals(0, slice.getReaderIndex());
assertEquals(10, slice.getSize());
- assertEquals(10, slice.getSizeUnsafe());
}
@Test
@@ -312,13 +308,11 @@ public class NetworkBufferTest extends AbstractByteBufTest {
NetworkBuffer buffer = newBuffer(1024, 1024, isBuffer);
assertEquals(0, buffer.getSize()); // initially 0
- assertEquals(0, buffer.getSizeUnsafe());
assertEquals(buffer.writerIndex(), buffer.getSize());
assertEquals(0, buffer.readerIndex()); // initially 0
buffer.setSize(10);
assertEquals(10, buffer.getSize());
- assertEquals(10, buffer.getSizeUnsafe());
assertEquals(buffer.writerIndex(), buffer.getSize());
assertEquals(0, buffer.readerIndex()); // independent
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedBufferTest.java
index d5814ee..444fdc7 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedBufferTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/buffer/ReadOnlySlicedBufferTest.java
@@ -233,8 +233,7 @@ public class ReadOnlySlicedBufferTest {
/**
* Tests the independence of the writer index via
* {@link ReadOnlySlicedNetworkBuffer#setSize(int)},
- * {@link ReadOnlySlicedNetworkBuffer#getSize()}, and
- * {@link ReadOnlySlicedNetworkBuffer#getSizeUnsafe()}.
+ * {@link ReadOnlySlicedNetworkBuffer#getSize()}.
*/
@Test
public void testGetSetSize1() {
@@ -244,8 +243,7 @@ public class ReadOnlySlicedBufferTest {
/**
* Tests the independence of the writer index via
* {@link ReadOnlySlicedNetworkBuffer#setSize(int)},
- * {@link ReadOnlySlicedNetworkBuffer#getSize()}, and
- * {@link ReadOnlySlicedNetworkBuffer#getSizeUnsafe()}.
+ * {@link ReadOnlySlicedNetworkBuffer#getSize()}.
*/
@Test
public void testGetSetSize2() {
@@ -254,14 +252,10 @@ public class ReadOnlySlicedBufferTest {
private void testGetSetSize(ReadOnlySlicedNetworkBuffer slice, int sliceSize) {
assertEquals(DATA_SIZE, buffer.getSize());
- assertEquals(DATA_SIZE, buffer.getSizeUnsafe());
assertEquals(sliceSize, slice.getSize());
- assertEquals(sliceSize, slice.getSizeUnsafe());
buffer.setSize(DATA_SIZE + 1);
assertEquals(DATA_SIZE + 1, buffer.getSize());
- assertEquals(DATA_SIZE + 1, buffer.getSizeUnsafe());
assertEquals(sliceSize, slice.getSize());
- assertEquals(sliceSize, slice.getSizeUnsafe());
}
@Test