Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9936df1
Add mark&reset methods and canUseByteBuffer&getByteBuffer methods to …
voidzcy Aug 17, 2020
aa93e1d
Default implementations.
voidzcy Aug 17, 2020
454e224
Wire new methods for forwarder
voidzcy Aug 17, 2020
3f47d5e
Support mark&reset and retrieving content via ByteBuffer for netty.
voidzcy Aug 17, 2020
b3c9974
Implementation for composite.
voidzcy Aug 17, 2020
2ede525
Define interface for accessing readable content via ByteBuffers.
voidzcy Aug 17, 2020
3dca312
Implement mark&reset for simple readable buffers.
voidzcy Aug 17, 2020
6249353
Use HasByteBuffer interface for accesing input stream's backing ByteB…
voidzcy Aug 17, 2020
29dce67
Eliminate the length argument for retrieving the ByteBuffer.
voidzcy Aug 17, 2020
22ea6c3
Do no require netty buffer to be direct from API's perspective.
voidzcy Aug 17, 2020
53e347c
Use Deque operations to avoid unncessary moves.
voidzcy Aug 17, 2020
27801fe
Make a list of ByteBuffers up-front instead of a running iterator.
voidzcy Aug 17, 2020
eb71a68
Add getByteBufferSupported method for HasByteBuffer so that it can be…
voidzcy Aug 17, 2020
5d3c657
It's not necessary to implement getByteBuffer for ByteReadbaleBufferW…
voidzcy Aug 17, 2020
9fd8d3c
Add test coverage for mark&reset and getByteBuffer for generic ByteBu…
voidzcy Aug 17, 2020
e3afe50
Add test coverage for netty's special get NIO bytebuffer operation.
voidzcy Aug 17, 2020
e2fdd07
Skip test for operations not supported by okhttp.
voidzcy Aug 17, 2020
033270b
Add test coverage for BufferInputStream with getByteBuffer operation.
voidzcy Aug 17, 2020
0622d51
Add test using a known-length input stream with getByteBuffer operati…
voidzcy Aug 17, 2020
0e8caee
Modify test method name.
voidzcy Aug 17, 2020
ba4e91b
Add test coverage for mark&reset and getByteBuffer for CompositeReada…
voidzcy Aug 17, 2020
69618b2
Add getByteBuffer support for ByteReadableBufferWrapper.
voidzcy Aug 20, 2020
437857d
Only pull ByteBuffers when message is large.
voidzcy Aug 21, 2020
1363505
Run ByteBuffer codepath only in Java 9+.
voidzcy Aug 28, 2020
c46eb73
Slight improvement for avoiding array creation if not necessary.
voidzcy Aug 28, 2020
7b4e070
Merge branch 'master' of github.com:grpc/grpc-java into impl/zero_cop…
voidzcy Aug 28, 2020
772b3ba
Change ReadableBuffer#canUseByteBuffer to hasByteBuffer.
voidzcy Sep 1, 2020
b1c99e5
Removed unnecessary reset.
voidzcy Sep 1, 2020
692076c
Simplify checking runtime java version.
voidzcy Sep 1, 2020
10c13b8
Add ExperimentalApi annotation.
voidzcy Sep 1, 2020
f13c165
Rename ReadableBuffer#hasByteBuffer to getByteBufferSupported.
voidzcy Sep 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test coverage for mark&reset and getByteBuffer for CompositeReada…
…bleByteBuffer.
  • Loading branch information
voidzcy committed Aug 17, 2020
commit ba4e91bc796f398ce19f4f7955c388d0b9f051c0
128 changes: 128 additions & 0 deletions core/src/test/java/io/grpc/internal/CompositeReadableBufferTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@
package io.grpc.internal;

import static com.google.common.base.Charsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.InvalidMarkException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -153,6 +159,128 @@ public void readStreamShouldSucceed() throws IOException {
assertEquals(EXPECTED_VALUE, new String(bos.toByteArray(), UTF_8));
}

@Test
public void resetUnmarkedShouldThrow() {
try {
composite.reset();
fail();
} catch (InvalidMarkException expected) {
}
}

@Test
public void markAndResetWithSkipBytesShouldSucceed() {
composite.mark();
composite.skipBytes(EXPECTED_VALUE.length() / 2);
composite.reset();
assertEquals(EXPECTED_VALUE.length(), composite.readableBytes());
}

@Test
public void markAndResetWithReadUnsignedByteShouldSucceed() {
composite.readUnsignedByte();
composite.mark();
int b = composite.readUnsignedByte();
composite.reset();
assertEquals(EXPECTED_VALUE.length() - 1, composite.readableBytes());
assertEquals(b, composite.readUnsignedByte());
}

@Test
public void markAndResetWithReadByteArrayShouldSucceed() {
composite.mark();
byte[] first = new byte[EXPECTED_VALUE.length()];
composite.readBytes(first, 0, EXPECTED_VALUE.length());
composite.reset();
assertEquals(EXPECTED_VALUE.length(), composite.readableBytes());
byte[] second = new byte[EXPECTED_VALUE.length()];
composite.readBytes(second, 0, EXPECTED_VALUE.length());
assertArrayEquals(first, second);
}

@Test
public void markAndResetWithReadByteBufferShouldSucceed() {
byte[] first = new byte[EXPECTED_VALUE.length()];
composite.mark();
composite.readBytes(ByteBuffer.wrap(first));
composite.reset();
byte[] second = new byte[EXPECTED_VALUE.length()];
assertEquals(EXPECTED_VALUE.length(), composite.readableBytes());
composite.readBytes(ByteBuffer.wrap(second));
assertArrayEquals(first, second);
}

@Test
public void markAndResetWithReadStreamShouldSucceed() throws IOException {
ByteArrayOutputStream first = new ByteArrayOutputStream();
composite.mark();
composite.readBytes(first, EXPECTED_VALUE.length() / 2);
composite.reset();
assertEquals(EXPECTED_VALUE.length(), composite.readableBytes());
ByteArrayOutputStream second = new ByteArrayOutputStream();
composite.readBytes(second, EXPECTED_VALUE.length() / 2);
assertArrayEquals(first.toByteArray(), second.toByteArray());
}

@Test
public void markAndResetWithReadReadableBufferShouldSucceed() {
composite.readBytes(EXPECTED_VALUE.length() / 2);
int remaining = composite.readableBytes();
composite.mark();
ReadableBuffer first = composite.readBytes(1);
composite.reset();
assertEquals(remaining, composite.readableBytes());
ReadableBuffer second = composite.readBytes(1);
assertEquals(first.readUnsignedByte(), second.readUnsignedByte());
}

@Test
public void markAgainShouldOverwritePreviousMark() {
composite.mark();
composite.skipBytes(EXPECTED_VALUE.length() / 2);
int remaining = composite.readableBytes();
composite.mark();
composite.skipBytes(1);
composite.reset();
assertEquals(remaining, composite.readableBytes());
}

@Test
public void bufferAddedAfterMarkedShouldBeIncluded() {
composite = new CompositeReadableBuffer();
composite.mark();
splitAndAdd(EXPECTED_VALUE);
composite.skipBytes(EXPECTED_VALUE.length() / 2);
composite.reset();
assertEquals(EXPECTED_VALUE.length(), composite.readableBytes());
}

@Test
public void canUseByteBufferOnlyAllComponentsSupportUsingByteBuffer() {
composite = new CompositeReadableBuffer();
ReadableBuffer buffer1 = mock(ReadableBuffer.class);
ReadableBuffer buffer2 = mock(ReadableBuffer.class);
ReadableBuffer buffer3 = mock(ReadableBuffer.class);
when(buffer1.canUseByteBuffer()).thenReturn(true);
when(buffer2.canUseByteBuffer()).thenReturn(true);
when(buffer3.canUseByteBuffer()).thenReturn(false);
composite.addBuffer(buffer1);
assertTrue(composite.canUseByteBuffer());
composite.addBuffer(buffer2);
assertTrue(composite.canUseByteBuffer());
composite.addBuffer(buffer3);
assertFalse(composite.canUseByteBuffer());
}

@Test
public void getByteBufferDelegatesToComponents() {
composite = new CompositeReadableBuffer();
ReadableBuffer buffer = mock(ReadableBuffer.class);
composite.addBuffer(buffer);
composite.getByteBuffer();
verify(buffer).getByteBuffer();
}

@Test
public void closeShouldCloseBuffers() {
composite = new CompositeReadableBuffer();
Expand Down