Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-16680 Reduce garbage in BufferChain 

Signed-off-by: Yu Li <liyu@apache.org>
This commit is contained in:
binlijin 2016-09-23 11:04:08 +08:00 committed by Yu Li
parent 96c5a02217
commit 191afc8eb1
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/BufferChain.java
View File

@ -20,8 +20,6 @@ package org.apache.hadoop.hbase.ipc;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.GatheringByteChannel; import java.nio.channels.GatheringByteChannel;
import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceAudience;
@ -35,22 +33,11 @@ class BufferChain {
private int remaining = 0; private int remaining = 0;
private int bufferOffset = 0; private int bufferOffset = 0;
BufferChain(ByteBuffer ... buffers) { BufferChain(ByteBuffer[] buffers) {
// Some of the incoming buffers can be null
List<ByteBuffer> bbs = new ArrayList<ByteBuffer>(buffers.length);
for (ByteBuffer b : buffers) {
if (b == null) continue;
bbs.add(b);
this.remaining += b.remaining();
}
this.buffers = bbs.toArray(new ByteBuffer[bbs.size()]);
}
BufferChain(List<ByteBuffer> buffers) {
for (ByteBuffer b : buffers) { for (ByteBuffer b : buffers) {
this.remaining += b.remaining(); this.remaining += b.remaining();
} }
this.buffers = buffers.toArray(new ByteBuffer[buffers.size()]); this.buffers = buffers;
} }
/** /**

29
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
View File

@ -411,7 +411,9 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
} }
protected synchronized void setSaslTokenResponse(ByteBuffer response) { protected synchronized void setSaslTokenResponse(ByteBuffer response) {
this.response = new BufferChain(response); ByteBuffer[] responseBufs = new ByteBuffer[1];
responseBufs[0] = response;
this.response = new BufferChain(responseBufs);
} }
protected synchronized void setResponse(Object m, final CellScanner cells, protected synchronized void setResponse(Object m, final CellScanner cells,
@ -458,10 +460,20 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
} }
Message header = headerBuilder.build(); Message header = headerBuilder.build();
byte[] b = createHeaderAndMessageBytes(result, header, cellBlockSize); byte[] b = createHeaderAndMessageBytes(result, header, cellBlockSize);
List<ByteBuffer> responseBufs = new ArrayList<ByteBuffer>( ByteBuffer[] responseBufs = null;
(cellBlock == null ? 1 : cellBlock.size()) + 1); int cellBlockBufferSize = 0;
responseBufs.add(ByteBuffer.wrap(b)); if (cellBlock != null) {
if (cellBlock != null) responseBufs.addAll(cellBlock); cellBlockBufferSize = cellBlock.size();
responseBufs = new ByteBuffer[1 + cellBlockBufferSize];
} else {
responseBufs = new ByteBuffer[1];
}
responseBufs[0] = ByteBuffer.wrap(b);
if (cellBlock != null) {
for (int i = 0; i < cellBlockBufferSize; i++) {
responseBufs[i + 1] = cellBlock.get(i);
}
}
bc = new BufferChain(responseBufs); bc = new BufferChain(responseBufs);
if (connection.useWrap) { if (connection.useWrap) {
bc = wrapWithSasl(bc); bc = wrapWithSasl(bc);
@ -555,9 +567,10 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
+ " as call response."); + " as call response.");
} }
ByteBuffer bbTokenLength = ByteBuffer.wrap(Bytes.toBytes(token.length)); ByteBuffer[] responseBufs = new ByteBuffer[2];
ByteBuffer bbTokenBytes = ByteBuffer.wrap(token); responseBufs[0] = ByteBuffer.wrap(Bytes.toBytes(token.length));
return new BufferChain(bbTokenLength, bbTokenBytes); responseBufs[1] = ByteBuffer.wrap(token);
return new BufferChain(responseBufs);
} }
@Override @Override