http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
index b57acc2..ebf8956 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -47,197 +47,200 @@
 <span class="sourceLineNo">039</span>import org.apache.hadoop.io.Text;<a 
name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.mapreduce.Counter;<a name="line.40"></a>
 <span class="sourceLineNo">041</span>import 
org.apache.hadoop.mapreduce.Mapper;<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> * Write table content out to files in 
hdfs.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@InterfaceAudience.Public<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>public class TsvImporterMapper<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>extends Mapper&lt;LongWritable, Text, 
ImmutableBytesWritable, Put&gt;<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>  /** Timestamp for all inserted rows 
*/<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  protected long ts;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  /** Column seperator */<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  private String separator;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  /** Should skip bad lines */<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>  private boolean skipBadLines;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>  /** Should skip empty columns*/<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  private boolean skipEmptyColumns;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>  private Counter badLineCount;<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>  private boolean logBadLines;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  protected ImportTsv.TsvParser parser;<a 
name="line.64"></a>
+<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>/**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Write table content out to files in 
hdfs.<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@InterfaceAudience.Public<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>public class TsvImporterMapper<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>    extends Mapper&lt;LongWritable, Text, 
ImmutableBytesWritable, Put&gt; {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TsvImporterMapper.class);<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /** Timestamp for all inserted rows 
*/<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  protected long ts;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  /** Column seperator */<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>  private String separator;<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  /** Should skip bad lines */<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>  private boolean skipBadLines;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>  /** Should skip empty columns*/<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>  private boolean skipEmptyColumns;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>  private Counter badLineCount;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>  private boolean logBadLines;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  protected Configuration conf;<a 
name="line.66"></a>
+<span class="sourceLineNo">066</span>  protected ImportTsv.TsvParser parser;<a 
name="line.66"></a>
 <span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  protected String cellVisibilityExpr;<a 
name="line.68"></a>
+<span class="sourceLineNo">068</span>  protected Configuration conf;<a 
name="line.68"></a>
 <span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  protected long ttl;<a 
name="line.70"></a>
+<span class="sourceLineNo">070</span>  protected String cellVisibilityExpr;<a 
name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  protected CellCreator kvCreator;<a 
name="line.72"></a>
+<span class="sourceLineNo">072</span>  protected long ttl;<a 
name="line.72"></a>
 <span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  private String hfileOutPath;<a 
name="line.74"></a>
+<span class="sourceLineNo">074</span>  protected CellCreator kvCreator;<a 
name="line.74"></a>
 <span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  /** List of cell tags */<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>  private List&lt;Tag&gt; tags;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public long getTs() {<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>    return ts;<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">083</span>  public boolean getSkipBadLines() {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>    return skipBadLines;<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>  public Counter getBadLineCount() {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    return badLineCount;<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>  public void incrementBadLineCount(int 
count) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    this.badLineCount.increment(count);<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * Handles initializing this class with 
objects specific to it (i.e., the parser).<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * Common initialization that might be 
leveraged by a subsclass is done in<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * &lt;code&gt;doSetup&lt;/code&gt;. 
Hence a subclass may choose to override this method<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * and call 
&lt;code&gt;doSetup&lt;/code&gt; as well before handling it's own custom 
params.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   *<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @param context<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   */<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  protected void setup(Context context) 
{<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    doSetup(context);<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>    conf = context.getConfiguration();<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    parser = new 
ImportTsv.TsvParser(conf.get(ImportTsv.COLUMNS_CONF_KEY),<a name="line.108"></a>
-<span class="sourceLineNo">109</span>                           separator);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    if (parser.getRowKeyColumnIndex() == 
-1) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      throw new RuntimeException("No row 
key column specified");<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    this.kvCreator = new 
CellCreator(conf);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    tags = new ArrayList&lt;&gt;();<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>  /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * Handles common parameter 
initialization that a subclass might want to leverage.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * @param context<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  protected void doSetup(Context context) 
{<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    Configuration conf = 
context.getConfiguration();<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>    // If a custom separator has been 
used,<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    // decode it back from Base64 
encoding.<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    separator = 
conf.get(ImportTsv.SEPARATOR_CONF_KEY);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    if (separator == null) {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>      separator = 
ImportTsv.DEFAULT_SEPARATOR;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    } else {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      separator = new 
String(Base64.getDecoder().decode(separator));<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    // Should never get 0 as we are 
setting this to a valid value in job<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    // configuration.<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    ts = 
conf.getLong(ImportTsv.TIMESTAMP_CONF_KEY, 0);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>    skipEmptyColumns = 
context.getConfiguration().getBoolean(<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        ImportTsv.SKIP_EMPTY_COLUMNS, 
false);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    skipBadLines = 
context.getConfiguration().getBoolean(<a name="line.138"></a>
-<span class="sourceLineNo">139</span>        ImportTsv.SKIP_LINES_CONF_KEY, 
true);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    badLineCount = 
context.getCounter("ImportTsv", "Bad Lines");<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    logBadLines = 
context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, 
false);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    hfileOutPath = 
conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  }<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>   * Convert a line of TSV text into an 
HBase table row.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public void map(LongWritable offset, 
Text value,<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    Context context)<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>  throws IOException {<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>    byte[] lineBytes = 
value.getBytes();<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>    try {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      ImportTsv.TsvParser.ParsedLine 
parsed = parser.parse(<a name="line.155"></a>
-<span class="sourceLineNo">156</span>          lineBytes, 
value.getLength());<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      ImmutableBytesWritable rowKey =<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>        new 
ImmutableBytesWritable(lineBytes,<a name="line.158"></a>
-<span class="sourceLineNo">159</span>            parsed.getRowKeyOffset(),<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>            parsed.getRowKeyLength());<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      // Retrieve timestamp if exists<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      ts = parsed.getTimestamp(ts);<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>      cellVisibilityExpr = 
parsed.getCellVisibility();<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      ttl = parsed.getCellTTL();<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>      // create tags for the parsed 
line<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      if (hfileOutPath != null) {<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>        tags.clear();<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>        if (cellVisibilityExpr != null) 
{<a name="line.169"></a>
-<span class="sourceLineNo">170</span>          
tags.addAll(kvCreator.getVisibilityExpressionResolver().createVisibilityExpTags(<a
 name="line.170"></a>
-<span class="sourceLineNo">171</span>            cellVisibilityExpr));<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>        }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        // Add TTL directly to the KV so 
we can vary them when packing more than one KV<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        // into puts<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        if (ttl &gt; 0) {<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>          tags.add(new 
ArrayBackedTag(TagType.TTL_TAG_TYPE, Bytes.toBytes(ttl)));<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>        }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      Put put = new 
Put(rowKey.copyBytes());<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      for (int i = 0; i &lt; 
parsed.getColumnCount(); i++) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        if (i == 
parser.getRowKeyColumnIndex() || i == parser.getTimestampKeyColumnIndex()<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>            || i == 
parser.getAttributesKeyColumnIndex() || i == 
parser.getCellVisibilityColumnIndex()<a name="line.182"></a>
-<span class="sourceLineNo">183</span>            || i == 
parser.getCellTTLColumnIndex() || (skipEmptyColumns<a name="line.183"></a>
-<span class="sourceLineNo">184</span>            &amp;&amp; 
parsed.getColumnLength(i) == 0)) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          continue;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        }<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        populatePut(lineBytes, parsed, 
put, i);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      context.write(rowKey, put);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    } catch 
(ImportTsv.TsvParser.BadTsvLineException | IllegalArgumentException<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>        | InvalidLabelException badLine) 
{<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      if (logBadLines) {<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>        System.err.println(value);<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      System.err.println("Bad line at 
offset: " + offset.get() + ":\n" + badLine.getMessage());<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      if (skipBadLines) {<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>        incrementBadLineCount(1);<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>        return;<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      throw new IOException(badLine);<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    } catch (InterruptedException e) {<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>      e.printStackTrace();<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  protected void populatePut(byte[] 
lineBytes, ImportTsv.TsvParser.ParsedLine parsed, Put put,<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>      int i) throws BadTsvLineException, 
IOException {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    Cell cell = null;<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    if (hfileOutPath == null) {<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>      cell = new KeyValue(lineBytes, 
parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.210"></a>
-<span class="sourceLineNo">211</span>          parser.getFamily(i), 0, 
parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          parser.getQualifier(i).length, 
ts, KeyValue.Type.Put, lineBytes,<a name="line.212"></a>
-<span class="sourceLineNo">213</span>          parsed.getColumnOffset(i), 
parsed.getColumnLength(i));<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      if (cellVisibilityExpr != null) {<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        // We won't be validating the 
expression here. The Visibility CP will do<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        // the validation<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>        put.setCellVisibility(new 
CellVisibility(cellVisibilityExpr));<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      if (ttl &gt; 0) {<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>        put.setTTL(ttl);<a 
name="line.220"></a>
+<span class="sourceLineNo">076</span>  private String hfileOutPath;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>  /** List of cell tags */<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>  private List&lt;Tag&gt; tags;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public long getTs() {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    return ts;<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>
+<span class="sourceLineNo">085</span>  public boolean getSkipBadLines() {<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>    return skipBadLines;<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  public Counter getBadLineCount() {<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>    return badLineCount;<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>  public void incrementBadLineCount(int 
count) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    this.badLineCount.increment(count);<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   * Handles initializing this class with 
objects specific to it (i.e., the parser).<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   * Common initialization that might be 
leveraged by a subsclass is done in<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * &lt;code&gt;doSetup&lt;/code&gt;. 
Hence a subclass may choose to override this method<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * and call 
&lt;code&gt;doSetup&lt;/code&gt; as well before handling it's own custom 
params.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   *<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * @param context<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>  protected void setup(Context context) 
{<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    doSetup(context);<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>    conf = context.getConfiguration();<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    parser = new 
ImportTsv.TsvParser(conf.get(ImportTsv.COLUMNS_CONF_KEY),<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                           separator);<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (parser.getRowKeyColumnIndex() == 
-1) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      throw new RuntimeException("No row 
key column specified");<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    this.kvCreator = new 
CellCreator(conf);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    tags = new ArrayList&lt;&gt;();<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * Handles common parameter 
initialization that a subclass might want to leverage.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   * @param context<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   */<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  protected void doSetup(Context context) 
{<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    Configuration conf = 
context.getConfiguration();<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    // If a custom separator has been 
used,<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    // decode it back from Base64 
encoding.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    separator = 
conf.get(ImportTsv.SEPARATOR_CONF_KEY);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    if (separator == null) {<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>      separator = 
ImportTsv.DEFAULT_SEPARATOR;<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    } else {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      separator = new 
String(Base64.getDecoder().decode(separator));<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    // Should never get 0 as we are 
setting this to a valid value in job<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    // configuration.<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    ts = 
conf.getLong(ImportTsv.TIMESTAMP_CONF_KEY, 0);<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>    skipEmptyColumns = 
context.getConfiguration().getBoolean(<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        ImportTsv.SKIP_EMPTY_COLUMNS, 
false);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    skipBadLines = 
context.getConfiguration().getBoolean(<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        ImportTsv.SKIP_LINES_CONF_KEY, 
true);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    badLineCount = 
context.getCounter("ImportTsv", "Bad Lines");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    logBadLines = 
context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, 
false);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    hfileOutPath = 
conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY);<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>  /**<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * Convert a line of TSV text into an 
HBase table row.<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   */<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  public void map(LongWritable offset, 
Text value,<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    Context context)<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>  throws IOException {<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    byte[] lineBytes = 
value.getBytes();<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>    try {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      ImportTsv.TsvParser.ParsedLine 
parsed = parser.parse(<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          lineBytes, 
value.getLength());<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      ImmutableBytesWritable rowKey =<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>        new 
ImmutableBytesWritable(lineBytes,<a name="line.160"></a>
+<span class="sourceLineNo">161</span>            parsed.getRowKeyOffset(),<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>            parsed.getRowKeyLength());<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      // Retrieve timestamp if exists<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      ts = parsed.getTimestamp(ts);<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>      cellVisibilityExpr = 
parsed.getCellVisibility();<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      ttl = parsed.getCellTTL();<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>      // create tags for the parsed 
line<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      if (hfileOutPath != null) {<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        tags.clear();<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>        if (cellVisibilityExpr != null) 
{<a name="line.171"></a>
+<span class="sourceLineNo">172</span>          
tags.addAll(kvCreator.getVisibilityExpressionResolver().createVisibilityExpTags(<a
 name="line.172"></a>
+<span class="sourceLineNo">173</span>            cellVisibilityExpr));<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>        }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        // Add TTL directly to the KV so 
we can vary them when packing more than one KV<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        // into puts<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>        if (ttl &gt; 0) {<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>          tags.add(new 
ArrayBackedTag(TagType.TTL_TAG_TYPE, Bytes.toBytes(ttl)));<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>        }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      Put put = new 
Put(rowKey.copyBytes());<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      for (int i = 0; i &lt; 
parsed.getColumnCount(); i++) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        if (i == 
parser.getRowKeyColumnIndex() || i == parser.getTimestampKeyColumnIndex()<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>            || i == 
parser.getAttributesKeyColumnIndex() || i == 
parser.getCellVisibilityColumnIndex()<a name="line.184"></a>
+<span class="sourceLineNo">185</span>            || i == 
parser.getCellTTLColumnIndex() || (skipEmptyColumns<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            &amp;&amp; 
parsed.getColumnLength(i) == 0)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          continue;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        populatePut(lineBytes, parsed, 
put, i);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      context.write(rowKey, put);<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>    } catch 
(ImportTsv.TsvParser.BadTsvLineException | IllegalArgumentException<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>        | InvalidLabelException badLine) 
{<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      if (logBadLines) {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>        System.err.println(value);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      System.err.println("Bad line at 
offset: " + offset.get() + ":\n" + badLine.getMessage());<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      if (skipBadLines) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>        incrementBadLineCount(1);<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>        return;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      throw new IOException(badLine);<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>    } catch (InterruptedException e) {<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>      LOG.error("Interrupted while 
emitting put", e);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      
Thread.currentThread().interrupt();<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>  protected void populatePut(byte[] 
lineBytes, ImportTsv.TsvParser.ParsedLine parsed, Put put,<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>      int i) throws BadTsvLineException, 
IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    Cell cell = null;<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    if (hfileOutPath == null) {<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>      cell = new KeyValue(lineBytes, 
parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.213"></a>
+<span class="sourceLineNo">214</span>          parser.getFamily(i), 0, 
parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.214"></a>
+<span class="sourceLineNo">215</span>          parser.getQualifier(i).length, 
ts, KeyValue.Type.Put, lineBytes,<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          parsed.getColumnOffset(i), 
parsed.getColumnLength(i));<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      if (cellVisibilityExpr != null) {<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>        // We won't be validating the 
expression here. The Visibility CP will do<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        // the validation<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>        put.setCellVisibility(new 
CellVisibility(cellVisibilityExpr));<a name="line.220"></a>
 <span class="sourceLineNo">221</span>      }<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    } else {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      // Creating the KV which needs to 
be directly written to HFiles. Using the Facade<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      // KVCreator for creation of kvs.<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>      cell = 
this.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), 
parsed.getRowKeyLength(),<a name="line.225"></a>
-<span class="sourceLineNo">226</span>          parser.getFamily(i), 0, 
parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.226"></a>
-<span class="sourceLineNo">227</span>          parser.getQualifier(i).length, 
ts, lineBytes, parsed.getColumnOffset(i),<a name="line.227"></a>
-<span class="sourceLineNo">228</span>          parsed.getColumnLength(i), 
tags);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    put.add(cell);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
-<span class="sourceLineNo">232</span>}<a name="line.232"></a>
+<span class="sourceLineNo">222</span>      if (ttl &gt; 0) {<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>        put.setTTL(ttl);<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>      }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    } else {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      // Creating the KV which needs to 
be directly written to HFiles. Using the Facade<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      // KVCreator for creation of kvs.<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>      cell = 
this.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), 
parsed.getRowKeyLength(),<a name="line.228"></a>
+<span class="sourceLineNo">229</span>          parser.getFamily(i), 0, 
parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.229"></a>
+<span class="sourceLineNo">230</span>          parser.getQualifier(i).length, 
ts, lineBytes, parsed.getColumnOffset(i),<a name="line.230"></a>
+<span class="sourceLineNo">231</span>          parsed.getColumnLength(i), 
tags);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    put.add(cell);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>}<a name="line.235"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
index 8359449..24080ca 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.html
@@ -36,104 +36,106 @@
 <span class="sourceLineNo">028</span>import 
org.apache.hadoop.mapreduce.Counter;<a name="line.28"></a>
 <span class="sourceLineNo">029</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Write table content out to map output 
files.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>@InterfaceAudience.Public<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>public class TsvImporterTextMapper<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>extends Mapper&lt;LongWritable, Text, 
ImmutableBytesWritable, Text&gt;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>{<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>  /** Column seperator */<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>  private String separator;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  /** Should skip bad lines */<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>  private boolean skipBadLines;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>  private Counter badLineCount;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>  private boolean logBadLines;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  private ImportTsv.TsvParser parser;<a 
name="line.48"></a>
+<span class="sourceLineNo">031</span>import org.slf4j.Logger;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.slf4j.LoggerFactory;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Write table content out to map output 
files.<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 TsvImporterTextMapper<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>    extends Mapper&lt;LongWritable, Text, 
ImmutableBytesWritable, Text&gt; {<a name="line.39"></a>
+<span class="sourceLineNo">040</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TsvImporterTextMapper.class);<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  /** Column seperator */<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>  private String separator;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>  /** Should skip bad lines */<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>  private boolean skipBadLines;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>  private Counter badLineCount;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>  private boolean logBadLines;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  public boolean getSkipBadLines() {<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>    return skipBadLines;<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 Counter getBadLineCount() {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>    return badLineCount;<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>  public void incrementBadLineCount(int 
count) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    this.badLineCount.increment(count);<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>   * Handles initializing this class with 
objects specific to it (i.e., the parser).<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * Common initialization that might be 
leveraged by a subclass is done in<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * &lt;code&gt;doSetup&lt;/code&gt;. 
Hence a subclass may choose to override this method<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   * and call 
&lt;code&gt;doSetup&lt;/code&gt; as well before handling it's own custom 
params.<a name="line.66"></a>
-<span class="sourceLineNo">067</span>   *<a name="line.67"></a>
-<span class="sourceLineNo">068</span>   * @param context<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  protected void setup(Context context) 
{<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    doSetup(context);<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>    Configuration conf = 
context.getConfiguration();<a name="line.74"></a>
+<span class="sourceLineNo">050</span>  private ImportTsv.TsvParser parser;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>  public boolean getSkipBadLines() {<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>    return skipBadLines;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public Counter getBadLineCount() {<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    return badLineCount;<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>  public void incrementBadLineCount(int 
count) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    this.badLineCount.increment(count);<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>   * Handles initializing this class with 
objects specific to it (i.e., the parser).<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * Common initialization that might be 
leveraged by a subclass is done in<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * &lt;code&gt;doSetup&lt;/code&gt;. 
Hence a subclass may choose to override this method<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * and call 
&lt;code&gt;doSetup&lt;/code&gt; as well before handling it's own custom 
params.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   *<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   * @param context<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>  protected void setup(Context context) 
{<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    doSetup(context);<a 
name="line.74"></a>
 <span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>    parser = new 
ImportTsv.TsvParser(conf.get(ImportTsv.COLUMNS_CONF_KEY), separator);<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    if (parser.getRowKeyColumnIndex() == 
-1) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      throw new RuntimeException("No row 
key column specified");<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><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * Handles common parameter 
initialization that a subclass might want to leverage.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   * @param context<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   */<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  protected void doSetup(Context context) 
{<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    Configuration conf = 
context.getConfiguration();<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>    // If a custom separator has been 
used,<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    // decode it back from Base64 
encoding.<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    separator = 
conf.get(ImportTsv.SEPARATOR_CONF_KEY);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    if (separator == null) {<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>      separator = 
ImportTsv.DEFAULT_SEPARATOR;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    } else {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      separator = new 
String(Base64.getDecoder().decode(separator));<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>    skipBadLines = 
context.getConfiguration().getBoolean(ImportTsv.SKIP_LINES_CONF_KEY, true);<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    logBadLines = 
context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, 
false);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    badLineCount = 
context.getCounter("ImportTsv", "Bad Lines");<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  /**<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * Convert a line of TSV text into an 
HBase table row.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @Override<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public void map(LongWritable offset, 
Text value, Context context) throws IOException {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    try {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      Pair&lt;Integer,Integer&gt; 
rowKeyOffests = parser.parseRowKey(value.getBytes(), value.getLength());<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      ImmutableBytesWritable rowKey = new 
ImmutableBytesWritable(<a name="line.110"></a>
-<span class="sourceLineNo">111</span>          value.getBytes(), 
rowKeyOffests.getFirst(), rowKeyOffests.getSecond());<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      context.write(rowKey, value);<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    } catch 
(ImportTsv.TsvParser.BadTsvLineException|IllegalArgumentException badLine) {<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      if (logBadLines) {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>        System.err.println(value);<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      System.err.println("Bad line at 
offset: " + offset.get() + ":\n" + badLine.getMessage());<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      if (skipBadLines) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        incrementBadLineCount(1);<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        return;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      throw new IOException(badLine);<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    } catch (InterruptedException e) {<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>      e.printStackTrace();<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>      
Thread.currentThread().interrupt();<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>}<a name="line.128"></a>
+<span class="sourceLineNo">076</span>    Configuration conf = 
context.getConfiguration();<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>    parser = new 
ImportTsv.TsvParser(conf.get(ImportTsv.COLUMNS_CONF_KEY), separator);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    if (parser.getRowKeyColumnIndex() == 
-1) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      throw new RuntimeException("No row 
key column specified");<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">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * Handles common parameter 
initialization that a subclass might want to leverage.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * @param context<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  protected void doSetup(Context context) 
{<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    Configuration conf = 
context.getConfiguration();<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>    // If a custom separator has been 
used,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    // decode it back from Base64 
encoding.<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    separator = 
conf.get(ImportTsv.SEPARATOR_CONF_KEY);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    if (separator == null) {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      separator = 
ImportTsv.DEFAULT_SEPARATOR;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    } else {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      separator = new 
String(Base64.getDecoder().decode(separator));<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>    skipBadLines = 
context.getConfiguration().getBoolean(ImportTsv.SKIP_LINES_CONF_KEY, true);<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    logBadLines = 
context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, 
false);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    badLineCount = 
context.getCounter("ImportTsv", "Bad Lines");<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * Convert a line of TSV text into an 
HBase table row.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public void map(LongWritable offset, 
Text value, Context context) throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    try {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      Pair&lt;Integer,Integer&gt; 
rowKeyOffests = parser.parseRowKey(value.getBytes(), value.getLength());<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      ImmutableBytesWritable rowKey = new 
ImmutableBytesWritable(<a name="line.112"></a>
+<span class="sourceLineNo">113</span>          value.getBytes(), 
rowKeyOffests.getFirst(), rowKeyOffests.getSecond());<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      context.write(rowKey, value);<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    } catch 
(ImportTsv.TsvParser.BadTsvLineException|IllegalArgumentException badLine) {<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>      if (logBadLines) {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>        System.err.println(value);<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      System.err.println("Bad line at 
offset: " + offset.get() + ":\n" + badLine.getMessage());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      if (skipBadLines) {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>        incrementBadLineCount(1);<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>        return;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      throw new IOException(badLine);<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    } catch (InterruptedException e) {<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      LOG.error("Interrupted while 
emitting TSV text", e);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      
Thread.currentThread().interrupt();<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>}<a name="line.130"></a>
 
 
 

Reply via email to