You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/12/21 17:52:50 UTC
[15/29] hbase-site git commit: Published site at
12786f80c14c6f2c3c111a55bbf431fb2e81e828.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueUtil.html
index 5fcddff..6e51095 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueUtil.html
@@ -526,163 +526,287 @@
<span class="sourceLineNo">518</span> return (long) length + Bytes.SIZEOF_INT;<a name="line.518"></a>
<span class="sourceLineNo">519</span> }<a name="line.519"></a>
<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> /**<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * Create a KeyValue reading from the raw InputStream. Named<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <code>iscreate</code> so doesn't clash with {@link #create(DataInput)}<a name="line.523"></a>
-<span class="sourceLineNo">524</span> *<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * @param in<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * @param withTags whether the keyvalue should include tags are not<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * @return Created KeyValue OR if we find a length of zero, we will return<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * null which can be useful marking a stream as done.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * @throws IOException<a name="line.529"></a>
-<span class="sourceLineNo">530</span> */<a name="line.530"></a>
-<span class="sourceLineNo">531</span> public static KeyValue iscreate(final InputStream in, boolean withTags) throws IOException {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> byte[] intBytes = new byte[Bytes.SIZEOF_INT];<a name="line.532"></a>
-<span class="sourceLineNo">533</span> int bytesRead = 0;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> while (bytesRead < intBytes.length) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> int n = in.read(intBytes, bytesRead, intBytes.length - bytesRead);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> if (n < 0) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (bytesRead == 0) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> throw new EOFException();<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span> throw new IOException("Failed read of int, read " + bytesRead + " bytes");<a name="line.540"></a>
-<span class="sourceLineNo">541</span> }<a name="line.541"></a>
-<span class="sourceLineNo">542</span> bytesRead += n;<a name="line.542"></a>
+<span class="sourceLineNo">521</span> static String bytesToHex(byte[] buf, int offset, int length) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span> return ", KeyValueBytesHex=" + Bytes.toStringBinary(buf, offset, length) + ", offset=" + offset<a name="line.522"></a>
+<span class="sourceLineNo">523</span> + ", length=" + length;<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span> static void checkKeyValueBytes(byte[] buf, int offset, int length, boolean withTags) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> int pos = offset, endOffset = offset + length;<a name="line.527"></a>
+<span class="sourceLineNo">528</span> // check the key<a name="line.528"></a>
+<span class="sourceLineNo">529</span> if (pos + Bytes.SIZEOF_INT > endOffset) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span> throw new IllegalArgumentException(<a name="line.530"></a>
+<span class="sourceLineNo">531</span> "Overflow when reading key length at position=" + pos + bytesToHex(buf, offset, length));<a name="line.531"></a>
+<span class="sourceLineNo">532</span> }<a name="line.532"></a>
+<span class="sourceLineNo">533</span> int keyLen = Bytes.toInt(buf, pos, Bytes.SIZEOF_INT);<a name="line.533"></a>
+<span class="sourceLineNo">534</span> pos += Bytes.SIZEOF_INT;<a name="line.534"></a>
+<span class="sourceLineNo">535</span> if (keyLen <= 0 || pos + keyLen > endOffset) {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> throw new IllegalArgumentException(<a name="line.536"></a>
+<span class="sourceLineNo">537</span> "Invalid key length in KeyValue. keyLength=" + keyLen + bytesToHex(buf, offset, length));<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span> // check the value<a name="line.539"></a>
+<span class="sourceLineNo">540</span> if (pos + Bytes.SIZEOF_INT > endOffset) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> throw new IllegalArgumentException("Overflow when reading value length at position=" + pos<a name="line.541"></a>
+<span class="sourceLineNo">542</span> + bytesToHex(buf, offset, length));<a name="line.542"></a>
<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span> // TODO: perhaps some sanity check is needed here.<a name="line.544"></a>
-<span class="sourceLineNo">545</span> byte[] bytes = new byte[Bytes.toInt(intBytes)];<a name="line.545"></a>
-<span class="sourceLineNo">546</span> IOUtils.readFully(in, bytes, 0, bytes.length);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> if (withTags) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> return new KeyValue(bytes, 0, bytes.length);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> return new NoTagsKeyValue(bytes, 0, bytes.length);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> /**<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * @param b<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * @return A KeyValue made of a byte array that holds the key-only part.<a name="line.556"></a>
-<span class="sourceLineNo">557</span> * Needed to convert hfile index members to KeyValues.<a name="line.557"></a>
-<span class="sourceLineNo">558</span> */<a name="line.558"></a>
-<span class="sourceLineNo">559</span> public static KeyValue createKeyValueFromKey(final byte[] b) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> return createKeyValueFromKey(b, 0, b.length);<a name="line.560"></a>
-<span class="sourceLineNo">561</span> }<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span> /**<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * @param bb<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * @return A KeyValue made of a byte buffer that holds the key-only part.<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * Needed to convert hfile index members to KeyValues.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> */<a name="line.567"></a>
-<span class="sourceLineNo">568</span> public static KeyValue createKeyValueFromKey(final ByteBuffer bb) {<a name="line.568"></a>
-<span class="sourceLineNo">569</span> return createKeyValueFromKey(bb.array(), bb.arrayOffset(), bb.limit());<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span> /**<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * @param b<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * @param o<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * @param l<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @return A KeyValue made of a byte array that holds the key-only part.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> * Needed to convert hfile index members to KeyValues.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> */<a name="line.578"></a>
-<span class="sourceLineNo">579</span> public static KeyValue createKeyValueFromKey(final byte[] b, final int o, final int l) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> byte[] newb = new byte[l + KeyValue.ROW_OFFSET];<a name="line.580"></a>
-<span class="sourceLineNo">581</span> System.arraycopy(b, o, newb, KeyValue.ROW_OFFSET, l);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> Bytes.putInt(newb, 0, l);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> Bytes.putInt(newb, Bytes.SIZEOF_INT, 0);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> return new KeyValue(newb);<a name="line.584"></a>
-<span class="sourceLineNo">585</span> }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span> /**<a name="line.587"></a>
-<span class="sourceLineNo">588</span> * @param in<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * Where to read bytes from. Creates a byte array to hold the<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * KeyValue backing bytes copied from the steam.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @return KeyValue created by deserializing from <code>in</code> OR if we<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * find a length of zero, we will return null which can be useful<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * marking a stream as done.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @throws IOException<a name="line.594"></a>
-<span class="sourceLineNo">595</span> */<a name="line.595"></a>
-<span class="sourceLineNo">596</span> public static KeyValue create(final DataInput in) throws IOException {<a name="line.596"></a>
-<span class="sourceLineNo">597</span> return create(in.readInt(), in);<a name="line.597"></a>
-<span class="sourceLineNo">598</span> }<a name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * Create a KeyValue reading <code>length</code> from <code>in</code><a name="line.601"></a>
-<span class="sourceLineNo">602</span> *<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @param length<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @param in<a name="line.604"></a>
-<span class="sourceLineNo">605</span> * @return Created KeyValue OR if we find a length of zero, we will return<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * null which can be useful marking a stream as done.<a name="line.606"></a>
-<span class="sourceLineNo">607</span> * @throws IOException<a name="line.607"></a>
-<span class="sourceLineNo">608</span> */<a name="line.608"></a>
-<span class="sourceLineNo">609</span> public static KeyValue create(int length, final DataInput in) throws IOException {<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span> if (length <= 0) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> if (length == 0)<a name="line.612"></a>
-<span class="sourceLineNo">613</span> return null;<a name="line.613"></a>
-<span class="sourceLineNo">614</span> throw new IOException("Failed read " + length + " bytes, stream corrupt?");<a name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> // This is how the old Writables.readFrom used to deserialize. Didn't even<a name="line.617"></a>
-<span class="sourceLineNo">618</span> // vint.<a name="line.618"></a>
-<span class="sourceLineNo">619</span> byte[] bytes = new byte[length];<a name="line.619"></a>
-<span class="sourceLineNo">620</span> in.readFully(bytes);<a name="line.620"></a>
-<span class="sourceLineNo">621</span> return new KeyValue(bytes, 0, length);<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span> public static int getSerializedSize(Cell cell, boolean withTags) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> if (cell instanceof ExtendedCell) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> return ((ExtendedCell) cell).getSerializedSize(withTags);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> return length(cell.getRowLength(), cell.getFamilyLength(), cell.getQualifierLength(),<a name="line.628"></a>
-<span class="sourceLineNo">629</span> cell.getValueLength(), cell.getTagsLength(), withTags);<a name="line.629"></a>
-<span class="sourceLineNo">630</span> }<a name="line.630"></a>
-<span class="sourceLineNo">631</span><a name="line.631"></a>
-<span class="sourceLineNo">632</span> public static int oswrite(final Cell cell, final OutputStream out, final boolean withTags)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> throws IOException {<a name="line.633"></a>
-<span class="sourceLineNo">634</span> if (cell instanceof ExtendedCell) {<a name="line.634"></a>
-<span class="sourceLineNo">635</span> return ((ExtendedCell)cell).write(out, withTags);<a name="line.635"></a>
-<span class="sourceLineNo">636</span> } else {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> short rlen = cell.getRowLength();<a name="line.637"></a>
-<span class="sourceLineNo">638</span> byte flen = cell.getFamilyLength();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> int qlen = cell.getQualifierLength();<a name="line.639"></a>
-<span class="sourceLineNo">640</span> int vlen = cell.getValueLength();<a name="line.640"></a>
-<span class="sourceLineNo">641</span> int tlen = cell.getTagsLength();<a name="line.641"></a>
-<span class="sourceLineNo">642</span> int size = 0;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> // write key length<a name="line.643"></a>
-<span class="sourceLineNo">644</span> int klen = keyLength(rlen, flen, qlen);<a name="line.644"></a>
-<span class="sourceLineNo">645</span> ByteBufferUtils.putInt(out, klen);<a name="line.645"></a>
-<span class="sourceLineNo">646</span> // write value length<a name="line.646"></a>
-<span class="sourceLineNo">647</span> ByteBufferUtils.putInt(out, vlen);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> // Write rowkey - 2 bytes rk length followed by rowkey bytes<a name="line.648"></a>
-<span class="sourceLineNo">649</span> StreamUtils.writeShort(out, rlen);<a name="line.649"></a>
-<span class="sourceLineNo">650</span> out.write(cell.getRowArray(), cell.getRowOffset(), rlen);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> // Write cf - 1 byte of cf length followed by the family bytes<a name="line.651"></a>
-<span class="sourceLineNo">652</span> out.write(flen);<a name="line.652"></a>
-<span class="sourceLineNo">653</span> out.write(cell.getFamilyArray(), cell.getFamilyOffset(), flen);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> // write qualifier<a name="line.654"></a>
-<span class="sourceLineNo">655</span> out.write(cell.getQualifierArray(), cell.getQualifierOffset(), qlen);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> // write timestamp<a name="line.656"></a>
-<span class="sourceLineNo">657</span> StreamUtils.writeLong(out, cell.getTimestamp());<a name="line.657"></a>
-<span class="sourceLineNo">658</span> // write the type<a name="line.658"></a>
-<span class="sourceLineNo">659</span> out.write(cell.getTypeByte());<a name="line.659"></a>
-<span class="sourceLineNo">660</span> // write value<a name="line.660"></a>
-<span class="sourceLineNo">661</span> out.write(cell.getValueArray(), cell.getValueOffset(), vlen);<a name="line.661"></a>
-<span class="sourceLineNo">662</span> size = klen + vlen + KeyValue.KEYVALUE_INFRASTRUCTURE_SIZE;<a name="line.662"></a>
-<span class="sourceLineNo">663</span> // write tags if we have to<a name="line.663"></a>
-<span class="sourceLineNo">664</span> if (withTags && tlen > 0) {<a name="line.664"></a>
-<span class="sourceLineNo">665</span> // 2 bytes tags length followed by tags bytes<a name="line.665"></a>
-<span class="sourceLineNo">666</span> // tags length is serialized with 2 bytes only(short way) even if the<a name="line.666"></a>
-<span class="sourceLineNo">667</span> // type is int. As this<a name="line.667"></a>
-<span class="sourceLineNo">668</span> // is non -ve numbers, we save the sign bit. See HBASE-11437<a name="line.668"></a>
-<span class="sourceLineNo">669</span> out.write((byte) (0xff & (tlen >> 8)));<a name="line.669"></a>
-<span class="sourceLineNo">670</span> out.write((byte) (0xff & tlen));<a name="line.670"></a>
-<span class="sourceLineNo">671</span> out.write(cell.getTagsArray(), cell.getTagsOffset(), tlen);<a name="line.671"></a>
-<span class="sourceLineNo">672</span> size += tlen + KeyValue.TAGS_LENGTH_SIZE;<a name="line.672"></a>
-<span class="sourceLineNo">673</span> }<a name="line.673"></a>
-<span class="sourceLineNo">674</span> return size;<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">544</span> int valLen = Bytes.toInt(buf, pos, Bytes.SIZEOF_INT);<a name="line.544"></a>
+<span class="sourceLineNo">545</span> pos += Bytes.SIZEOF_INT;<a name="line.545"></a>
+<span class="sourceLineNo">546</span> if (valLen < 0 || pos + valLen > endOffset) {<a name="line.546"></a>
+<span class="sourceLineNo">547</span> throw new IllegalArgumentException("Invalid value length in KeyValue, valueLength=" + valLen<a name="line.547"></a>
+<span class="sourceLineNo">548</span> + bytesToHex(buf, offset, length));<a name="line.548"></a>
+<span class="sourceLineNo">549</span> }<a name="line.549"></a>
+<span class="sourceLineNo">550</span> // check the row<a name="line.550"></a>
+<span class="sourceLineNo">551</span> if (pos + Bytes.SIZEOF_SHORT > endOffset) {<a name="line.551"></a>
+<span class="sourceLineNo">552</span> throw new IllegalArgumentException(<a name="line.552"></a>
+<span class="sourceLineNo">553</span> "Overflow when reading row length at position=" + pos + bytesToHex(buf, offset, length));<a name="line.553"></a>
+<span class="sourceLineNo">554</span> }<a name="line.554"></a>
+<span class="sourceLineNo">555</span> short rowLen = Bytes.toShort(buf, pos, Bytes.SIZEOF_SHORT);<a name="line.555"></a>
+<span class="sourceLineNo">556</span> pos += Bytes.SIZEOF_SHORT;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> if (rowLen < 0 || pos + rowLen > endOffset) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> throw new IllegalArgumentException(<a name="line.558"></a>
+<span class="sourceLineNo">559</span> "Invalid row length in KeyValue, rowLength=" + rowLen + bytesToHex(buf, offset, length));<a name="line.559"></a>
+<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">561</span> pos += rowLen;<a name="line.561"></a>
+<span class="sourceLineNo">562</span> // check the family<a name="line.562"></a>
+<span class="sourceLineNo">563</span> if (pos + Bytes.SIZEOF_BYTE > endOffset) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span> throw new IllegalArgumentException("Overflow when reading family length at position=" + pos<a name="line.564"></a>
+<span class="sourceLineNo">565</span> + bytesToHex(buf, offset, length));<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span> int familyLen = buf[pos];<a name="line.567"></a>
+<span class="sourceLineNo">568</span> pos += Bytes.SIZEOF_BYTE;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> if (familyLen < 0 || pos + familyLen > endOffset) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> throw new IllegalArgumentException("Invalid family length in KeyValue, familyLength="<a name="line.570"></a>
+<span class="sourceLineNo">571</span> + familyLen + bytesToHex(buf, offset, length));<a name="line.571"></a>
+<span class="sourceLineNo">572</span> }<a name="line.572"></a>
+<span class="sourceLineNo">573</span> pos += familyLen;<a name="line.573"></a>
+<span class="sourceLineNo">574</span> // check the qualifier<a name="line.574"></a>
+<span class="sourceLineNo">575</span> int qualifierLen = keyLen - Bytes.SIZEOF_SHORT - rowLen - Bytes.SIZEOF_BYTE - familyLen<a name="line.575"></a>
+<span class="sourceLineNo">576</span> - Bytes.SIZEOF_LONG - Bytes.SIZEOF_BYTE;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> if (qualifierLen < 0 || pos + qualifierLen > endOffset) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> throw new IllegalArgumentException("Invalid qualifier length in KeyValue, qualifierLen="<a name="line.578"></a>
+<span class="sourceLineNo">579</span> + qualifierLen + bytesToHex(buf, offset, length));<a name="line.579"></a>
+<span class="sourceLineNo">580</span> }<a name="line.580"></a>
+<span class="sourceLineNo">581</span> pos += qualifierLen;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> // check the timestamp<a name="line.582"></a>
+<span class="sourceLineNo">583</span> if (pos + Bytes.SIZEOF_LONG > endOffset) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> throw new IllegalArgumentException(<a name="line.584"></a>
+<span class="sourceLineNo">585</span> "Overflow when reading timestamp at position=" + pos + bytesToHex(buf, offset, length));<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span> long timestamp = Bytes.toLong(buf, pos, Bytes.SIZEOF_LONG);<a name="line.587"></a>
+<span class="sourceLineNo">588</span> if (timestamp < 0) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> throw new IllegalArgumentException(<a name="line.589"></a>
+<span class="sourceLineNo">590</span> "Timestamp cannot be negative, ts=" + timestamp + bytesToHex(buf, offset, length));<a name="line.590"></a>
+<span class="sourceLineNo">591</span> }<a name="line.591"></a>
+<span class="sourceLineNo">592</span> pos += Bytes.SIZEOF_LONG;<a name="line.592"></a>
+<span class="sourceLineNo">593</span> // check the type<a name="line.593"></a>
+<span class="sourceLineNo">594</span> if (pos + Bytes.SIZEOF_BYTE > endOffset) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> throw new IllegalArgumentException(<a name="line.595"></a>
+<span class="sourceLineNo">596</span> "Overflow when reading type at position=" + pos + bytesToHex(buf, offset, length));<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> byte type = buf[pos];<a name="line.598"></a>
+<span class="sourceLineNo">599</span> if (!Type.isValidType(type)) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> throw new IllegalArgumentException(<a name="line.600"></a>
+<span class="sourceLineNo">601</span> "Invalid type in KeyValue, type=" + type + bytesToHex(buf, offset, length));<a name="line.601"></a>
+<span class="sourceLineNo">602</span> }<a name="line.602"></a>
+<span class="sourceLineNo">603</span> pos += Bytes.SIZEOF_BYTE;<a name="line.603"></a>
+<span class="sourceLineNo">604</span> // check the value<a name="line.604"></a>
+<span class="sourceLineNo">605</span> if (pos + valLen > endOffset) {<a name="line.605"></a>
+<span class="sourceLineNo">606</span> throw new IllegalArgumentException(<a name="line.606"></a>
+<span class="sourceLineNo">607</span> "Overflow when reading value part at position=" + pos + bytesToHex(buf, offset, length));<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> pos += valLen;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> // check the tags<a name="line.610"></a>
+<span class="sourceLineNo">611</span> if (withTags) {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> if (pos == endOffset) {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> // withTags is true but no tag in the cell.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return;<a name="line.614"></a>
+<span class="sourceLineNo">615</span> }<a name="line.615"></a>
+<span class="sourceLineNo">616</span> if (pos + Bytes.SIZEOF_SHORT > endOffset) {<a name="line.616"></a>
+<span class="sourceLineNo">617</span> throw new IllegalArgumentException("Overflow when reading tags length at position=" + pos<a name="line.617"></a>
+<span class="sourceLineNo">618</span> + bytesToHex(buf, offset, length));<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span> short tagsLen = Bytes.toShort(buf, pos);<a name="line.620"></a>
+<span class="sourceLineNo">621</span> pos += Bytes.SIZEOF_SHORT;<a name="line.621"></a>
+<span class="sourceLineNo">622</span> if (tagsLen < 0 || pos + tagsLen > endOffset) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span> throw new IllegalArgumentException("Invalid tags length in KeyValue at position="<a name="line.623"></a>
+<span class="sourceLineNo">624</span> + (pos - Bytes.SIZEOF_SHORT) + bytesToHex(buf, offset, length));<a name="line.624"></a>
+<span class="sourceLineNo">625</span> }<a name="line.625"></a>
+<span class="sourceLineNo">626</span> int tagsEndOffset = pos + tagsLen;<a name="line.626"></a>
+<span class="sourceLineNo">627</span> for (; pos < tagsEndOffset;) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span> if (pos + Tag.TAG_LENGTH_SIZE > endOffset) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> throw new IllegalArgumentException("Overflow when reading tag length at position=" + pos<a name="line.629"></a>
+<span class="sourceLineNo">630</span> + bytesToHex(buf, offset, length));<a name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span> short tagLen = Bytes.toShort(buf, pos);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> pos += Tag.TAG_LENGTH_SIZE;<a name="line.633"></a>
+<span class="sourceLineNo">634</span> // tagLen contains one byte tag type, so must be not less than 1.<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if (tagLen < 1 || pos + tagLen > endOffset) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> throw new IllegalArgumentException(<a name="line.636"></a>
+<span class="sourceLineNo">637</span> "Invalid tag length at position=" + (pos - Tag.TAG_LENGTH_SIZE) + ", tagLength="<a name="line.637"></a>
+<span class="sourceLineNo">638</span> + tagLen + bytesToHex(buf, offset, length));<a name="line.638"></a>
+<span class="sourceLineNo">639</span> }<a name="line.639"></a>
+<span class="sourceLineNo">640</span> pos += tagLen;<a name="line.640"></a>
+<span class="sourceLineNo">641</span> }<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span> if (pos != endOffset) {<a name="line.643"></a>
+<span class="sourceLineNo">644</span> throw new IllegalArgumentException("Some redundant bytes in KeyValue's buffer, startOffset="<a name="line.644"></a>
+<span class="sourceLineNo">645</span> + pos + ", endOffset=" + endOffset + bytesToHex(buf, offset, length));<a name="line.645"></a>
+<span class="sourceLineNo">646</span> }<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span><a name="line.648"></a>
+<span class="sourceLineNo">649</span> /**<a name="line.649"></a>
+<span class="sourceLineNo">650</span> * Create a KeyValue reading from the raw InputStream. Named<a name="line.650"></a>
+<span class="sourceLineNo">651</span> * <code>createKeyValueFromInputStream</code> so doesn't clash with {@link #create(DataInput)}<a name="line.651"></a>
+<span class="sourceLineNo">652</span> * @param in inputStream to read.<a name="line.652"></a>
+<span class="sourceLineNo">653</span> * @param withTags whether the keyvalue should include tags are not<a name="line.653"></a>
+<span class="sourceLineNo">654</span> * @return Created KeyValue OR if we find a length of zero, we will return null which can be<a name="line.654"></a>
+<span class="sourceLineNo">655</span> * useful marking a stream as done.<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * @throws IOException<a name="line.656"></a>
+<span class="sourceLineNo">657</span> */<a name="line.657"></a>
+<span class="sourceLineNo">658</span> public static KeyValue createKeyValueFromInputStream(InputStream in, boolean withTags)<a name="line.658"></a>
+<span class="sourceLineNo">659</span> throws IOException {<a name="line.659"></a>
+<span class="sourceLineNo">660</span> byte[] intBytes = new byte[Bytes.SIZEOF_INT];<a name="line.660"></a>
+<span class="sourceLineNo">661</span> int bytesRead = 0;<a name="line.661"></a>
+<span class="sourceLineNo">662</span> while (bytesRead < intBytes.length) {<a name="line.662"></a>
+<span class="sourceLineNo">663</span> int n = in.read(intBytes, bytesRead, intBytes.length - bytesRead);<a name="line.663"></a>
+<span class="sourceLineNo">664</span> if (n < 0) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> if (bytesRead == 0) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span> throw new EOFException();<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> throw new IOException("Failed read of int, read " + bytesRead + " bytes");<a name="line.668"></a>
+<span class="sourceLineNo">669</span> }<a name="line.669"></a>
+<span class="sourceLineNo">670</span> bytesRead += n;<a name="line.670"></a>
+<span class="sourceLineNo">671</span> }<a name="line.671"></a>
+<span class="sourceLineNo">672</span> byte[] bytes = new byte[Bytes.toInt(intBytes)];<a name="line.672"></a>
+<span class="sourceLineNo">673</span> IOUtils.readFully(in, bytes, 0, bytes.length);<a name="line.673"></a>
+<span class="sourceLineNo">674</span> return withTags ? new KeyValue(bytes, 0, bytes.length)<a name="line.674"></a>
+<span class="sourceLineNo">675</span> : new NoTagsKeyValue(bytes, 0, bytes.length);<a name="line.675"></a>
<span class="sourceLineNo">676</span> }<a name="line.676"></a>
-<span class="sourceLineNo">677</span>}<a name="line.677"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span> /**<a name="line.678"></a>
+<span class="sourceLineNo">679</span> * @param b<a name="line.679"></a>
+<span class="sourceLineNo">680</span> * @return A KeyValue made of a byte array that holds the key-only part.<a name="line.680"></a>
+<span class="sourceLineNo">681</span> * Needed to convert hfile index members to KeyValues.<a name="line.681"></a>
+<span class="sourceLineNo">682</span> */<a name="line.682"></a>
+<span class="sourceLineNo">683</span> public static KeyValue createKeyValueFromKey(final byte[] b) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> return createKeyValueFromKey(b, 0, b.length);<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span><a name="line.686"></a>
+<span class="sourceLineNo">687</span> /**<a name="line.687"></a>
+<span class="sourceLineNo">688</span> * @param bb<a name="line.688"></a>
+<span class="sourceLineNo">689</span> * @return A KeyValue made of a byte buffer that holds the key-only part.<a name="line.689"></a>
+<span class="sourceLineNo">690</span> * Needed to convert hfile index members to KeyValues.<a name="line.690"></a>
+<span class="sourceLineNo">691</span> */<a name="line.691"></a>
+<span class="sourceLineNo">692</span> public static KeyValue createKeyValueFromKey(final ByteBuffer bb) {<a name="line.692"></a>
+<span class="sourceLineNo">693</span> return createKeyValueFromKey(bb.array(), bb.arrayOffset(), bb.limit());<a name="line.693"></a>
+<span class="sourceLineNo">694</span> }<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span> /**<a name="line.696"></a>
+<span class="sourceLineNo">697</span> * @param b<a name="line.697"></a>
+<span class="sourceLineNo">698</span> * @param o<a name="line.698"></a>
+<span class="sourceLineNo">699</span> * @param l<a name="line.699"></a>
+<span class="sourceLineNo">700</span> * @return A KeyValue made of a byte array that holds the key-only part.<a name="line.700"></a>
+<span class="sourceLineNo">701</span> * Needed to convert hfile index members to KeyValues.<a name="line.701"></a>
+<span class="sourceLineNo">702</span> */<a name="line.702"></a>
+<span class="sourceLineNo">703</span> public static KeyValue createKeyValueFromKey(final byte[] b, final int o, final int l) {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> byte[] newb = new byte[l + KeyValue.ROW_OFFSET];<a name="line.704"></a>
+<span class="sourceLineNo">705</span> System.arraycopy(b, o, newb, KeyValue.ROW_OFFSET, l);<a name="line.705"></a>
+<span class="sourceLineNo">706</span> Bytes.putInt(newb, 0, l);<a name="line.706"></a>
+<span class="sourceLineNo">707</span> Bytes.putInt(newb, Bytes.SIZEOF_INT, 0);<a name="line.707"></a>
+<span class="sourceLineNo">708</span> return new KeyValue(newb);<a name="line.708"></a>
+<span class="sourceLineNo">709</span> }<a name="line.709"></a>
+<span class="sourceLineNo">710</span><a name="line.710"></a>
+<span class="sourceLineNo">711</span> /**<a name="line.711"></a>
+<span class="sourceLineNo">712</span> * @param in<a name="line.712"></a>
+<span class="sourceLineNo">713</span> * Where to read bytes from. Creates a byte array to hold the<a name="line.713"></a>
+<span class="sourceLineNo">714</span> * KeyValue backing bytes copied from the steam.<a name="line.714"></a>
+<span class="sourceLineNo">715</span> * @return KeyValue created by deserializing from <code>in</code> OR if we<a name="line.715"></a>
+<span class="sourceLineNo">716</span> * find a length of zero, we will return null which can be useful<a name="line.716"></a>
+<span class="sourceLineNo">717</span> * marking a stream as done.<a name="line.717"></a>
+<span class="sourceLineNo">718</span> * @throws IOException<a name="line.718"></a>
+<span class="sourceLineNo">719</span> */<a name="line.719"></a>
+<span class="sourceLineNo">720</span> public static KeyValue create(final DataInput in) throws IOException {<a name="line.720"></a>
+<span class="sourceLineNo">721</span> return create(in.readInt(), in);<a name="line.721"></a>
+<span class="sourceLineNo">722</span> }<a name="line.722"></a>
+<span class="sourceLineNo">723</span><a name="line.723"></a>
+<span class="sourceLineNo">724</span> /**<a name="line.724"></a>
+<span class="sourceLineNo">725</span> * Create a KeyValue reading <code>length</code> from <code>in</code><a name="line.725"></a>
+<span class="sourceLineNo">726</span> *<a name="line.726"></a>
+<span class="sourceLineNo">727</span> * @param length<a name="line.727"></a>
+<span class="sourceLineNo">728</span> * @param in<a name="line.728"></a>
+<span class="sourceLineNo">729</span> * @return Created KeyValue OR if we find a length of zero, we will return<a name="line.729"></a>
+<span class="sourceLineNo">730</span> * null which can be useful marking a stream as done.<a name="line.730"></a>
+<span class="sourceLineNo">731</span> * @throws IOException<a name="line.731"></a>
+<span class="sourceLineNo">732</span> */<a name="line.732"></a>
+<span class="sourceLineNo">733</span> public static KeyValue create(int length, final DataInput in) throws IOException {<a name="line.733"></a>
+<span class="sourceLineNo">734</span><a name="line.734"></a>
+<span class="sourceLineNo">735</span> if (length <= 0) {<a name="line.735"></a>
+<span class="sourceLineNo">736</span> if (length == 0)<a name="line.736"></a>
+<span class="sourceLineNo">737</span> return null;<a name="line.737"></a>
+<span class="sourceLineNo">738</span> throw new IOException("Failed read " + length + " bytes, stream corrupt?");<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> // This is how the old Writables.readFrom used to deserialize. Didn't even<a name="line.741"></a>
+<span class="sourceLineNo">742</span> // vint.<a name="line.742"></a>
+<span class="sourceLineNo">743</span> byte[] bytes = new byte[length];<a name="line.743"></a>
+<span class="sourceLineNo">744</span> in.readFully(bytes);<a name="line.744"></a>
+<span class="sourceLineNo">745</span> return new KeyValue(bytes, 0, length);<a name="line.745"></a>
+<span class="sourceLineNo">746</span> }<a name="line.746"></a>
+<span class="sourceLineNo">747</span><a name="line.747"></a>
+<span class="sourceLineNo">748</span> public static int getSerializedSize(Cell cell, boolean withTags) {<a name="line.748"></a>
+<span class="sourceLineNo">749</span> if (cell instanceof ExtendedCell) {<a name="line.749"></a>
+<span class="sourceLineNo">750</span> return ((ExtendedCell) cell).getSerializedSize(withTags);<a name="line.750"></a>
+<span class="sourceLineNo">751</span> }<a name="line.751"></a>
+<span class="sourceLineNo">752</span> return length(cell.getRowLength(), cell.getFamilyLength(), cell.getQualifierLength(),<a name="line.752"></a>
+<span class="sourceLineNo">753</span> cell.getValueLength(), cell.getTagsLength(), withTags);<a name="line.753"></a>
+<span class="sourceLineNo">754</span> }<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span> public static int oswrite(final Cell cell, final OutputStream out, final boolean withTags)<a name="line.756"></a>
+<span class="sourceLineNo">757</span> throws IOException {<a name="line.757"></a>
+<span class="sourceLineNo">758</span> if (cell instanceof ExtendedCell) {<a name="line.758"></a>
+<span class="sourceLineNo">759</span> return ((ExtendedCell)cell).write(out, withTags);<a name="line.759"></a>
+<span class="sourceLineNo">760</span> } else {<a name="line.760"></a>
+<span class="sourceLineNo">761</span> short rlen = cell.getRowLength();<a name="line.761"></a>
+<span class="sourceLineNo">762</span> byte flen = cell.getFamilyLength();<a name="line.762"></a>
+<span class="sourceLineNo">763</span> int qlen = cell.getQualifierLength();<a name="line.763"></a>
+<span class="sourceLineNo">764</span> int vlen = cell.getValueLength();<a name="line.764"></a>
+<span class="sourceLineNo">765</span> int tlen = cell.getTagsLength();<a name="line.765"></a>
+<span class="sourceLineNo">766</span> int size = 0;<a name="line.766"></a>
+<span class="sourceLineNo">767</span> // write key length<a name="line.767"></a>
+<span class="sourceLineNo">768</span> int klen = keyLength(rlen, flen, qlen);<a name="line.768"></a>
+<span class="sourceLineNo">769</span> ByteBufferUtils.putInt(out, klen);<a name="line.769"></a>
+<span class="sourceLineNo">770</span> // write value length<a name="line.770"></a>
+<span class="sourceLineNo">771</span> ByteBufferUtils.putInt(out, vlen);<a name="line.771"></a>
+<span class="sourceLineNo">772</span> // Write rowkey - 2 bytes rk length followed by rowkey bytes<a name="line.772"></a>
+<span class="sourceLineNo">773</span> StreamUtils.writeShort(out, rlen);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> out.write(cell.getRowArray(), cell.getRowOffset(), rlen);<a name="line.774"></a>
+<span class="sourceLineNo">775</span> // Write cf - 1 byte of cf length followed by the family bytes<a name="line.775"></a>
+<span class="sourceLineNo">776</span> out.write(flen);<a name="line.776"></a>
+<span class="sourceLineNo">777</span> out.write(cell.getFamilyArray(), cell.getFamilyOffset(), flen);<a name="line.777"></a>
+<span class="sourceLineNo">778</span> // write qualifier<a name="line.778"></a>
+<span class="sourceLineNo">779</span> out.write(cell.getQualifierArray(), cell.getQualifierOffset(), qlen);<a name="line.779"></a>
+<span class="sourceLineNo">780</span> // write timestamp<a name="line.780"></a>
+<span class="sourceLineNo">781</span> StreamUtils.writeLong(out, cell.getTimestamp());<a name="line.781"></a>
+<span class="sourceLineNo">782</span> // write the type<a name="line.782"></a>
+<span class="sourceLineNo">783</span> out.write(cell.getTypeByte());<a name="line.783"></a>
+<span class="sourceLineNo">784</span> // write value<a name="line.784"></a>
+<span class="sourceLineNo">785</span> out.write(cell.getValueArray(), cell.getValueOffset(), vlen);<a name="line.785"></a>
+<span class="sourceLineNo">786</span> size = klen + vlen + KeyValue.KEYVALUE_INFRASTRUCTURE_SIZE;<a name="line.786"></a>
+<span class="sourceLineNo">787</span> // write tags if we have to<a name="line.787"></a>
+<span class="sourceLineNo">788</span> if (withTags && tlen > 0) {<a name="line.788"></a>
+<span class="sourceLineNo">789</span> // 2 bytes tags length followed by tags bytes<a name="line.789"></a>
+<span class="sourceLineNo">790</span> // tags length is serialized with 2 bytes only(short way) even if the<a name="line.790"></a>
+<span class="sourceLineNo">791</span> // type is int. As this<a name="line.791"></a>
+<span class="sourceLineNo">792</span> // is non -ve numbers, we save the sign bit. See HBASE-11437<a name="line.792"></a>
+<span class="sourceLineNo">793</span> out.write((byte) (0xff & (tlen >> 8)));<a name="line.793"></a>
+<span class="sourceLineNo">794</span> out.write((byte) (0xff & tlen));<a name="line.794"></a>
+<span class="sourceLineNo">795</span> out.write(cell.getTagsArray(), cell.getTagsOffset(), tlen);<a name="line.795"></a>
+<span class="sourceLineNo">796</span> size += tlen + KeyValue.TAGS_LENGTH_SIZE;<a name="line.796"></a>
+<span class="sourceLineNo">797</span> }<a name="line.797"></a>
+<span class="sourceLineNo">798</span> return size;<a name="line.798"></a>
+<span class="sourceLineNo">799</span> }<a name="line.799"></a>
+<span class="sourceLineNo">800</span> }<a name="line.800"></a>
+<span class="sourceLineNo">801</span>}<a name="line.801"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index c579d19..7e371b7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -18,9 +18,9 @@
<span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
<span class="sourceLineNo">011</span> public static final String revision = "";<a name="line.11"></a>
<span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span> public static final String date = "Thu Dec 20 10:41:19 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span> public static final String date = "Fri Dec 21 17:43:39 UTC 2018";<a name="line.13"></a>
<span class="sourceLineNo">014</span> public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span> public static final String srcChecksum = "cac6c13f455cde23001f256bae768095";<a name="line.15"></a>
+<span class="sourceLineNo">015</span> public static final String srcChecksum = "e8a6d48f3e561a4ebcc03375fa9805fd";<a name="line.15"></a>
<span class="sourceLineNo">016</span>}<a name="line.16"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.ByteBuffKeyValueDecoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.ByteBuffKeyValueDecoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.ByteBuffKeyValueDecoder.html
index b8989eb..12e718e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.ByteBuffKeyValueDecoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.ByteBuffKeyValueDecoder.html
@@ -80,7 +80,7 @@
<span class="sourceLineNo">072</span> @Override<a name="line.72"></a>
<span class="sourceLineNo">073</span> protected Cell parseCell() throws IOException {<a name="line.73"></a>
<span class="sourceLineNo">074</span> // No tags here<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return KeyValueUtil.iscreate(in, false);<a name="line.75"></a>
+<span class="sourceLineNo">075</span> return KeyValueUtil.createKeyValueFromInputStream(in, false);<a name="line.75"></a>
<span class="sourceLineNo">076</span> }<a name="line.76"></a>
<span class="sourceLineNo">077</span> }<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
@@ -122,27 +122,26 @@
<span class="sourceLineNo">114</span> // We know there is not going to be any tags.<a name="line.114"></a>
<span class="sourceLineNo">115</span> return new NoTagsByteBufferKeyValue(bb, pos, len);<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Implementation depends on {@link InputStream#available()}<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public Decoder getDecoder(final InputStream is) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return new KeyValueDecoder(is);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> @Override<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public Encoder getEncoder(OutputStream os) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return new KeyValueEncoder(os);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>}<a name="line.137"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Implementation depends on {@link InputStream#available()}<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public Decoder getDecoder(final InputStream is) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return new KeyValueDecoder(is);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> @Override<a name="line.127"></a>
+<span class="sourceLineNo">128</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public Encoder getEncoder(OutputStream os) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> return new KeyValueEncoder(os);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>}<a name="line.136"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueDecoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueDecoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueDecoder.html
index b8989eb..12e718e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueDecoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueDecoder.html
@@ -80,7 +80,7 @@
<span class="sourceLineNo">072</span> @Override<a name="line.72"></a>
<span class="sourceLineNo">073</span> protected Cell parseCell() throws IOException {<a name="line.73"></a>
<span class="sourceLineNo">074</span> // No tags here<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return KeyValueUtil.iscreate(in, false);<a name="line.75"></a>
+<span class="sourceLineNo">075</span> return KeyValueUtil.createKeyValueFromInputStream(in, false);<a name="line.75"></a>
<span class="sourceLineNo">076</span> }<a name="line.76"></a>
<span class="sourceLineNo">077</span> }<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
@@ -122,27 +122,26 @@
<span class="sourceLineNo">114</span> // We know there is not going to be any tags.<a name="line.114"></a>
<span class="sourceLineNo">115</span> return new NoTagsByteBufferKeyValue(bb, pos, len);<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Implementation depends on {@link InputStream#available()}<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public Decoder getDecoder(final InputStream is) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return new KeyValueDecoder(is);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> @Override<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public Encoder getEncoder(OutputStream os) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return new KeyValueEncoder(os);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>}<a name="line.137"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Implementation depends on {@link InputStream#available()}<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public Decoder getDecoder(final InputStream is) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return new KeyValueDecoder(is);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> @Override<a name="line.127"></a>
+<span class="sourceLineNo">128</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public Encoder getEncoder(OutputStream os) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> return new KeyValueEncoder(os);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>}<a name="line.136"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueEncoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueEncoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueEncoder.html
index b8989eb..12e718e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueEncoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.KeyValueEncoder.html
@@ -80,7 +80,7 @@
<span class="sourceLineNo">072</span> @Override<a name="line.72"></a>
<span class="sourceLineNo">073</span> protected Cell parseCell() throws IOException {<a name="line.73"></a>
<span class="sourceLineNo">074</span> // No tags here<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return KeyValueUtil.iscreate(in, false);<a name="line.75"></a>
+<span class="sourceLineNo">075</span> return KeyValueUtil.createKeyValueFromInputStream(in, false);<a name="line.75"></a>
<span class="sourceLineNo">076</span> }<a name="line.76"></a>
<span class="sourceLineNo">077</span> }<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
@@ -122,27 +122,26 @@
<span class="sourceLineNo">114</span> // We know there is not going to be any tags.<a name="line.114"></a>
<span class="sourceLineNo">115</span> return new NoTagsByteBufferKeyValue(bb, pos, len);<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Implementation depends on {@link InputStream#available()}<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public Decoder getDecoder(final InputStream is) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return new KeyValueDecoder(is);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> @Override<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public Encoder getEncoder(OutputStream os) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return new KeyValueEncoder(os);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>}<a name="line.137"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Implementation depends on {@link InputStream#available()}<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public Decoder getDecoder(final InputStream is) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return new KeyValueDecoder(is);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> @Override<a name="line.127"></a>
+<span class="sourceLineNo">128</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public Encoder getEncoder(OutputStream os) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> return new KeyValueEncoder(os);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>}<a name="line.136"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.html
index b8989eb..12e718e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodec.html
@@ -80,7 +80,7 @@
<span class="sourceLineNo">072</span> @Override<a name="line.72"></a>
<span class="sourceLineNo">073</span> protected Cell parseCell() throws IOException {<a name="line.73"></a>
<span class="sourceLineNo">074</span> // No tags here<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return KeyValueUtil.iscreate(in, false);<a name="line.75"></a>
+<span class="sourceLineNo">075</span> return KeyValueUtil.createKeyValueFromInputStream(in, false);<a name="line.75"></a>
<span class="sourceLineNo">076</span> }<a name="line.76"></a>
<span class="sourceLineNo">077</span> }<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
@@ -122,27 +122,26 @@
<span class="sourceLineNo">114</span> // We know there is not going to be any tags.<a name="line.114"></a>
<span class="sourceLineNo">115</span> return new NoTagsByteBufferKeyValue(bb, pos, len);<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * Implementation depends on {@link InputStream#available()}<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public Decoder getDecoder(final InputStream is) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return new KeyValueDecoder(is);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> @Override<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Override<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public Encoder getEncoder(OutputStream os) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return new KeyValueEncoder(os);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>}<a name="line.137"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Implementation depends on {@link InputStream#available()}<a name="line.120"></a>
+<span class="sourceLineNo">121</span> */<a name="line.121"></a>
+<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public Decoder getDecoder(final InputStream is) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return new KeyValueDecoder(is);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> @Override<a name="line.127"></a>
+<span class="sourceLineNo">128</span> public Decoder getDecoder(ByteBuff buf) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return new ByteBuffKeyValueDecoder(buf);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> @Override<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public Encoder getEncoder(OutputStream os) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> return new KeyValueEncoder(os);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>}<a name="line.136"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.ByteBuffKeyValueDecoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.ByteBuffKeyValueDecoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.ByteBuffKeyValueDecoder.html
index 80ec837..54e9bbd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.ByteBuffKeyValueDecoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.ByteBuffKeyValueDecoder.html
@@ -86,7 +86,7 @@
<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
<span class="sourceLineNo">079</span> protected Cell parseCell() throws IOException {<a name="line.79"></a>
<span class="sourceLineNo">080</span> // create KeyValue with tags<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return KeyValueUtil.iscreate(in, true);<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return KeyValueUtil.createKeyValueFromInputStream(in, true);<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
<span class="sourceLineNo">083</span> }<a name="line.83"></a>
<span class="sourceLineNo">084</span><a name="line.84"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueDecoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueDecoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueDecoder.html
index 80ec837..54e9bbd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueDecoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueDecoder.html
@@ -86,7 +86,7 @@
<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
<span class="sourceLineNo">079</span> protected Cell parseCell() throws IOException {<a name="line.79"></a>
<span class="sourceLineNo">080</span> // create KeyValue with tags<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return KeyValueUtil.iscreate(in, true);<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return KeyValueUtil.createKeyValueFromInputStream(in, true);<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
<span class="sourceLineNo">083</span> }<a name="line.83"></a>
<span class="sourceLineNo">084</span><a name="line.84"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueEncoder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueEncoder.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueEncoder.html
index 80ec837..54e9bbd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueEncoder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.KeyValueEncoder.html
@@ -86,7 +86,7 @@
<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
<span class="sourceLineNo">079</span> protected Cell parseCell() throws IOException {<a name="line.79"></a>
<span class="sourceLineNo">080</span> // create KeyValue with tags<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return KeyValueUtil.iscreate(in, true);<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return KeyValueUtil.createKeyValueFromInputStream(in, true);<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
<span class="sourceLineNo">083</span> }<a name="line.83"></a>
<span class="sourceLineNo">084</span><a name="line.84"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.html b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.html
index 80ec837..54e9bbd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.html
@@ -86,7 +86,7 @@
<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
<span class="sourceLineNo">079</span> protected Cell parseCell() throws IOException {<a name="line.79"></a>
<span class="sourceLineNo">080</span> // create KeyValue with tags<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return KeyValueUtil.iscreate(in, true);<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return KeyValueUtil.createKeyValueFromInputStream(in, true);<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
<span class="sourceLineNo">083</span> }<a name="line.83"></a>
<span class="sourceLineNo">084</span><a name="line.84"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/13ae5225/devapidocs/src-html/org/apache/hadoop/hbase/ipc/NettyRpcServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/NettyRpcServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/NettyRpcServer.html
index ef8b46f..052f7a7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/NettyRpcServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/NettyRpcServer.html
@@ -177,27 +177,28 @@
<span class="sourceLineNo">169</span><a name="line.169"></a>
<span class="sourceLineNo">170</span> @Override<a name="line.170"></a>
<span class="sourceLineNo">171</span> public int getNumOpenConnections() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // allChannels also contains the server channel, so exclude that from the count.<a name="line.172"></a>
-<span class="sourceLineNo">173</span> return allChannels.size() - 1;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public Pair<Message, CellScanner> call(BlockingService service,<a name="line.177"></a>
-<span class="sourceLineNo">178</span> MethodDescriptor md, Message param, CellScanner cellScanner,<a name="line.178"></a>
-<span class="sourceLineNo">179</span> long receiveTime, MonitoredRPCHandler status) throws IOException {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return call(service, md, param, cellScanner, receiveTime, status,<a name="line.180"></a>
-<span class="sourceLineNo">181</span> System.currentTimeMillis(), 0);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public Pair<Message, CellScanner> call(BlockingService service, MethodDescriptor md,<a name="line.185"></a>
-<span class="sourceLineNo">186</span> Message param, CellScanner cellScanner, long receiveTime, MonitoredRPCHandler status,<a name="line.186"></a>
-<span class="sourceLineNo">187</span> long startTime, int timeout) throws IOException {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> NettyServerCall fakeCall = new NettyServerCall(-1, service, md, null, param, cellScanner, null,<a name="line.188"></a>
-<span class="sourceLineNo">189</span> -1, null, receiveTime, timeout, reservoir, cellBlockBuilder, null);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return call(fakeCall, status);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>}<a name="line.192"></a>
+<span class="sourceLineNo">172</span> int channelsCount = allChannels.size();<a name="line.172"></a>
+<span class="sourceLineNo">173</span> // allChannels also contains the server channel, so exclude that from the count.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> return channelsCount > 0 ? channelsCount - 1 : channelsCount;<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> @Override<a name="line.177"></a>
+<span class="sourceLineNo">178</span> public Pair<Message, CellScanner> call(BlockingService service,<a name="line.178"></a>
+<span class="sourceLineNo">179</span> MethodDescriptor md, Message param, CellScanner cellScanner,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> long receiveTime, MonitoredRPCHandler status) throws IOException {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return call(service, md, param, cellScanner, receiveTime, status,<a name="line.181"></a>
+<span class="sourceLineNo">182</span> System.currentTimeMillis(), 0);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> @Override<a name="line.185"></a>
+<span class="sourceLineNo">186</span> public Pair<Message, CellScanner> call(BlockingService service, MethodDescriptor md,<a name="line.186"></a>
+<span class="sourceLineNo">187</span> Message param, CellScanner cellScanner, long receiveTime, MonitoredRPCHandler status,<a name="line.187"></a>
+<span class="sourceLineNo">188</span> long startTime, int timeout) throws IOException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> NettyServerCall fakeCall = new NettyServerCall(-1, service, md, null, param, cellScanner, null,<a name="line.189"></a>
+<span class="sourceLineNo">190</span> -1, null, receiveTime, timeout, reservoir, cellBlockBuilder, null);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return call(fakeCall, status);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>}<a name="line.193"></a>