hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [29/51] [partial] hbase-site git commit: Published site at .
Date Sat, 28 Oct 2017 15:16:31 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5018ccb3/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
index c6abac8..223370c 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/TimestampsFilter.html
@@ -31,7 +31,7 @@
 <span class="sourceLineNo">023</span>import java.util.TreeSet;<a name="line.23"></a>
 <span class="sourceLineNo">024</span><a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Cell;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.26"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;<a name="line.29"></a>
@@ -158,14 +158,14 @@
 <span class="sourceLineNo">150</span>      // but it's always better to be extra safe and protect against future<a name="line.150"></a>
 <span class="sourceLineNo">151</span>      // behavioral changes.<a name="line.151"></a>
 <span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>      return CellUtil.createLastOnRowCol(currentCell);<a name="line.153"></a>
+<span class="sourceLineNo">153</span>      return PrivateCellUtil.createLastOnRowCol(currentCell);<a name="line.153"></a>
 <span class="sourceLineNo">154</span>    }<a name="line.154"></a>
 <span class="sourceLineNo">155</span><a name="line.155"></a>
 <span class="sourceLineNo">156</span>    // Since we know the nextTimestampObject isn't null here there must still be<a name="line.156"></a>
 <span class="sourceLineNo">157</span>    // timestamps that can be included. Cast the Long to a long and return the<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    // a cell with the current row/cf/col and the next found timestamp.<a name="line.158"></a>
 <span class="sourceLineNo">159</span>    long nextTimestamp = nextTimestampObject;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    return CellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);<a name="line.160"></a>
+<span class="sourceLineNo">160</span>    return PrivateCellUtil.createFirstOnRowColTS(currentCell, nextTimestamp);<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>  public static Filter createFilterFromArguments(ArrayList&lt;byte []&gt; filterArguments) {<a name="line.163"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5018ccb3/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSerialization.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSerialization.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSerialization.html
index 2f94a75..f5b8fe6 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSerialization.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSerialization.html
@@ -32,73 +32,72 @@
 <span class="sourceLineNo">024</span>import java.io.OutputStream;<a name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.Cell;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.ExtendedCell;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.io.serializer.Deserializer;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.io.serializer.Serialization;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.io.serializer.Serializer;<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>@InterfaceAudience.Public<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public class CellSerialization implements Serialization&lt;Cell&gt; {<a name="line.38"></a>
-<span class="sourceLineNo">039</span>  @Override<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  public boolean accept(Class&lt;?&gt; c) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    return Cell.class.isAssignableFrom(c);<a name="line.41"></a>
-<span class="sourceLineNo">042</span>  }<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  @Override<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public CellDeserializer getDeserializer(Class&lt;Cell&gt; t) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    return new CellDeserializer();<a name="line.46"></a>
-<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 CellSerializer getSerializer(Class&lt;Cell&gt; c) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    return new CellSerializer();<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>  public static class CellDeserializer implements Deserializer&lt;Cell&gt; {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    private DataInputStream dis;<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 void close() throws IOException {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      this.dis.close();<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>    @Override<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    public KeyValue deserialize(Cell ignore) throws IOException {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      // I can't overwrite the passed in KV, not from a proto kv, not just yet.  TODO<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      return KeyValueUtil.create(this.dis);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @Override<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    public void open(InputStream is) throws IOException {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      this.dis = new DataInputStream(is);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    }<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public static class CellSerializer implements Serializer&lt;Cell&gt; {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    private DataOutputStream dos;<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 void close() throws IOException {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      this.dos.close();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>    @Override<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    public void open(OutputStream os) throws IOException {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      this.dos = new DataOutputStream(os);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    public void serialize(Cell kv) throws IOException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      dos.writeInt(CellUtil.estimatedSerializedSizeOf(kv) - Bytes.SIZEOF_INT);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      CellUtil.writeCell(kv, dos, true);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>}<a name="line.93"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.io.serializer.Deserializer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.io.serializer.Serialization;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.io.serializer.Serializer;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>@InterfaceAudience.Public<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public class CellSerialization implements Serialization&lt;Cell&gt; {<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  @Override<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public boolean accept(Class&lt;?&gt; c) {<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    return Cell.class.isAssignableFrom(c);<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  }<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>  @Override<a name="line.43"></a>
+<span class="sourceLineNo">044</span>  public CellDeserializer getDeserializer(Class&lt;Cell&gt; t) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    return new CellDeserializer();<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  }<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  public CellSerializer getSerializer(Class&lt;Cell&gt; c) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    return new CellSerializer();<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public static class CellDeserializer implements Deserializer&lt;Cell&gt; {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    private DataInputStream dis;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>    @Override<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    public void close() throws IOException {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>      this.dis.close();<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 KeyValue deserialize(Cell ignore) throws IOException {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      // I can't overwrite the passed in KV, not from a proto kv, not just yet.  TODO<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      return KeyValueUtil.create(this.dis);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>    @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    public void open(InputStream is) throws IOException {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      this.dis = new DataInputStream(is);<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><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public static class CellSerializer implements Serializer&lt;Cell&gt; {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    private DataOutputStream dos;<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 void close() throws IOException {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      this.dos.close();<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 void open(OutputStream os) throws IOException {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      this.dos = new DataOutputStream(os);<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 void serialize(Cell kv) throws IOException {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      dos.writeInt(PrivateCellUtil.estimatedSerializedSizeOf(kv) - Bytes.SIZEOF_INT);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      PrivateCellUtil.writeCell(kv, dos, true);<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>}<a name="line.92"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5018ccb3/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSortReducer.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSortReducer.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSortReducer.html
index ff8fdd6..98374fa 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSortReducer.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellSortReducer.html
@@ -31,7 +31,7 @@
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Cell;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.CellComparatorImpl;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.26"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.util.MapReduceCell;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import org.apache.hadoop.mapreduce.Reducer;<a name="line.29"></a>
@@ -53,7 +53,7 @@
 <span class="sourceLineNo">045</span>    TreeSet&lt;Cell&gt; map = new TreeSet&lt;&gt;(CellComparatorImpl.COMPARATOR);<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    for (Cell kv : kvs) {<a name="line.46"></a>
 <span class="sourceLineNo">047</span>      try {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>        map.add(CellUtil.deepClone(kv));<a name="line.48"></a>
+<span class="sourceLineNo">048</span>        map.add(PrivateCellUtil.deepClone(kv));<a name="line.48"></a>
 <span class="sourceLineNo">049</span>      } catch (CloneNotSupportedException e) {<a name="line.49"></a>
 <span class="sourceLineNo">050</span>        throw new IOException(e);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>      }<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5018ccb3/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
index 8056b4e..bbadffb 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
@@ -59,8 +59,8 @@
 <span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.HConstants;<a name="line.51"></a>
 <span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.52"></a>
 <span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.55"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.55"></a>
 <span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.TableName;<a name="line.56"></a>
 <span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;<a name="line.57"></a>
 <span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.58"></a>
@@ -255,7 +255,7 @@
 <span class="sourceLineNo">247</span>        }<a name="line.247"></a>
 <span class="sourceLineNo">248</span><a name="line.248"></a>
 <span class="sourceLineNo">249</span>        byte[] rowKey = CellUtil.cloneRow(kv);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        int length = (CellUtil.estimatedSerializedSizeOf(kv)) - Bytes.SIZEOF_INT;<a name="line.250"></a>
+<span class="sourceLineNo">250</span>        int length = (PrivateCellUtil.estimatedSerializedSizeOf(kv)) - Bytes.SIZEOF_INT;<a name="line.250"></a>
 <span class="sourceLineNo">251</span>        byte[] family = CellUtil.cloneFamily(kv);<a name="line.251"></a>
 <span class="sourceLineNo">252</span>        byte[] tableNameBytes = null;<a name="line.252"></a>
 <span class="sourceLineNo">253</span>        if (writeMultipleTables) {<a name="line.253"></a>
@@ -345,7 +345,7 @@
 <span class="sourceLineNo">337</span><a name="line.337"></a>
 <span class="sourceLineNo">338</span>        // we now have the proper WAL writer. full steam ahead<a name="line.338"></a>
 <span class="sourceLineNo">339</span>        // TODO : Currently in SettableTimeStamp but this will also move to ExtendedCell<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        CellUtil.updateLatestStamp(cell, this.now);<a name="line.340"></a>
+<span class="sourceLineNo">340</span>        PrivateCellUtil.updateLatestStamp(cell, this.now);<a name="line.340"></a>
 <span class="sourceLineNo">341</span>        wl.writer.append(kv);<a name="line.341"></a>
 <span class="sourceLineNo">342</span>        wl.written += length;<a name="line.342"></a>
 <span class="sourceLineNo">343</span><a name="line.343"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5018ccb3/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
index 5a1f6a5..ab49b7b 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/Import.html
@@ -51,176 +51,176 @@
 <span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparatorImpl;<a name="line.43"></a>
 <span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.TableName;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.client.Mutation;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.client.Put;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.client.Result;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.client.Table;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.util.MapReduceCell;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.zookeeper.ZKClusterId;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.io.RawComparator;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.io.WritableComparable;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.io.WritableComparator;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.mapreduce.Job;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.mapreduce.Partitioner;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.mapreduce.Reducer;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.mapreduce.TaskCounter;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import org.apache.hadoop.util.Tool;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>import org.apache.hadoop.util.ToolRunner;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>import org.apache.zookeeper.KeeperException;<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.KeyValueUtil;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.TableName;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.client.Mutation;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.client.Put;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.client.RegionLocator;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.client.Result;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.client.Table;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.filter.Filter;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.io.ImmutableBytesWritable;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.util.MapReduceCell;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.zookeeper.ZKClusterId;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.io.RawComparator;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.io.WritableComparable;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.io.WritableComparator;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.mapreduce.Job;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.mapreduce.Partitioner;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.mapreduce.Reducer;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.mapreduce.TaskCounter;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.apache.hadoop.util.Tool;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import org.apache.hadoop.util.ToolRunner;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import org.apache.zookeeper.KeeperException;<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> * Import data written by {@link Export}.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span>@InterfaceAudience.Public<a name="line.86"></a>
-<span class="sourceLineNo">087</span>public class Import extends Configured implements Tool {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  private static final Log LOG = LogFactory.getLog(Import.class);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  final static String NAME = "import";<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  public final static String CF_RENAME_PROP = "HBASE_IMPORTER_RENAME_CFS";<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  public final static String BULK_OUTPUT_CONF_KEY = "import.bulk.output";<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public final static String FILTER_CLASS_CONF_KEY = "import.filter.class";<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public final static String FILTER_ARGS_CONF_KEY = "import.filter.args";<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public final static String TABLE_NAME = "import.table.name";<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public final static String WAL_DURABILITY = "import.wal.durability";<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public final static String HAS_LARGE_RESULT= "import.bulk.hasLargeResult";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  private final static String JOB_NAME_CONF_KEY = "mapreduce.job.name";<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  public static class CellWritableComparablePartitioner<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      extends Partitioner&lt;CellWritableComparable, Cell&gt; {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    private static CellWritableComparable[] START_KEYS = null;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    public int getPartition(CellWritableComparable key, Cell value,<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        int numPartitions) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      for (int i = 0; i &lt; START_KEYS.length; ++i) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        if (key.compareTo(START_KEYS[i]) &lt;= 0) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>          return i;<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        }<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      return START_KEYS.length;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><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>  public static class CellWritableComparable<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      implements WritableComparable&lt;CellWritableComparable&gt; {<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>    private Cell kv = null;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>    static {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      // register this comparator<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      WritableComparator.define(CellWritableComparable.class,<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          new CellWritableComparator());<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>    public CellWritableComparable() {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    public CellWritableComparable(Cell kv) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      this.kv = kv;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    @Override<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public void write(DataOutput out) throws IOException {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      out.writeInt(CellUtil.estimatedSerializedSizeOfKey(kv));<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      out.writeInt(0);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      CellUtil.writeFlatKey(kv, out);<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>    @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public void readFields(DataInput in) throws IOException {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      kv = KeyValue.create(in);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<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>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      justification="This is wrong, yes, but we should be purging Writables, not fixing them")<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    public int compareTo(CellWritableComparable o) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      return CellComparatorImpl.COMPARATOR.compare(this.kv, ((CellWritableComparable)o).kv);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public static class CellWritableComparator extends WritableComparator {<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>      @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        try {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          CellWritableComparable kv1 = new CellWritableComparable();<a name="line.158"></a>
-<span class="sourceLineNo">159</span>          kv1.readFields(new DataInputStream(new ByteArrayInputStream(b1, s1, l1)));<a name="line.159"></a>
-<span class="sourceLineNo">160</span>          CellWritableComparable kv2 = new CellWritableComparable();<a name="line.160"></a>
-<span class="sourceLineNo">161</span>          kv2.readFields(new DataInputStream(new ByteArrayInputStream(b2, s2, l2)));<a name="line.161"></a>
-<span class="sourceLineNo">162</span>          return compare(kv1, kv2);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        } catch (IOException e) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>          throw new RuntimeException(e);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>  public static class CellReducer<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      extends<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      Reducer&lt;CellWritableComparable, Cell, ImmutableBytesWritable, Cell&gt; {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    protected void reduce(<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        CellWritableComparable row,<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        Iterable&lt;Cell&gt; kvs,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        Reducer&lt;CellWritableComparable,<a name="line.178"></a>
-<span class="sourceLineNo">179</span>          Cell, ImmutableBytesWritable, Cell&gt;.Context context)<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        throws java.io.IOException, InterruptedException {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      int index = 0;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      for (Cell kv : kvs) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        context.write(new ImmutableBytesWritable(CellUtil.cloneRow(kv)),<a name="line.183"></a>
-<span class="sourceLineNo">184</span>          new MapReduceCell(kv));<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        if (++index % 100 == 0)<a name="line.185"></a>
-<span class="sourceLineNo">186</span>          context.setStatus("Wrote " + index + " KeyValues, "<a name="line.186"></a>
-<span class="sourceLineNo">187</span>              + "and the rowkey whose is being wrote is " + Bytes.toString(kv.getRowArray()));<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>  public static class CellSortImporter<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      extends TableMapper&lt;CellWritableComparable, Cell&gt; {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    private Filter filter;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    private static final Log LOG = LogFactory.getLog(CellImporter.class);<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>    /**<a name="line.198"></a>
-<span class="sourceLineNo">199</span>     * @param row  The current table row key.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>     * @param value  The columns.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>     * @param context  The current context.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>     * @throws IOException When something is broken with the data.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>     */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    @Override<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      Context context)<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    throws IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      try {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        if (LOG.isTraceEnabled()) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          LOG.trace("Considering the row."<a name="line.210"></a>
-<span class="sourceLineNo">211</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        }<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        if (filter == null<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            || !filter.filterRowKey(CellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.214"></a>
-<span class="sourceLineNo">215</span>                (short) row.getLength()))) {<a name="line.215"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>/**<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * Import data written by {@link Export}.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>@InterfaceAudience.Public<a name="line.87"></a>
+<span class="sourceLineNo">088</span>public class Import extends Configured implements Tool {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  private static final Log LOG = LogFactory.getLog(Import.class);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  final static String NAME = "import";<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public final static String CF_RENAME_PROP = "HBASE_IMPORTER_RENAME_CFS";<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  public final static String BULK_OUTPUT_CONF_KEY = "import.bulk.output";<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  public final static String FILTER_CLASS_CONF_KEY = "import.filter.class";<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public final static String FILTER_ARGS_CONF_KEY = "import.filter.args";<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public final static String TABLE_NAME = "import.table.name";<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public final static String WAL_DURABILITY = "import.wal.durability";<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  public final static String HAS_LARGE_RESULT= "import.bulk.hasLargeResult";<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  private final static String JOB_NAME_CONF_KEY = "mapreduce.job.name";<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  public static class CellWritableComparablePartitioner<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      extends Partitioner&lt;CellWritableComparable, Cell&gt; {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    private static CellWritableComparable[] START_KEYS = null;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    @Override<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    public int getPartition(CellWritableComparable key, Cell value,<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        int numPartitions) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      for (int i = 0; i &lt; START_KEYS.length; ++i) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        if (key.compareTo(START_KEYS[i]) &lt;= 0) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>          return i;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        }<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      return START_KEYS.length;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    }<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>  public static class CellWritableComparable<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      implements WritableComparable&lt;CellWritableComparable&gt; {<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>    private Cell kv = null;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    static {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      // register this comparator<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      WritableComparator.define(CellWritableComparable.class,<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          new CellWritableComparator());<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>    public CellWritableComparable() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    public CellWritableComparable(Cell kv) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      this.kv = kv;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>    @Override<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    public void write(DataOutput out) throws IOException {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      out.writeInt(PrivateCellUtil.estimatedSerializedSizeOfKey(kv));<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      out.writeInt(0);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      PrivateCellUtil.writeFlatKey(kv, out);<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>    @Override<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    public void readFields(DataInput in) throws IOException {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      kv = KeyValue.create(in);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>    @Override<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS",<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      justification="This is wrong, yes, but we should be purging Writables, not fixing them")<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public int compareTo(CellWritableComparable o) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return CellComparatorImpl.COMPARATOR.compare(this.kv, ((CellWritableComparable)o).kv);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>    public static class CellWritableComparator extends WritableComparator {<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>      @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        try {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>          CellWritableComparable kv1 = new CellWritableComparable();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>          kv1.readFields(new DataInputStream(new ByteArrayInputStream(b1, s1, l1)));<a name="line.160"></a>
+<span class="sourceLineNo">161</span>          CellWritableComparable kv2 = new CellWritableComparable();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>          kv2.readFields(new DataInputStream(new ByteArrayInputStream(b2, s2, l2)));<a name="line.162"></a>
+<span class="sourceLineNo">163</span>          return compare(kv1, kv2);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        } catch (IOException e) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>          throw new RuntimeException(e);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public static class CellReducer<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      extends<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      Reducer&lt;CellWritableComparable, Cell, ImmutableBytesWritable, Cell&gt; {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    protected void reduce(<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        CellWritableComparable row,<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        Iterable&lt;Cell&gt; kvs,<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        Reducer&lt;CellWritableComparable,<a name="line.179"></a>
+<span class="sourceLineNo">180</span>          Cell, ImmutableBytesWritable, Cell&gt;.Context context)<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        throws java.io.IOException, InterruptedException {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      int index = 0;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      for (Cell kv : kvs) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        context.write(new ImmutableBytesWritable(CellUtil.cloneRow(kv)),<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          new MapReduceCell(kv));<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        if (++index % 100 == 0)<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          context.setStatus("Wrote " + index + " KeyValues, "<a name="line.187"></a>
+<span class="sourceLineNo">188</span>              + "and the rowkey whose is being wrote is " + Bytes.toString(kv.getRowArray()));<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<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">193</span>  public static class CellSortImporter<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      extends TableMapper&lt;CellWritableComparable, Cell&gt; {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    private Map&lt;byte[], byte[]&gt; cfRenameMap;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    private Filter filter;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    private static final Log LOG = LogFactory.getLog(CellImporter.class);<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>    /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span>     * @param row  The current table row key.<a name="line.200"></a>
+<span class="sourceLineNo">201</span>     * @param value  The columns.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>     * @param context  The current context.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>     * @throws IOException When something is broken with the data.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>     */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    @Override<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    public void map(ImmutableBytesWritable row, Result value,<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      Context context)<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    throws IOException {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      try {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        if (LOG.isTraceEnabled()) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>          LOG.trace("Considering the row."<a name="line.211"></a>
+<span class="sourceLineNo">212</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        }<a name="line.213"></a>
+<span class="sourceLineNo">214</span>        if (filter == null || !filter.filterRowKey(<a name="line.214"></a>
+<span class="sourceLineNo">215</span>          PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(), (short) row.getLength()))) {<a name="line.215"></a>
 <span class="sourceLineNo">216</span>          for (Cell kv : value.rawCells()) {<a name="line.216"></a>
 <span class="sourceLineNo">217</span>            kv = filterKv(filter, kv);<a name="line.217"></a>
 <span class="sourceLineNo">218</span>            // skip if we filtered it out<a name="line.218"></a>
@@ -284,7 +284,7 @@
 <span class="sourceLineNo">276</span>              + Bytes.toString(row.get(), row.getOffset(), row.getLength()));<a name="line.276"></a>
 <span class="sourceLineNo">277</span>        }<a name="line.277"></a>
 <span class="sourceLineNo">278</span>        if (filter == null<a name="line.278"></a>
-<span class="sourceLineNo">279</span>            || !filter.filterRowKey(CellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
+<span class="sourceLineNo">279</span>            || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(row.get(), row.getOffset(),<a name="line.279"></a>
 <span class="sourceLineNo">280</span>                (short) row.getLength()))) {<a name="line.280"></a>
 <span class="sourceLineNo">281</span>          for (Cell kv : value.rawCells()) {<a name="line.281"></a>
 <span class="sourceLineNo">282</span>            kv = filterKv(filter, kv);<a name="line.282"></a>
@@ -340,7 +340,7 @@
 <span class="sourceLineNo">332</span>            + Bytes.toString(key.get(), key.getOffset(), key.getLength()));<a name="line.332"></a>
 <span class="sourceLineNo">333</span>      }<a name="line.333"></a>
 <span class="sourceLineNo">334</span>      if (filter == null<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          || !filter.filterRowKey(CellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
+<span class="sourceLineNo">335</span>          || !filter.filterRowKey(PrivateCellUtil.createFirstOnRow(key.get(), key.getOffset(),<a name="line.335"></a>
 <span class="sourceLineNo">336</span>              (short) key.getLength()))) {<a name="line.336"></a>
 <span class="sourceLineNo">337</span>        processKV(key, result, context, put, delete);<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      }<a name="line.338"></a>
@@ -362,7 +362,7 @@
 <span class="sourceLineNo">354</span>         * submit multiple DeleteFamily tombstones in single Delete request then we are maintaining<a name="line.354"></a>
 <span class="sourceLineNo">355</span>         * only newest in hbase table and ignoring other. Check - HBASE-12065<a name="line.355"></a>
 <span class="sourceLineNo">356</span>         */<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (CellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
+<span class="sourceLineNo">357</span>        if (PrivateCellUtil.isDeleteFamily(kv)) {<a name="line.357"></a>
 <span class="sourceLineNo">358</span>          Delete deleteFamily = new Delete(key.get());<a name="line.358"></a>
 <span class="sourceLineNo">359</span>          deleteFamily.add(kv);<a name="line.359"></a>
 <span class="sourceLineNo">360</span>          if (durability != null) {<a name="line.360"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5018ccb3/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
index 0a89947..4c517dd 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
@@ -174,7 +174,7 @@
 <span class="sourceLineNo">166</span>              // Aggregate as much as possible into a single Put/Delete<a name="line.166"></a>
 <span class="sourceLineNo">167</span>              // operation before writing to the context.<a name="line.167"></a>
 <span class="sourceLineNo">168</span>              if (lastCell == null || lastCell.getTypeByte() != cell.getTypeByte()<a name="line.168"></a>
-<span class="sourceLineNo">169</span>                  || !CellUtil.matchingRow(lastCell, cell)) {<a name="line.169"></a>
+<span class="sourceLineNo">169</span>                  || !CellUtil.matchingRows(lastCell, cell)) {<a name="line.169"></a>
 <span class="sourceLineNo">170</span>                // row or type changed, write out aggregate KVs.<a name="line.170"></a>
 <span class="sourceLineNo">171</span>                if (put != null) {<a name="line.171"></a>
 <span class="sourceLineNo">172</span>                  context.write(tableOut, put);<a name="line.172"></a>


Mime
View raw message