diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 780aeaf7e2f..4a98c9e83a0 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -148,6 +148,9 @@ Release 2.1.1-beta - 2013-09-23 HADOOP-9962. in order to avoid dependency divergence within Hadoop itself lets enable DependencyConvergence. (rvs via tucu) + HADOOP-9669. Reduce the number of byte array creations and copies in + XDR data manipulation. (Haohui Mai via brandonli) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java index 344dcd78018..2781282998a 100644 --- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java +++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java @@ -57,8 +57,7 @@ public class SimpleUdpClient { clientSocket.receive(receivePacket); // Check reply status - XDR xdr = new XDR(); - xdr.writeFixedOpaque(Arrays.copyOfRange(receiveData, 0, + XDR xdr = new XDR(Arrays.copyOfRange(receiveData, 0, receivePacket.getLength())); RpcReply reply = RpcReply.read(xdr); if (reply.getState() != RpcReply.ReplyState.MSG_ACCEPTED) { diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java index 223b7794a2f..517b18d7d30 100644 --- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java +++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java @@ -43,13 +43,14 @@ public class SimpleUdpServerHandler extends SimpleChannelHandler { public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) { ChannelBuffer buf = (ChannelBuffer) e.getMessage(); - XDR request = new XDR(); - - request.writeFixedOpaque(buf.array()); + XDR request = new XDR(buf.array()); + InetAddress remoteInetAddr = ((InetSocketAddress) e.getRemoteAddress()) .getAddress(); XDR response = rpcProgram.handle(request, remoteInetAddr, null); - e.getChannel().write(XDR.writeMessageUdp(response), e.getRemoteAddress()); + + e.getChannel().write(XDR.writeMessageUdp(response.asReadOnlyWrap()), + e.getRemoteAddress()); } @Override diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java index c2f3d06b996..1472f6ebe62 100644 --- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java +++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java @@ -17,402 +17,253 @@ */ package org.apache.hadoop.oncrpc; -import java.io.PrintStream; -import java.util.Arrays; +import java.nio.ByteBuffer; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; /** * Utility class for building XDR messages based on RFC 4506. - *
- * This class maintains a buffer into which java types are written as - * XDR types for building XDR messages. Similarly this class can - * be used to get java types from an XDR request or response. - *
- * Currently only a subset of XDR types defined in RFC 4506 are supported. + * + * Key points of the format: + * + *
- * An XDR signed integer is a 32-bit datum that encodes an integer in - * the range [-2147483648,2147483647]. The integer is represented in - * two's complement notation. The most and least significant bytes are - * 0 and 3, respectively. Integers are declared as follows: - * - * int identifier; - * - * (MSB) (LSB) - * +-------+-------+-------+-------+ - * |byte 0 |byte 1 |byte 2 |byte 3 | INTEGER - * +-------+-------+-------+-------+ - * <------------32 bits------------> - *- */ - public void writeInt(int data) { - append(toBytes(data)); - } - - /** - * Read an XDR signed integer and return as Java primitive integer. - */ public int readInt() { - byte byte0 = bytearr[cursor++]; - byte byte1 = bytearr[cursor++]; - byte byte2 = bytearr[cursor++]; - byte byte3 = bytearr[cursor++]; - return (XDR.toShort(byte0) << 24) + (XDR.toShort(byte1) << 16) - + (XDR.toShort(byte2) << 8) + XDR.toShort(byte3); + Preconditions.checkState(state == State.READING); + return buf.getInt(); } - /** - * Write Java primitive boolean as an XDR boolean. - * - * Definition of XDR boolean from RFC 4506: - *
- * Booleans are important enough and occur frequently enough to warrant - * their own explicit type in the standard. Booleans are declared as - * follows: - * - * bool identifier; - * - * This is equivalent to: - * - * enum { FALSE = 0, TRUE = 1 } identifier; - *- */ - public void writeBoolean(boolean data) { - this.writeInt(data ? 1 : 0); + public void writeInt(int v) { + ensureFreeSpace(SIZEOF_INT); + buf.putInt(v); } - /** - * Read an XDR boolean and return as Java primitive boolean. - */ public boolean readBoolean() { - return readInt() == 0 ? false : true; + Preconditions.checkState(state == State.READING); + return buf.getInt() != 0; } - /** - * Write Java primitive long to an XDR signed long. - * - * Definition of XDR signed long from RFC 4506: - *
- * The standard also defines 64-bit (8-byte) numbers called hyper - * integers and unsigned hyper integers. Their representations are the - * obvious extensions of integer and unsigned integer defined above. - * They are represented in two's complement notation.The most and - * least significant bytes are 0 and 7, respectively. Their - * declarations: - * - * hyper identifier; unsigned hyper identifier; - * - * (MSB) (LSB) - * +-------+-------+-------+-------+-------+-------+-------+-------+ - * |byte 0 |byte 1 |byte 2 |byte 3 |byte 4 |byte 5 |byte 6 |byte 7 | - * +-------+-------+-------+-------+-------+-------+-------+-------+ - * <----------------------------64 bits----------------------------> - * HYPER INTEGER - * UNSIGNED HYPER INTEGER - *- */ - public void writeLongAsHyper(long data) { - byte byte0 = (byte) ((data & 0xff00000000000000l) >> 56); - byte byte1 = (byte) ((data & 0x00ff000000000000l) >> 48); - byte byte2 = (byte) ((data & 0x0000ff0000000000l) >> 40); - byte byte3 = (byte) ((data & 0x000000ff00000000l) >> 32); - byte byte4 = (byte) ((data & 0x00000000ff000000l) >> 24); - byte byte5 = (byte) ((data & 0x0000000000ff0000l) >> 16); - byte byte6 = (byte) ((data & 0x000000000000ff00l) >> 8); - byte byte7 = (byte) ((data & 0x00000000000000ffl)); - this.append(new byte[] { byte0, byte1, byte2, byte3, byte4, byte5, byte6, byte7 }); + public void writeBoolean(boolean v) { + ensureFreeSpace(SIZEOF_INT); + buf.putInt(v ? 1 : 0); } - /** - * Read XDR signed hyper and return as java primitive long. - */ public long readHyper() { - byte byte0 = bytearr[cursor++]; - byte byte1 = bytearr[cursor++]; - byte byte2 = bytearr[cursor++]; - byte byte3 = bytearr[cursor++]; - byte byte4 = bytearr[cursor++]; - byte byte5 = bytearr[cursor++]; - byte byte6 = bytearr[cursor++]; - byte byte7 = bytearr[cursor++]; - return ((long) XDR.toShort(byte0) << 56) - + ((long) XDR.toShort(byte1) << 48) + ((long) XDR.toShort(byte2) << 40) - + ((long) XDR.toShort(byte3) << 32) + ((long) XDR.toShort(byte4) << 24) - + ((long) XDR.toShort(byte5) << 16) + ((long) XDR.toShort(byte6) << 8) - + XDR.toShort(byte7); + Preconditions.checkState(state == State.READING); + return buf.getLong(); } - /** - * Write a Java primitive byte array to XDR fixed-length opaque data. - * - * Defintion of fixed-length opaque data from RFC 4506: - *
- * At times, fixed-length uninterpreted data needs to be passed among - * machines. This data is called "opaque" and is declared as follows: - * - * opaque identifier[n]; - * - * where the constant n is the (static) number of bytes necessary to - * contain the opaque data. If n is not a multiple of four, then the n - * bytes are followed by enough (0 to 3) residual zero bytes, r, to make - * the total byte count of the opaque object a multiple of four. - * - * 0 1 ... - * +--------+--------+...+--------+--------+...+--------+ - * | byte 0 | byte 1 |...|byte n-1| 0 |...| 0 | - * +--------+--------+...+--------+--------+...+--------+ - * |<-----------n bytes---------->|<------r bytes------>| - * |<-----------n+r (where (n+r) mod 4 = 0)------------>| - * FIXED-LENGTH OPAQUE - *- */ - public void writeFixedOpaque(byte[] data) { - writeFixedOpaque(data, data.length); - } - - public void writeFixedOpaque(byte[] data, int length) { - append(Arrays.copyOf(data, length + XDR.pad(length, 4))); + public void writeLongAsHyper(long v) { + ensureFreeSpace(SIZEOF_LONG); + buf.putLong(v); } public byte[] readFixedOpaque(int size) { - byte[] ret = new byte[size]; - for(int i = 0; i < size; i++) { - ret[i] = bytearr[cursor]; - cursor++; - } - - for(int i = 0; i < XDR.pad(size, 4); i++) { - cursor++; - } - return ret; + Preconditions.checkState(state == State.READING); + byte[] r = new byte[size]; + buf.get(r); + alignPosition(); + return r; } - /** - * Write a Java primitive byte array as XDR variable-length opque data. - * - * Definition of XDR variable-length opaque data RFC 4506: - * - *
- * The standard also provides for variable-length (counted) opaque data, - * defined as a sequence of n (numbered 0 through n-1) arbitrary bytes - * to be the number n encoded as an unsigned integer (as described - * below), and followed by the n bytes of the sequence. - * - * Byte m of the sequence always precedes byte m+1 of the sequence, and - * byte 0 of the sequence always follows the sequence's length (count). - * If n is not a multiple of four, then the n bytes are followed by - * enough (0 to 3) residual zero bytes, r, to make the total byte count - * a multiple of four. Variable-length opaque data is declared in the - * following way: - * - * opaque identifier- */ - public void writeVariableOpaque(byte[] data) { - this.writeInt(data.length); - this.writeFixedOpaque(data); + public void writeFixedOpaque(byte[] src, int length) { + ensureFreeSpace(alignUp(length)); + buf.put(src, 0, length); + writePadding(); + } + + public void writeFixedOpaque(byte[] src) { + writeFixedOpaque(src, src.length); } public byte[] readVariableOpaque() { - int size = this.readInt(); - return size != 0 ? this.readFixedOpaque(size) : new byte[0]; + Preconditions.checkState(state == State.READING); + int size = readInt(); + return readFixedOpaque(size); } - public void skipVariableOpaque() { - int length= this.readInt(); - this.skip(length+XDR.pad(length, 4)); - } - - /** - * Write Java String as XDR string. - * - * Definition of XDR string from RFC 4506: - * - *; - * or - * opaque identifier<>; - * - * The constant m denotes an upper bound of the number of bytes that the - * sequence may contain. If m is not specified, as in the second - * declaration, it is assumed to be (2**32) - 1, the maximum length. - * - * The constant m would normally be found in a protocol specification. - * For example, a filing protocol may state that the maximum data - * transfer size is 8192 bytes, as follows: - * - * opaque filedata<8192>; - * - * 0 1 2 3 4 5 ... - * +-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+ - * | length n |byte0|byte1|...| n-1 | 0 |...| 0 | - * +-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+ - * |<-------4 bytes------->|<------n bytes------>|<---r bytes--->| - * |<----n+r (where (n+r) mod 4 = 0)---->| - * VARIABLE-LENGTH OPAQUE - * - * It is an error to encode a length greater than the maximum described - * in the specification. - *
- * The standard defines a string of n (numbered 0 through n-1) ASCII - * bytes to be the number n encoded as an unsigned integer (as described - * above), and followed by the n bytes of the string. Byte m of the - * string always precedes byte m+1 of the string, and byte 0 of the - * string always follows the string's length. If n is not a multiple of - * four, then the n bytes are followed by enough (0 to 3) residual zero - * bytes, r, to make the total byte count a multiple of four. Counted - * byte strings are declared as follows: - * - * string object- */ - public void writeString(String data) { - this.writeVariableOpaque(data.getBytes()); + public void writeVariableOpaque(byte[] src) { + ensureFreeSpace(SIZEOF_INT + alignUp(src.length)); + buf.putInt(src.length); + writeFixedOpaque(src); } public String readString() { - return new String(this.readVariableOpaque()); + return new String(readVariableOpaque()); } - public void dump(PrintStream out) { - for(int i = 0; i < bytearr.length; i += 4) { - out.println(hex(bytearr[i]) + " " + hex(bytearr[i + 1]) + " " - + hex(bytearr[i + 2]) + " " + hex(bytearr[i + 3])); + public void writeString(String s) { + writeVariableOpaque(s.getBytes()); + } + + private void writePadding() { + Preconditions.checkState(state == State.WRITING); + int p = pad(buf.position()); + ensureFreeSpace(p); + buf.put(PADDING_BYTES, 0, p); + } + + private int alignUp(int length) { + return length + pad(length); + } + + private int pad(int length) { + switch (length % 4) { + case 1: + return 3; + case 2: + return 2; + case 3: + return 1; + default: + return 0; } } - @VisibleForTesting - public byte[] getBytes() { - return Arrays.copyOf(bytearr, bytearr.length); + private void alignPosition() { + buf.position(alignUp(buf.position())); } - public static byte[] append(byte[] bytes, byte[] bytesToAdd) { - byte[] newByteArray = new byte[bytes.length + bytesToAdd.length]; - System.arraycopy(bytes, 0, newByteArray, 0, bytes.length); - System.arraycopy(bytesToAdd, 0, newByteArray, bytes.length, bytesToAdd.length); - return newByteArray; + private void ensureFreeSpace(int size) { + Preconditions.checkState(state == State.WRITING); + if (buf.remaining() < size) { + int newCapacity = buf.capacity() * 2; + int newRemaining = buf.capacity() + buf.remaining(); + + while (newRemaining < size) { + newRemaining += newCapacity; + newCapacity *= 2; + } + + ByteBuffer newbuf = ByteBuffer.allocate(newCapacity); + buf.flip(); + newbuf.put(buf); + buf = newbuf; + } } - private static int pad(int x, int y) { - return x % y == 0 ? 0 : y - (x % y); - } - - static byte[] toBytes(int n) { - byte[] ret = { (byte) ((n & 0xff000000) >> 24), - (byte) ((n & 0x00ff0000) >> 16), (byte) ((n & 0x0000ff00) >> 8), - (byte) (n & 0x000000ff) }; - return ret; - } - - private static short toShort(byte b) { - return b < 0 ? (short) (b + 256): (short) b; - } - - private static String hex(byte b) { - return "" + HEXES.charAt((b & 0xF0) >> 4) + HEXES.charAt((b & 0x0F)); + /** check if the rest of data has more than len bytes */ + public static boolean verifyLength(XDR xdr, int len) { + return xdr.buf.remaining() >= len; } private static byte[] recordMark(int size, boolean last) { - return toBytes(!last ? size : size | 0x80000000); - } - - public static byte[] getVariableOpque(byte[] data) { - byte[] bytes = toBytes(data.length); - return append(bytes, Arrays.copyOf(data, data.length + XDR.pad(data.length, 4))); - } - - public static int fragmentSize(byte[] mark) { - int n = (XDR.toShort(mark[0]) << 24) + (XDR.toShort(mark[1]) << 16) - + (XDR.toShort(mark[2]) << 8) + XDR.toShort(mark[3]); - return n & 0x7fffffff; - } - - public static boolean isLastFragment(byte[] mark) { - int n = (XDR.toShort(mark[0]) << 24) + (XDR.toShort(mark[1]) << 16) - + (XDR.toShort(mark[2]) << 8) + XDR.toShort(mark[3]); - return (n & 0x80000000) != 0; - } - - /** check if the rest of data has more than; - * or - * string object<>; - * - * The constant m denotes an upper bound of the number of bytes that a - * string may contain. If m is not specified, as in the second - * declaration, it is assumed to be (2**32) - 1, the maximum length. - * The constant m would normally be found in a protocol specification. - * For example, a filing protocol may state that a file name can be no - * longer than 255 bytes, as follows: - * - * string filename<255>; - * - * 0 1 2 3 4 5 ... - * +-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+ - * | length n |byte0|byte1|...| n-1 | 0 |...| 0 | - * +-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+ - * |<-------4 bytes------->|<------n bytes------>|<---r bytes--->| - * |<----n+r (where (n+r) mod 4 = 0)---->| - * STRING - * It is an error to encode a length greater than the maximum described - * in the specification. - *