andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Trustin Lee 2009-10-13 08:35:22 +00:00
parent 3b9d1a9dab
commit 85712a72b8
1 changed files with 148 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

298
src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
View File

@ -43,9 +43,9 @@ import java.util.List;
public class CompositeChannelBuffer extends AbstractChannelBuffer { public class CompositeChannelBuffer extends AbstractChannelBuffer {
private final ByteOrder order; private final ByteOrder order;
private ChannelBuffer[] slices; private ChannelBuffer[] components;
private int[] indices; private int[] indices;
private int lastSliceId; private int lastAccessedComponentId;
public CompositeChannelBuffer(ChannelBuffer... buffers) { public CompositeChannelBuffer(ChannelBuffer... buffers) {
if (buffers.length == 0) { if (buffers.length == 0) {
@ -54,21 +54,21 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
// Get the list of the component, while guessing the byte order. // Get the list of the component, while guessing the byte order.
ByteOrder expectedEndianness = null; ByteOrder expectedEndianness = null;
final List<ChannelBuffer> bufferList = new ArrayList<ChannelBuffer>(buffers.length); final List<ChannelBuffer> newComponents = new ArrayList<ChannelBuffer>(buffers.length);
for (ChannelBuffer buffer: buffers) { for (ChannelBuffer c: buffers) {
if (buffer.readableBytes() > 0) { if (c.readableBytes() > 0) {
expectedEndianness = buffer.order(); expectedEndianness = c.order();
if (buffer instanceof CompositeChannelBuffer) { if (c instanceof CompositeChannelBuffer) {
// Expand nested composition. // Expand nested composition.
CompositeChannelBuffer child = (CompositeChannelBuffer) buffer; newComponents.addAll(
bufferList.addAll( ((CompositeChannelBuffer) c).slice0(
child.slice0(child.readerIndex(), child.readableBytes())); c.readerIndex(), c.readableBytes()));
} else { } else {
// An ordinary buffer (non-composite) // An ordinary buffer (non-composite)
bufferList.add(buffer.slice()); newComponents.add(c.slice());
} }
} else if (buffer.capacity() != 0) { } else if (c.capacity() != 0) {
expectedEndianness = buffer.order(); expectedEndianness = c.order();
} }
} }
@ -78,7 +78,7 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
order = expectedEndianness; order = expectedEndianness;
setFromList(bufferList); setFromList(newComponents);
} }
/** /**
@ -93,79 +93,79 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int sliceId = sliceId(index); int componentId = componentId(index);
List<ChannelBuffer> bufferList = new ArrayList<ChannelBuffer>(slices.length); List<ChannelBuffer> slice = new ArrayList<ChannelBuffer>(components.length);
// first one is not complete
// each slice will be duplicated before assign to the list (maintain original indexes) // The first component
ChannelBuffer buf = slices[sliceId].duplicate(); ChannelBuffer first = components[componentId].duplicate();
buf.readerIndex(index - indices[sliceId]); first.readerIndex(index - indices[componentId]);
buf.writerIndex(slices[sliceId].writerIndex());
// as writerIndex can be less than capacity, check too for the end ChannelBuffer buf = first;
int bytesToSlice = length; int bytesToSlice = length;
while (bytesToSlice > 0) { do {
int leftInBuffer = buf.capacity() - buf.readerIndex(); int readableBytes = buf.readableBytes();
if (bytesToSlice <= leftInBuffer) { if (bytesToSlice <= readableBytes) {
// final buffer // Last component
buf.writerIndex(buf.readerIndex() + bytesToSlice); buf.writerIndex(buf.readerIndex() + bytesToSlice);
bufferList.add(buf); slice.add(buf);
bytesToSlice = 0;
break; break;
} else { } else {
// not final buffer // Not the last component
bufferList.add(buf); slice.add(buf);
bytesToSlice -= leftInBuffer; bytesToSlice -= readableBytes;
sliceId ++; componentId ++;
buf = slices[sliceId].duplicate();
buf.readerIndex(0); // Fetch the next component.
buf.writerIndex(slices[sliceId].writerIndex()); buf = components[componentId].duplicate();
// length is > 0
} }
} while (bytesToSlice > 0);
// Slice all components because only readable bytes are interesting.
for (int i = 0; i < slice.size(); i ++) {
slice.set(i, slice.get(i).slice());
} }
return bufferList;
return slice;
} }
/** /**
* Setup this ChannelBuffer from the list and the Endianness * Setup this ChannelBuffer from the list
* @param listBuf
* @param expectedEndianness
*/ */
private void setFromList(List<ChannelBuffer> listBuf) { private void setFromList(List<ChannelBuffer> newComponents) {
assert !newComponents.isEmpty();
// Reset the cached slice position. // Clear the cache.
lastSliceId = 0; lastAccessedComponentId = 0;
int number = listBuf.size(); // Build the component array.
if (number == 0) { components = new ChannelBuffer[newComponents.size()];
slices = new ChannelBuffer[1]; for (int i = 0; i < components.length; i ++) {
// to prevent remove too early ChannelBuffer c = newComponents.get(i);
slices[0] = ChannelBuffers.EMPTY_BUFFER.slice(); if (c.order() != order()) {
indices = new int[2];
indices[1] = indices[0] + slices[0].capacity();
readerIndex(0);
writerIndex(capacity());
return;
}
slices = new ChannelBuffer[number];
int i = 0;
for (ChannelBuffer buffer: listBuf) {
if (buffer.order() != order()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"All buffers must have the same endianness."); "All buffers must have the same endianness.");
} }
slices[i] = buffer;
i ++; assert c.readerIndex() == 0;
assert c.writerIndex() == c.capacity();
components[i] = c;
} }
indices = new int[number + 1];
// Build the component lookup table.
indices = new int[components.length + 1];
indices[0] = 0; indices[0] = 0;
for (i = 1; i <= number; i ++) { for (int i = 1; i <= components.length; i ++) {
indices[i] = indices[i - 1] + slices[i - 1].capacity(); indices[i] = indices[i - 1] + components[i - 1].capacity();
} }
// Reset the indexes.
setIndex(0, capacity()); setIndex(0, capacity());
} }
private CompositeChannelBuffer(CompositeChannelBuffer buffer) { private CompositeChannelBuffer(CompositeChannelBuffer buffer) {
order = buffer.order; order = buffer.order;
slices = buffer.slices.clone(); components = buffer.components.clone();
indices = buffer.indices.clone(); indices = buffer.indices.clone();
setIndex(buffer.readerIndex(), buffer.writerIndex()); setIndex(buffer.readerIndex(), buffer.writerIndex());
} }
@ -179,18 +179,18 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public int capacity() { public int capacity() {
return indices[slices.length]; return indices[components.length];
} }
public byte getByte(int index) { public byte getByte(int index) {
int sliceId = sliceId(index); int componentId = componentId(index);
return slices[sliceId].getByte(index - indices[sliceId]); return components[componentId].getByte(index - indices[componentId]);
} }
public short getShort(int index) { public short getShort(int index) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 2 <= indices[sliceId + 1]) { if (index + 2 <= indices[componentId + 1]) {
return slices[sliceId].getShort(index - indices[sliceId]); return components[componentId].getShort(index - indices[componentId]);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
return (short) ((getByte(index) & 0xff) << 8 | getByte(index + 1) & 0xff); return (short) ((getByte(index) & 0xff) << 8 | getByte(index + 1) & 0xff);
} else { } else {
@ -199,9 +199,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public int getUnsignedMedium(int index) { public int getUnsignedMedium(int index) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 3 <= indices[sliceId + 1]) { if (index + 3 <= indices[componentId + 1]) {
return slices[sliceId].getUnsignedMedium(index - indices[sliceId]); return components[componentId].getUnsignedMedium(index - indices[componentId]);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
return (getShort(index) & 0xffff) << 8 | getByte(index + 2) & 0xff; return (getShort(index) & 0xffff) << 8 | getByte(index + 2) & 0xff;
} else { } else {
@ -210,9 +210,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public int getInt(int index) { public int getInt(int index) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 4 <= indices[sliceId + 1]) { if (index + 4 <= indices[componentId + 1]) {
return slices[sliceId].getInt(index - indices[sliceId]); return components[componentId].getInt(index - indices[componentId]);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
return (getShort(index) & 0xffff) << 16 | getShort(index + 2) & 0xffff; return (getShort(index) & 0xffff) << 16 | getShort(index + 2) & 0xffff;
} else { } else {
@ -221,9 +221,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public long getLong(int index) { public long getLong(int index) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 8 <= indices[sliceId + 1]) { if (index + 8 <= indices[componentId + 1]) {
return slices[sliceId].getLong(index - indices[sliceId]); return components[componentId].getLong(index - indices[componentId]);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
return (getInt(index) & 0xffffffffL) << 32 | getInt(index + 4) & 0xffffffffL; return (getInt(index) & 0xffffffffL) << 32 | getInt(index + 4) & 0xffffffffL;
} else { } else {
@ -232,14 +232,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void getBytes(int index, byte[] dst, int dstIndex, int length) { public void getBytes(int index, byte[] dst, int dstIndex, int length) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length || dstIndex > dst.length - length) { if (index > capacity() - length || dstIndex > dst.length - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.getBytes(index - adjustment, dst, dstIndex, localLength); s.getBytes(index - adjustment, dst, dstIndex, localLength);
@ -251,17 +251,17 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void getBytes(int index, ByteBuffer dst) { public void getBytes(int index, ByteBuffer dst) {
int sliceId = sliceId(index); int componentId = componentId(index);
int limit = dst.limit(); int limit = dst.limit();
int length = dst.remaining(); int length = dst.remaining();
if (index > capacity() - length) { if (index > capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
try { try {
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
dst.limit(dst.position() + localLength); dst.limit(dst.position() + localLength);
@ -276,14 +276,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void getBytes(int index, ChannelBuffer dst, int dstIndex, int length) { public void getBytes(int index, ChannelBuffer dst, int dstIndex, int length) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length || dstIndex > dst.capacity() - length) { if (index > capacity() - length || dstIndex > dst.capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.getBytes(index - adjustment, dst, dstIndex, localLength); s.getBytes(index - adjustment, dst, dstIndex, localLength);
@ -304,14 +304,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
public void getBytes(int index, OutputStream out, int length) public void getBytes(int index, OutputStream out, int length)
throws IOException { throws IOException {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length) { if (index > capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.getBytes(index - adjustment, out, localLength); s.getBytes(index - adjustment, out, localLength);
@ -322,14 +322,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setByte(int index, byte value) { public void setByte(int index, byte value) {
int sliceId = sliceId(index); int componentId = componentId(index);
slices[sliceId].setByte(index - indices[sliceId], value); components[componentId].setByte(index - indices[componentId], value);
} }
public void setShort(int index, short value) { public void setShort(int index, short value) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 2 <= indices[sliceId + 1]) { if (index + 2 <= indices[componentId + 1]) {
slices[sliceId].setShort(index - indices[sliceId], value); components[componentId].setShort(index - indices[componentId], value);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
setByte(index, (byte) (value >>> 8)); setByte(index, (byte) (value >>> 8));
setByte(index + 1, (byte) value); setByte(index + 1, (byte) value);
@ -340,9 +340,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setMedium(int index, int value) { public void setMedium(int index, int value) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 3 <= indices[sliceId + 1]) { if (index + 3 <= indices[componentId + 1]) {
slices[sliceId].setMedium(index - indices[sliceId], value); components[componentId].setMedium(index - indices[componentId], value);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
setShort(index, (short) (value >> 8)); setShort(index, (short) (value >> 8));
setByte(index + 2, (byte) value); setByte(index + 2, (byte) value);
@ -353,9 +353,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setInt(int index, int value) { public void setInt(int index, int value) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 4 <= indices[sliceId + 1]) { if (index + 4 <= indices[componentId + 1]) {
slices[sliceId].setInt(index - indices[sliceId], value); components[componentId].setInt(index - indices[componentId], value);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
setShort(index, (short) (value >>> 16)); setShort(index, (short) (value >>> 16));
setShort(index + 2, (short) value); setShort(index + 2, (short) value);
@ -366,9 +366,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setLong(int index, long value) { public void setLong(int index, long value) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + 8 <= indices[sliceId + 1]) { if (index + 8 <= indices[componentId + 1]) {
slices[sliceId].setLong(index - indices[sliceId], value); components[componentId].setLong(index - indices[componentId], value);
} else if (order() == ByteOrder.BIG_ENDIAN) { } else if (order() == ByteOrder.BIG_ENDIAN) {
setInt(index, (int) (value >>> 32)); setInt(index, (int) (value >>> 32));
setInt(index + 4, (int) value); setInt(index + 4, (int) value);
@ -379,14 +379,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setBytes(int index, byte[] src, int srcIndex, int length) { public void setBytes(int index, byte[] src, int srcIndex, int length) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length || srcIndex > src.length - length) { if (index > capacity() - length || srcIndex > src.length - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.setBytes(index - adjustment, src, srcIndex, localLength); s.setBytes(index - adjustment, src, srcIndex, localLength);
@ -398,17 +398,17 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setBytes(int index, ByteBuffer src) { public void setBytes(int index, ByteBuffer src) {
int sliceId = sliceId(index); int componentId = componentId(index);
int limit = src.limit(); int limit = src.limit();
int length = src.remaining(); int length = src.remaining();
if (index > capacity() - length) { if (index > capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
try { try {
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
src.limit(src.position() + localLength); src.limit(src.position() + localLength);
@ -423,14 +423,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public void setBytes(int index, ChannelBuffer src, int srcIndex, int length) { public void setBytes(int index, ChannelBuffer src, int srcIndex, int length) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length || srcIndex > src.capacity() - length) { if (index > capacity() - length || srcIndex > src.capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.setBytes(index - adjustment, src, srcIndex, localLength); s.setBytes(index - adjustment, src, srcIndex, localLength);
@ -443,16 +443,16 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
public int setBytes(int index, InputStream in, int length) public int setBytes(int index, InputStream in, int length)
throws IOException { throws IOException {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length) { if (index > capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
int readBytes = 0; int readBytes = 0;
do { do {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
int localReadBytes = s.setBytes(index - adjustment, in, localLength); int localReadBytes = s.setBytes(index - adjustment, in, localLength);
@ -481,15 +481,15 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
public int setBytes(int index, ScatteringByteChannel in, int length) public int setBytes(int index, ScatteringByteChannel in, int length)
throws IOException { throws IOException {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length) { if (index > capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
int i = sliceId; int i = componentId;
int readBytes = 0; int readBytes = 0;
do { do {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
int localReadBytes = s.setBytes(index - adjustment, in, localLength); int localReadBytes = s.setBytes(index - adjustment, in, localLength);
@ -516,22 +516,22 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public ChannelBuffer copy(int index, int length) { public ChannelBuffer copy(int index, int length) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index > capacity() - length) { if (index > capacity() - length) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
ChannelBuffer dst = factory().getBuffer(order(), length); ChannelBuffer dst = factory().getBuffer(order(), length);
copyTo(index, length, sliceId, dst); copyTo(index, length, componentId, dst);
return dst; return dst;
} }
private void copyTo(int index, int length, int sliceId, ChannelBuffer dst) { private void copyTo(int index, int length, int componentId, ChannelBuffer dst) {
int dstIndex = 0; int dstIndex = 0;
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.getBytes(index - adjustment, dst, dstIndex, localLength); s.getBytes(index - adjustment, dst, dstIndex, localLength);
@ -561,8 +561,8 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public ByteBuffer toByteBuffer(int index, int length) { public ByteBuffer toByteBuffer(int index, int length) {
if (slices.length == 1) { if (components.length == 1) {
return slices[0].toByteBuffer(index, length); return components[0].toByteBuffer(index, length);
} }
ByteBuffer[] buffers = toByteBuffers(index, length); ByteBuffer[] buffers = toByteBuffers(index, length);
@ -576,16 +576,16 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
@Override @Override
public ByteBuffer[] toByteBuffers(int index, int length) { public ByteBuffer[] toByteBuffers(int index, int length) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + length > capacity()) { if (index + length > capacity()) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
List<ByteBuffer> buffers = new ArrayList<ByteBuffer>(slices.length); List<ByteBuffer> buffers = new ArrayList<ByteBuffer>(components.length);
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
buffers.add(s.toByteBuffer(index - adjustment, localLength)); buffers.add(s.toByteBuffer(index - adjustment, localLength));
@ -598,18 +598,18 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
public String toString(int index, int length, String charsetName) { public String toString(int index, int length, String charsetName) {
int sliceId = sliceId(index); int componentId = componentId(index);
if (index + length <= indices[sliceId + 1]) { if (index + length <= indices[componentId + 1]) {
return slices[sliceId].toString( return components[componentId].toString(
index - indices[sliceId], length, charsetName); index - indices[componentId], length, charsetName);
} }
byte[] data = new byte[length]; byte[] data = new byte[length];
int dataIndex = 0; int dataIndex = 0;
int i = sliceId; int i = componentId;
while (length > 0) { while (length > 0) {
ChannelBuffer s = slices[i]; ChannelBuffer s = components[i];
int adjustment = indices[i]; int adjustment = indices[i];
int localLength = Math.min(length, s.capacity() - (index - adjustment)); int localLength = Math.min(length, s.capacity() - (index - adjustment));
s.getBytes(index - adjustment, data, dataIndex, localLength); s.getBytes(index - adjustment, data, dataIndex, localLength);
@ -626,25 +626,25 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
} }
} }
private int sliceId(int index) { private int componentId(int index) {
int lastSliceId = this.lastSliceId; int lastComponentId = lastAccessedComponentId;
if (index >= indices[lastSliceId]) { if (index >= indices[lastComponentId]) {
if (index < indices[lastSliceId + 1]) { if (index < indices[lastComponentId + 1]) {
return lastSliceId; return lastComponentId;
} }
// Search right // Search right
for (int i = lastSliceId + 1; i < slices.length; i ++) { for (int i = lastComponentId + 1; i < components.length; i ++) {
if (index < indices[i + 1]) { if (index < indices[i + 1]) {
this.lastSliceId = i; lastAccessedComponentId = i;
return i; return i;
} }
} }
} else { } else {
// Search left // Search left
for (int i = lastSliceId - 1; i >= 0; i --) { for (int i = lastComponentId - 1; i >= 0; i --) {
if (index >= indices[i]) { if (index >= indices[i]) {
this.lastSliceId = i; lastAccessedComponentId = i;
return i; return i;
} }
} }
@ -668,11 +668,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
final int bytesToMove = capacity() - localReaderIndex; final int bytesToMove = capacity() - localReaderIndex;
List<ChannelBuffer> list = slice0(localReaderIndex, bytesToMove); List<ChannelBuffer> list = slice0(localReaderIndex, bytesToMove);
// Truncate the discardable bytes of the first buffer.
list.set(0, list.get(0).slice());
// Add a new buffer so that the capacity of this composite buffer does // Add a new buffer so that the capacity of this composite buffer does
// not decrease due to the discarded components. // not decrease due to the discarded components.
// XXX Might create too many components if discarded by small amount.
list.add(ChannelBuffers.buffer(order(), localReaderIndex)); list.add(ChannelBuffers.buffer(order(), localReaderIndex));
// Reset the index markers to get the index marker values. // Reset the index markers to get the index marker values.
@ -708,6 +706,6 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
public String toString() { public String toString() {
String result = super.toString(); String result = super.toString();
result = result.substring(0, result.length() - 1); result = result.substring(0, result.length() - 1);
return result + ", slices=" + slices.length + ")"; return result + ", components=" + components.length + ")";
} }
} }