http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/types/TerminatedWrapper.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/types/TerminatedWrapper.html 
b/apidocs/src-html/org/apache/hadoop/hbase/types/TerminatedWrapper.html
index 8ca79a6..5ed25c3 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/types/TerminatedWrapper.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/types/TerminatedWrapper.html
@@ -25,11 +25,11 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.types;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange;<a 
name="line.24"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>/**<a name="line.26"></a>
 <span class="sourceLineNo">027</span> * Wraps an existing {@code DataType} 
implementation as a terminated<a name="line.27"></a>
@@ -48,124 +48,145 @@
 <span class="sourceLineNo">040</span>   * @throws IllegalArgumentException 
when {@code term} is null or empty.<a name="line.40"></a>
 <span class="sourceLineNo">041</span>   */<a name="line.41"></a>
 <span class="sourceLineNo">042</span>  public 
TerminatedWrapper(DataType&lt;T&gt; wrapped, byte[] term) {<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>    if (null == term || term.length == 
0)<a name="line.43"></a>
+<span class="sourceLineNo">043</span>    if (null == term || term.length == 0) 
{<a name="line.43"></a>
 <span class="sourceLineNo">044</span>      throw new 
IllegalArgumentException("terminator must be non-null and non-empty.");<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>    this.wrapped = wrapped;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>    wrapped.getOrder().apply(term);<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>    this.term = term;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   * Create a terminated version of the 
{@code wrapped}.<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   * {@code term} is converted to a 
{@code byte[]} using<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * {@link Bytes#toBytes(String)}.<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>   * @throws IllegalArgumentException 
when {@code term} is null or empty.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public 
TerminatedWrapper(DataType&lt;T&gt; wrapped, String term) {<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>    this(wrapped, Bytes.toBytes(term));<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public boolean isOrderPreserving() { 
return wrapped.isOrderPreserving(); }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @Override<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public Order getOrder() { return 
wrapped.getOrder(); }<a name="line.64"></a>
+<span class="sourceLineNo">045</span>    }<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    this.wrapped = wrapped;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>    wrapped.getOrder().apply(term);<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>    this.term = term;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>  }<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  /**<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   * Create a terminated version of the 
{@code wrapped}.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * {@code term} is converted to a 
{@code byte[]} using<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * {@link Bytes#toBytes(String)}.<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>   * @throws IllegalArgumentException 
when {@code term} is null or empty.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  public 
TerminatedWrapper(DataType&lt;T&gt; wrapped, String term) {<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>    this(wrapped, Bytes.toBytes(term));<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  @Override<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  public boolean isOrderPreserving() {<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    return wrapped.isOrderPreserving();<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>  @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public boolean isNullable() { return 
wrapped.isNullable(); }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public boolean isSkippable() { return 
true; }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public int encodedLength(T val) {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    return wrapped.encodedLength(val) + 
term.length;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  @Override<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public Class&lt;T&gt; encodedClass() { 
return wrapped.encodedClass(); }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>  /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   * Return the position at which {@code 
term} begins within {@code src},<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   * or {@code -1} if {@code term} is not 
found.<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  protected int 
terminatorPosition(PositionedByteRange src) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    byte[] a = src.getBytes();<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>    final int offset = src.getOffset();<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>    int i;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    SKIP: for (i = src.getPosition(); i 
&lt; src.getLength(); i++) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (a[offset + i] != term[0]) 
continue;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      int j;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      for (j = 1; j &lt; term.length 
&amp;&amp; offset + j &lt; src.getLength(); j++) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        if (a[offset + i + j] != term[j]) 
continue SKIP;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      if (j == term.length) return i; // 
success<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return -1;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * Skip {@code src}'s position forward 
over one encoded value.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @param src the buffer containing the 
encoded value.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @return number of bytes skipped.<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @throws IllegalArgumentException 
when the terminator sequence is not found.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public int skip(PositionedByteRange 
src) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    if (wrapped.isSkippable()) {<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>      int ret = wrapped.skip(src);<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      src.setPosition(src.getPosition() + 
term.length);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      return ret + term.length;<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    } else {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      // find the terminator position<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      final int start = 
src.getPosition();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      int skipped = 
terminatorPosition(src);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      if (-1 == skipped) throw new 
IllegalArgumentException("Terminator sequence not found.");<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      skipped += term.length;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      src.setPosition(skipped);<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      return skipped - start;<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><a name="line.121"></a>
+<span class="sourceLineNo">067</span>  public Order getOrder() {<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>    return wrapped.getOrder();<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  @Override<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  public boolean isNullable() {<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    return wrapped.isNullable();<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>  @Override<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  public boolean isSkippable() {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>    return true;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  @Override<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  public int encodedLength(T val) {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    return wrapped.encodedLength(val) + 
term.length;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public Class&lt;T&gt; encodedClass() 
{<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    return wrapped.encodedClass();<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * Return the position at which {@code 
term} begins within {@code src},<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   * or {@code -1} if {@code term} is not 
found.<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  protected int 
terminatorPosition(PositionedByteRange src) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    byte[] a = src.getBytes();<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    final int offset = src.getOffset();<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    int i;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    SKIP: for (i = src.getPosition(); i 
&lt; src.getLength(); i++) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      if (a[offset + i] != term[0]) {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>        continue;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      int j;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      for (j = 1; j &lt; term.length 
&amp;&amp; offset + j &lt; src.getLength(); j++) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        if (a[offset + i + j] != term[j]) 
{<a name="line.105"></a>
+<span class="sourceLineNo">106</span>          continue SKIP;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>        }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      }<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      if (j == term.length) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>        return i; // success<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    return -1;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  /**<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * Skip {@code src}'s position forward 
over one encoded value.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * @param src the buffer containing the 
encoded value.<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * @return number of bytes skipped.<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>   * @throws IllegalArgumentException 
when the terminator sequence is not found.<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 T decode(PositionedByteRange 
src) {<a name="line.123"></a>
+<span class="sourceLineNo">123</span>  public int skip(PositionedByteRange 
src) {<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    if (wrapped.isSkippable()) {<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>      T ret = wrapped.decode(src);<a 
name="line.125"></a>
+<span class="sourceLineNo">125</span>      int ret = wrapped.skip(src);<a 
name="line.125"></a>
 <span class="sourceLineNo">126</span>      src.setPosition(src.getPosition() + 
term.length);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      return ret;<a name="line.127"></a>
+<span class="sourceLineNo">127</span>      return ret + term.length;<a 
name="line.127"></a>
 <span class="sourceLineNo">128</span>    } else {<a name="line.128"></a>
 <span class="sourceLineNo">129</span>      // find the terminator position<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      int term = 
terminatorPosition(src);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      if (-1 == term) throw new 
IllegalArgumentException("Terminator sequence not found.");<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>      byte[] b = new byte[term - 
src.getPosition()];<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      src.get(b);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      // TODO: should we assert that 
b.position == b.length?<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      T ret = wrapped.decode(new 
SimplePositionedMutableByteRange(b));<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      src.get(this.term);<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      return ret;<a name="line.137"></a>
+<span class="sourceLineNo">130</span>      final int start = 
src.getPosition();<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      int skipped = 
terminatorPosition(src);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      if (-1 == skipped) {<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>        throw new 
IllegalArgumentException("Terminator sequence not found.");<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      skipped += term.length;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      src.setPosition(skipped);<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      return skipped - start;<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
 <span class="sourceLineNo">139</span>  }<a name="line.139"></a>
 <span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span>   * Write instance {@code val} into 
buffer {@code dst}.<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * @throws IllegalArgumentException 
when the encoded representation of<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   *           {@code val} contains the 
{@code term} sequence.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public int encode(PositionedByteRange 
dst, T val) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    final int start = 
dst.getPosition();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    int written = wrapped.encode(dst, 
val);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    PositionedByteRange b = 
dst.shallowCopy();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    b.setLength(dst.getPosition());<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>    b.setPosition(start);<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    if (-1 != terminatorPosition(b)) {<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>      dst.setPosition(start);<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>      throw new 
IllegalArgumentException("Encoded value contains terminator sequence.");<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    dst.put(term);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return written + term.length;<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>}<a name="line.160"></a>
+<span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public T decode(PositionedByteRange 
src) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    if (wrapped.isSkippable()) {<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>      T ret = wrapped.decode(src);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      src.setPosition(src.getPosition() + 
term.length);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      return ret;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    } else {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      // find the terminator position<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>      int term = 
terminatorPosition(src);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      if (-1 == term) {<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>        throw new 
IllegalArgumentException("Terminator sequence not found.");<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>      }<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      byte[] b = new byte[term - 
src.getPosition()];<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      src.get(b);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      // TODO: should we assert that 
b.position == b.length?<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      T ret = wrapped.decode(new 
SimplePositionedMutableByteRange(b));<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      src.get(this.term);<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>      return ret;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>  /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * Write instance {@code val} into 
buffer {@code dst}.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   * @throws IllegalArgumentException 
when the encoded representation of<a name="line.164"></a>
+<span class="sourceLineNo">165</span>   *           {@code val} contains the 
{@code term} sequence.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   */<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  @Override<a name="line.167"></a>
+<span class="sourceLineNo">168</span>  public int encode(PositionedByteRange 
dst, T val) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    final int start = 
dst.getPosition();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    int written = wrapped.encode(dst, 
val);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    PositionedByteRange b = 
dst.shallowCopy();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    b.setLength(dst.getPosition());<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    b.setPosition(start);<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>    if (-1 != terminatorPosition(b)) {<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>      dst.setPosition(start);<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>      throw new 
IllegalArgumentException("Encoded value contains terminator sequence.");<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    dst.put(term);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    return written + term.length;<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>}<a name="line.181"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/types/Union2.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/types/Union2.html 
b/apidocs/src-html/org/apache/hadoop/hbase/types/Union2.html
index 9006633..da25d98 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/types/Union2.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/types/Union2.html
@@ -25,9 +25,9 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.types;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.22"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>/**<a name="line.24"></a>
 <span class="sourceLineNo">025</span> * The {@code Union} family of {@link 
DataType}s encode one of a fixed<a name="line.25"></a>
@@ -56,38 +56,40 @@
 <span class="sourceLineNo">048</span>  }<a name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>  @Override<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public Order getOrder() { return null; 
}<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public boolean isNullable() {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    return typeA.isNullable() &amp;&amp; 
typeB.isNullable();<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public boolean isSkippable() {<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>    return typeA.isSkippable() &amp;&amp; 
typeB.isSkippable();<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @Override<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public Class&lt;Object&gt; 
encodedClass() {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    throw new 
UnsupportedOperationException(<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      "Union types do not expose a 
definitive encoded class.");<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  /**<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   * Read an instance of the first type 
parameter from buffer {@code src}.<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   */<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  public A decodeA(PositionedByteRange 
src) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    return (A) decode(src);<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  /**<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * Read an instance of the second type 
parameter from buffer {@code src}.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public B decodeB(PositionedByteRange 
src) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    return (B) decode(src);<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
-<span class="sourceLineNo">082</span>}<a name="line.82"></a>
+<span class="sourceLineNo">051</span>  public Order getOrder() {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    return null;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  @Override<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public boolean isNullable() {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    return typeA.isNullable() &amp;&amp; 
typeB.isNullable();<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public boolean isSkippable() {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    return typeA.isSkippable() &amp;&amp; 
typeB.isSkippable();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public Class&lt;Object&gt; 
encodedClass() {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    throw new 
UnsupportedOperationException(<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      "Union types do not expose a 
definitive encoded class.");<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * Read an instance of the first type 
parameter from buffer {@code src}.<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public A decodeA(PositionedByteRange 
src) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    return (A) decode(src);<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>
+<span class="sourceLineNo">079</span>   * Read an instance of the second type 
parameter from buffer {@code src}.<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   */<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public B decodeB(PositionedByteRange 
src) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    return (B) decode(src);<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/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/types/Union3.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/types/Union3.html 
b/apidocs/src-html/org/apache/hadoop/hbase/types/Union3.html
index f73757a..2d960a8 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/types/Union3.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/types/Union3.html
@@ -25,9 +25,9 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.types;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.22"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>/**<a name="line.24"></a>
 <span class="sourceLineNo">025</span> * The {@code Union} family of {@link 
DataType}s encode one of a fixed<a name="line.25"></a>
@@ -56,25 +56,27 @@
 <span class="sourceLineNo">048</span>  }<a name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>  @Override<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public Order getOrder() { return null; 
}<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public boolean isNullable() {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    return super.isNullable() &amp;&amp; 
typeC.isNullable();<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public boolean isSkippable() {<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>    return super.isSkippable() &amp;&amp; 
typeC.isSkippable();<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  /**<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * Read an instance of the third type 
parameter from buffer {@code src}.<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public C decodeC(PositionedByteRange 
src) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    return (C) decode(src);<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span>}<a name="line.69"></a>
+<span class="sourceLineNo">051</span>  public Order getOrder() {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    return null;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  @Override<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public boolean isNullable() {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    return super.isNullable() &amp;&amp; 
typeC.isNullable();<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public boolean isSkippable() {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    return super.isSkippable() &amp;&amp; 
typeC.isSkippable();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Read an instance of the third type 
parameter from buffer {@code src}.<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public C decodeC(PositionedByteRange 
src) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    return (C) decode(src);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
+<span class="sourceLineNo">071</span>}<a name="line.71"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/types/Union4.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/types/Union4.html 
b/apidocs/src-html/org/apache/hadoop/hbase/types/Union4.html
index 3abcb68..3309c40 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/types/Union4.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/types/Union4.html
@@ -25,9 +25,9 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.types;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.22"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.util.Order;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.util.PositionedByteRange;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>/**<a name="line.24"></a>
 <span class="sourceLineNo">025</span> * The {@code Union} family of {@link 
DataType}s encode one of a fixed<a name="line.25"></a>
@@ -55,25 +55,27 @@
 <span class="sourceLineNo">047</span>  }<a name="line.47"></a>
 <span class="sourceLineNo">048</span><a name="line.48"></a>
 <span class="sourceLineNo">049</span>  @Override<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  public Order getOrder() { return null; 
}<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  @Override<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  public boolean isNullable() {<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>    return super.isNullable() &amp;&amp; 
typeD.isNullable();<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  @Override<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public boolean isSkippable() {<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    return super.isSkippable() &amp;&amp; 
typeD.isSkippable();<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  }<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * Read an instance of the fourth type 
parameter from buffer {@code src}.<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public D decodeD(PositionedByteRange 
src) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    return (D) decode(src);<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span>}<a name="line.68"></a>
+<span class="sourceLineNo">050</span>  public Order getOrder() {<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    return null;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @Override<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public boolean isNullable() {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>    return super.isNullable() &amp;&amp; 
typeD.isNullable();<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  public boolean isSkippable() {<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>    return super.isSkippable() &amp;&amp; 
typeD.isSkippable();<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * Read an instance of the fourth type 
parameter from buffer {@code src}.<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   */<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  public D decodeD(PositionedByteRange 
src) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    return (D) decode(src);<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span>}<a name="line.70"></a>
 
 
 

Reply via email to