big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-13017. Implementations of InputStream.read(buffer, offset, bytes) to exit 0 if bytes==0. Contributed by Steve Loughran.

Browse Source
This commit is contained in:
Masatake Iwasaki 2016-10-27 15:44:49 +09:00
parent e29cba61a0
commit 0bdd263d82
8 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
View File

@ -968,6 +968,9 @@ public synchronized int read(byte[] b) throws IOException {
@Override
public synchronized int read(byte[] b, int offset, int len)
throws IOException {
if (len == 0) {
return 0;
}
int newlen = len;
int ret = -1;
if (position + len > end) {

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java
View File

@ -246,6 +246,9 @@ public int read(byte[] b) throws IOException {
*/
@Override
public int read(byte[] b, int off, int len) throws IOException {
if (len == 0) {
return 0;
}
if (!useWrap) {
return inStream.read(b, off, len);
}
@ -378,4 +381,4 @@ public int read(ByteBuffer dst) throws IOException {
}
return bytesRead;
}
}
}

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
View File

@ -569,6 +569,9 @@ public int read(byte b[]) throws IOException {
@Override
public synchronized int read(byte[] buf, int off, int len) throws IOException {
if (len == 0) {
return 0;
}
// fill the buffer with the next RPC message
if (unwrappedRpcBuffer.remaining() == 0) {
readNextRpcPacket();

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java
View File

@ -74,6 +74,9 @@ public int read() throws IOException {
@Override
public int read(byte[] b, int off, int len) throws IOException {
if (len == 0) {
return 0;
}
if (left == 0) {
return -1;
}

3
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
View File

@ -1832,6 +1832,9 @@ int read(byte[] b, int off, int len) throws IOException {
if (runnerState == RunnerState.CLOSED) {
throw new IOException("Stream closed");
}
if (len == 0) {
return 0;
}
// Before the first read, pos and fileLength will be 0 and readBuffer
// will all be null. They will be initialized once the first connection

3
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java
View File

@ -84,6 +84,9 @@ public int read(byte[] b) throws IOException {
/** {@inheritDoc} */
@Override
public int read(byte[] b, int off, int len) throws IOException {
if (len == 0) {
return 0;
}
throttle();
int readLen = rawStream.read(b, off, len);
if (readLen != -1) {

3
hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java
View File

@ -187,6 +187,9 @@ public int read() throws IOException {
@Override
public int read(byte[] b, int off, int len) throws IOException {
SwiftUtils.validateReadArgs(b, off, len);
if (len == 0) {
return 0;
}
//if the stream is already closed, then report an exception.
assumeNotReleased();
//now read in a buffer, reacting differently to different operations

3
hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java
View File

@ -161,6 +161,9 @@ public synchronized int read() throws IOException {
public synchronized int read(byte[] b, int off, int len) throws IOException {
SwiftUtils.debug(LOG, "read(buffer, %d, %d)", off, len);
SwiftUtils.validateReadArgs(b, off, len);
if (len == 0) {
return 0;
}
int result = -1;
try {
verifyOpen();