You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/06 02:34:12 UTC
[01/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site 1b9384b25 -> 9bc06f81c
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index da719ec..35524b6 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -69,15 +69,15 @@
<a class="jxr_linenumber" name="59" href="#59">59</a> requiredArguments = {
<a class="jxr_linenumber" name="60" href="#60">60</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"master"</span>, type = <span class="jxr_string">"HMaster"</span>)},
<a class="jxr_linenumber" name="61" href="#61">61</a> optionalArguments = {
-<a class="jxr_linenumber" name="62" href="#62">62</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"metaLocation"</span>, type = <span class="jxr_string">"ServerName"</span>),
-<a class="jxr_linenumber" name="63" href="#63">63</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"assignmentManager"</span>, type = <span class="jxr_string">"AssignmentManager"</span>),
+<a class="jxr_linenumber" name="62" href="#62">62</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="63" href="#63">63</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"serverManager"</span>, type = <span class="jxr_string">"ServerManager"</span>),
<a class="jxr_linenumber" name="64" href="#64">64</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"frags"</span>, type = <span class="jxr_string">"Map<String,Integer>"</span>),
-<a class="jxr_linenumber" name="65" href="#65">65</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="65" href="#65">65</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"deadServers"</span>, type = <span class="jxr_string">"Set<ServerName>"</span>),
<a class="jxr_linenumber" name="66" href="#66">66</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"catalogJanitorEnabled"</span>, type = <span class="jxr_string">"boolean"</span>),
-<a class="jxr_linenumber" name="67" href="#67">67</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"servers"</span>, type = <span class="jxr_string">"List<ServerName>"</span>),
-<a class="jxr_linenumber" name="68" href="#68">68</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="69" href="#69">69</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"deadServers"</span>, type = <span class="jxr_string">"Set<ServerName>"</span>),
-<a class="jxr_linenumber" name="70" href="#70">70</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"serverManager"</span>, type = <span class="jxr_string">"ServerManager"</span>)})
+<a class="jxr_linenumber" name="67" href="#67">67</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"metaLocation"</span>, type = <span class="jxr_string">"ServerName"</span>),
+<a class="jxr_linenumber" name="68" href="#68">68</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"assignmentManager"</span>, type = <span class="jxr_string">"AssignmentManager"</span>),
+<a class="jxr_linenumber" name="69" href="#69">69</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="70" href="#70">70</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"servers"</span>, type = <span class="jxr_string">"List<ServerName>"</span>)})
<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html">MasterStatusTmpl</a>
<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
<a class="jxr_linenumber" name="73" href="#73">73</a> {
@@ -118,40 +118,40 @@
<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">return</strong> m_master;
<a class="jxr_linenumber" name="109" href="#109">109</a> }
<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html">HMaster</a> m_master;
-<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation)
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
<a class="jxr_linenumber" name="113" href="#113">113</a> {
-<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> m_metaLocation = metaLocation;
-<a class="jxr_linenumber" name="116" href="#116">116</a> m_metaLocation__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> m_format = format;
+<a class="jxr_linenumber" name="116" href="#116">116</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="117" href="#117">117</a> }
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> getMetaLocation()
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> String getFormat()
<a class="jxr_linenumber" name="119" href="#119">119</a> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_metaLocation;
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_format;
<a class="jxr_linenumber" name="121" href="#121">121</a> }
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> m_metaLocation;
-<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getMetaLocation__IsNotDefault()
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
<a class="jxr_linenumber" name="124" href="#124">124</a> {
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">return</strong> m_metaLocation__IsNotDefault;
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
<a class="jxr_linenumber" name="126" href="#126">126</a> }
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_metaLocation__IsNotDefault;
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager)
+<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager)
<a class="jxr_linenumber" name="130" href="#130">130</a> {
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a> m_assignmentManager = assignmentManager;
-<a class="jxr_linenumber" name="133" href="#133">133</a> m_assignmentManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a> m_serverManager = serverManager;
+<a class="jxr_linenumber" name="133" href="#133">133</a> m_serverManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="134" href="#134">134</a> }
-<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> getAssignmentManager()
+<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> getServerManager()
<a class="jxr_linenumber" name="136" href="#136">136</a> {
-<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_assignmentManager;
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_serverManager;
<a class="jxr_linenumber" name="138" href="#138">138</a> }
-<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> m_assignmentManager;
-<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getAssignmentManager__IsNotDefault()
+<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> m_serverManager;
+<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServerManager__IsNotDefault()
<a class="jxr_linenumber" name="141" href="#141">141</a> {
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">return</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">return</strong> m_serverManager__IsNotDefault;
<a class="jxr_linenumber" name="143" href="#143">143</a> }
-<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_serverManager__IsNotDefault;
<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment">// 21, 1</em>
<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFrags(Map<String,Integer> frags)
<a class="jxr_linenumber" name="147" href="#147">147</a> {
@@ -169,23 +169,23 @@
<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">return</strong> m_frags__IsNotDefault;
<a class="jxr_linenumber" name="160" href="#160">160</a> }
<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_frags__IsNotDefault;
-<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDeadServers(Set<ServerName> deadServers)
<a class="jxr_linenumber" name="164" href="#164">164</a> {
-<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="166" href="#166">166</a> m_format = format;
-<a class="jxr_linenumber" name="167" href="#167">167</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a> m_deadServers = deadServers;
+<a class="jxr_linenumber" name="167" href="#167">167</a> m_deadServers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="168" href="#168">168</a> }
-<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">public</strong> Set<ServerName> getDeadServers()
<a class="jxr_linenumber" name="170" href="#170">170</a> {
-<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">return</strong> m_deadServers;
<a class="jxr_linenumber" name="172" href="#172">172</a> }
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">private</strong> Set<ServerName> m_deadServers;
+<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getDeadServers__IsNotDefault()
<a class="jxr_linenumber" name="175" href="#175">175</a> {
-<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> m_deadServers__IsNotDefault;
<a class="jxr_linenumber" name="177" href="#177">177</a> }
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_deadServers__IsNotDefault;
<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// 25, 1</em>
<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled)
<a class="jxr_linenumber" name="181" href="#181">181</a> {
@@ -203,74 +203,74 @@
<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled__IsNotDefault;
<a class="jxr_linenumber" name="194" href="#194">194</a> }
<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled__IsNotDefault;
-<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServers(List<ServerName> servers)
+<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation)
<a class="jxr_linenumber" name="198" href="#198">198</a> {
-<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="200" href="#200">200</a> m_servers = servers;
-<a class="jxr_linenumber" name="201" href="#201">201</a> m_servers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="200" href="#200">200</a> m_metaLocation = metaLocation;
+<a class="jxr_linenumber" name="201" href="#201">201</a> m_metaLocation__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="202" href="#202">202</a> }
-<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">public</strong> List<ServerName> getServers()
+<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> getMetaLocation()
<a class="jxr_linenumber" name="204" href="#204">204</a> {
-<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">return</strong> m_servers;
+<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">return</strong> m_metaLocation;
<a class="jxr_linenumber" name="206" href="#206">206</a> }
-<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">private</strong> List<ServerName> m_servers;
-<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServers__IsNotDefault()
+<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> m_metaLocation;
+<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getMetaLocation__IsNotDefault()
<a class="jxr_linenumber" name="209" href="#209">209</a> {
-<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">return</strong> m_servers__IsNotDefault;
+<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">return</strong> m_metaLocation__IsNotDefault;
<a class="jxr_linenumber" name="211" href="#211">211</a> }
-<a class="jxr_linenumber" name="212" href="#212">212</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_servers__IsNotDefault;
-<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="212" href="#212">212</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_metaLocation__IsNotDefault;
+<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager)
<a class="jxr_linenumber" name="215" href="#215">215</a> {
-<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="217" href="#217">217</a> m_filter = filter;
-<a class="jxr_linenumber" name="218" href="#218">218</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="217" href="#217">217</a> m_assignmentManager = assignmentManager;
+<a class="jxr_linenumber" name="218" href="#218">218</a> m_assignmentManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="219" href="#219">219</a> }
-<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> getAssignmentManager()
<a class="jxr_linenumber" name="221" href="#221">221</a> {
-<a class="jxr_linenumber" name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> m_assignmentManager;
<a class="jxr_linenumber" name="223" href="#223">223</a> }
-<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="225" href="#225">225</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> m_assignmentManager;
+<a class="jxr_linenumber" name="225" href="#225">225</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getAssignmentManager__IsNotDefault()
<a class="jxr_linenumber" name="226" href="#226">226</a> {
-<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">return</strong> m_assignmentManager__IsNotDefault;
<a class="jxr_linenumber" name="228" href="#228">228</a> }
-<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDeadServers(Set<ServerName> deadServers)
+<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
<a class="jxr_linenumber" name="232" href="#232">232</a> {
-<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="234" href="#234">234</a> m_deadServers = deadServers;
-<a class="jxr_linenumber" name="235" href="#235">235</a> m_deadServers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a> m_filter = filter;
+<a class="jxr_linenumber" name="235" href="#235">235</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="236" href="#236">236</a> }
-<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">public</strong> Set<ServerName> getDeadServers()
+<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">public</strong> String getFilter()
<a class="jxr_linenumber" name="238" href="#238">238</a> {
-<a class="jxr_linenumber" name="239" href="#239">239</a> <strong class="jxr_keyword">return</strong> m_deadServers;
+<a class="jxr_linenumber" name="239" href="#239">239</a> <strong class="jxr_keyword">return</strong> m_filter;
<a class="jxr_linenumber" name="240" href="#240">240</a> }
-<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">private</strong> Set<ServerName> m_deadServers;
-<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getDeadServers__IsNotDefault()
+<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
<a class="jxr_linenumber" name="243" href="#243">243</a> {
-<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">return</strong> m_deadServers__IsNotDefault;
+<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="245" href="#245">245</a> }
-<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_deadServers__IsNotDefault;
-<a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment">// 28, 1</em>
-<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager)
+<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServers(List<ServerName> servers)
<a class="jxr_linenumber" name="249" href="#249">249</a> {
-<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment">// 28, 1</em>
-<a class="jxr_linenumber" name="251" href="#251">251</a> m_serverManager = serverManager;
-<a class="jxr_linenumber" name="252" href="#252">252</a> m_serverManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="251" href="#251">251</a> m_servers = servers;
+<a class="jxr_linenumber" name="252" href="#252">252</a> m_servers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="253" href="#253">253</a> }
-<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> getServerManager()
+<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">public</strong> List<ServerName> getServers()
<a class="jxr_linenumber" name="255" href="#255">255</a> {
-<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">return</strong> m_serverManager;
+<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">return</strong> m_servers;
<a class="jxr_linenumber" name="257" href="#257">257</a> }
-<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> m_serverManager;
-<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServerManager__IsNotDefault()
+<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">private</strong> List<ServerName> m_servers;
+<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServers__IsNotDefault()
<a class="jxr_linenumber" name="260" href="#260">260</a> {
-<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">return</strong> m_serverManager__IsNotDefault;
+<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">return</strong> m_servers__IsNotDefault;
<a class="jxr_linenumber" name="262" href="#262">262</a> }
-<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_serverManager__IsNotDefault;
+<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_servers__IsNotDefault;
<a class="jxr_linenumber" name="264" href="#264">264</a> }
<a class="jxr_linenumber" name="265" href="#265">265</a> @Override
<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -282,17 +282,17 @@
<a class="jxr_linenumber" name="272" href="#272">272</a> <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
<a class="jxr_linenumber" name="273" href="#273">273</a> }
<a class="jxr_linenumber" name="274" href="#274">274</a>
-<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
-<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> p_metaLocation)
+<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)
<a class="jxr_linenumber" name="277" href="#277">277</a> {
-<a class="jxr_linenumber" name="278" href="#278">278</a> (getImplData()).setMetaLocation(p_metaLocation);
+<a class="jxr_linenumber" name="278" href="#278">278</a> (getImplData()).setFormat(p_format);
<a class="jxr_linenumber" name="279" href="#279">279</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="280" href="#280">280</a> }
<a class="jxr_linenumber" name="281" href="#281">281</a>
-<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
-<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> p_assignmentManager)
+<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
+<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> p_serverManager)
<a class="jxr_linenumber" name="284" href="#284">284</a> {
-<a class="jxr_linenumber" name="285" href="#285">285</a> (getImplData()).setAssignmentManager(p_assignmentManager);
+<a class="jxr_linenumber" name="285" href="#285">285</a> (getImplData()).setServerManager(p_serverManager);
<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="287" href="#287">287</a> }
<a class="jxr_linenumber" name="288" href="#288">288</a>
@@ -303,10 +303,10 @@
<a class="jxr_linenumber" name="293" href="#293">293</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="294" href="#294">294</a> }
<a class="jxr_linenumber" name="295" href="#295">295</a>
-<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="297" href="#297">297</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">protected</strong> Set<ServerName> deadServers;
+<a class="jxr_linenumber" name="297" href="#297">297</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)
<a class="jxr_linenumber" name="298" href="#298">298</a> {
-<a class="jxr_linenumber" name="299" href="#299">299</a> (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="299" href="#299">299</a> (getImplData()).setDeadServers(p_deadServers);
<a class="jxr_linenumber" name="300" href="#300">300</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="301" href="#301">301</a> }
<a class="jxr_linenumber" name="302" href="#302">302</a>
@@ -317,31 +317,31 @@
<a class="jxr_linenumber" name="307" href="#307">307</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="308" href="#308">308</a> }
<a class="jxr_linenumber" name="309" href="#309">309</a>
-<a class="jxr_linenumber" name="310" href="#310">310</a> <strong class="jxr_keyword">protected</strong> List<ServerName> servers;
-<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)
+<a class="jxr_linenumber" name="310" href="#310">310</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
+<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> p_metaLocation)
<a class="jxr_linenumber" name="312" href="#312">312</a> {
-<a class="jxr_linenumber" name="313" href="#313">313</a> (getImplData()).setServers(p_servers);
+<a class="jxr_linenumber" name="313" href="#313">313</a> (getImplData()).setMetaLocation(p_metaLocation);
<a class="jxr_linenumber" name="314" href="#314">314</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="315" href="#315">315</a> }
<a class="jxr_linenumber" name="316" href="#316">316</a>
-<a class="jxr_linenumber" name="317" href="#317">317</a> <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="318" href="#318">318</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="317" href="#317">317</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="318" href="#318">318</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> p_assignmentManager)
<a class="jxr_linenumber" name="319" href="#319">319</a> {
-<a class="jxr_linenumber" name="320" href="#320">320</a> (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="320" href="#320">320</a> (getImplData()).setAssignmentManager(p_assignmentManager);
<a class="jxr_linenumber" name="321" href="#321">321</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="322" href="#322">322</a> }
<a class="jxr_linenumber" name="323" href="#323">323</a>
-<a class="jxr_linenumber" name="324" href="#324">324</a> <strong class="jxr_keyword">protected</strong> Set<ServerName> deadServers;
-<a class="jxr_linenumber" name="325" href="#325">325</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)
+<a class="jxr_linenumber" name="324" href="#324">324</a> <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="325" href="#325">325</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)
<a class="jxr_linenumber" name="326" href="#326">326</a> {
-<a class="jxr_linenumber" name="327" href="#327">327</a> (getImplData()).setDeadServers(p_deadServers);
+<a class="jxr_linenumber" name="327" href="#327">327</a> (getImplData()).setFilter(p_filter);
<a class="jxr_linenumber" name="328" href="#328">328</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="329" href="#329">329</a> }
<a class="jxr_linenumber" name="330" href="#330">330</a>
-<a class="jxr_linenumber" name="331" href="#331">331</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
-<a class="jxr_linenumber" name="332" href="#332">332</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> p_serverManager)
+<a class="jxr_linenumber" name="331" href="#331">331</a> <strong class="jxr_keyword">protected</strong> List<ServerName> servers;
+<a class="jxr_linenumber" name="332" href="#332">332</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)
<a class="jxr_linenumber" name="333" href="#333">333</a> {
-<a class="jxr_linenumber" name="334" href="#334">334</a> (getImplData()).setServerManager(p_serverManager);
+<a class="jxr_linenumber" name="334" href="#334">334</a> (getImplData()).setServers(p_servers);
<a class="jxr_linenumber" name="335" href="#335">335</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="336" href="#336">336</a> }
<a class="jxr_linenumber" name="337" href="#337">337</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index 2c033e5..e22eb39 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -70,15 +70,15 @@
<a class="jxr_linenumber" name="60" href="#60">60</a>
<a class="jxr_linenumber" name="61" href="#61">61</a> {
<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html">HMaster</a> master;
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map<String,Integer> frags;
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set<ServerName> deadServers;
<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
-<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List<ServerName> servers;
-<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set<ServerName> deadServers;
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
+<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List<ServerName> servers;
<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// 68, 1</em>
<a class="jxr_linenumber" name="73" href="#73">73</a>
<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">public</strong> String formatZKString() {
@@ -108,41 +108,41 @@
<a class="jxr_linenumber" name="98" href="#98">98</a>
<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData p_implData)
<a class="jxr_linenumber" name="100" href="#100">100</a> {
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong>(! p_implData.getMetaLocation__IsNotDefault())
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
<a class="jxr_linenumber" name="102" href="#102">102</a> {
-<a class="jxr_linenumber" name="103" href="#103">103</a> p_implData.setMetaLocation(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="103" href="#103">103</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
<a class="jxr_linenumber" name="104" href="#104">104</a> }
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">if</strong>(! p_implData.getAssignmentManager__IsNotDefault())
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServerManager__IsNotDefault())
<a class="jxr_linenumber" name="106" href="#106">106</a> {
-<a class="jxr_linenumber" name="107" href="#107">107</a> p_implData.setAssignmentManager(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="107" href="#107">107</a> p_implData.setServerManager(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="108" href="#108">108</a> }
<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFrags__IsNotDefault())
<a class="jxr_linenumber" name="110" href="#110">110</a> {
<a class="jxr_linenumber" name="111" href="#111">111</a> p_implData.setFrags(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="112" href="#112">112</a> }
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">if</strong>(! p_implData.getDeadServers__IsNotDefault())
<a class="jxr_linenumber" name="114" href="#114">114</a> {
-<a class="jxr_linenumber" name="115" href="#115">115</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="115" href="#115">115</a> p_implData.setDeadServers(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="116" href="#116">116</a> }
<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">if</strong>(! p_implData.getCatalogJanitorEnabled__IsNotDefault())
<a class="jxr_linenumber" name="118" href="#118">118</a> {
<a class="jxr_linenumber" name="119" href="#119">119</a> p_implData.setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
<a class="jxr_linenumber" name="120" href="#120">120</a> }
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServers__IsNotDefault())
+<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">if</strong>(! p_implData.getMetaLocation__IsNotDefault())
<a class="jxr_linenumber" name="122" href="#122">122</a> {
-<a class="jxr_linenumber" name="123" href="#123">123</a> p_implData.setServers(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="123" href="#123">123</a> p_implData.setMetaLocation(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="124" href="#124">124</a> }
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">if</strong>(! p_implData.getAssignmentManager__IsNotDefault())
<a class="jxr_linenumber" name="126" href="#126">126</a> {
-<a class="jxr_linenumber" name="127" href="#127">127</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="127" href="#127">127</a> p_implData.setAssignmentManager(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="128" href="#128">128</a> }
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong>(! p_implData.getDeadServers__IsNotDefault())
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
<a class="jxr_linenumber" name="130" href="#130">130</a> {
-<a class="jxr_linenumber" name="131" href="#131">131</a> p_implData.setDeadServers(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="131" href="#131">131</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
<a class="jxr_linenumber" name="132" href="#132">132</a> }
-<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServerManager__IsNotDefault())
+<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServers__IsNotDefault())
<a class="jxr_linenumber" name="134" href="#134">134</a> {
-<a class="jxr_linenumber" name="135" href="#135">135</a> p_implData.setServerManager(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> p_implData.setServers(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="136" href="#136">136</a> }
<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> p_implData;
<a class="jxr_linenumber" name="138" href="#138">138</a> }
@@ -150,15 +150,15 @@
<a class="jxr_linenumber" name="140" href="#140">140</a> {
<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
<a class="jxr_linenumber" name="142" href="#142">142</a> master = p_implData.getMaster();
-<a class="jxr_linenumber" name="143" href="#143">143</a> metaLocation = p_implData.getMetaLocation();
-<a class="jxr_linenumber" name="144" href="#144">144</a> assignmentManager = p_implData.getAssignmentManager();
+<a class="jxr_linenumber" name="143" href="#143">143</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="144" href="#144">144</a> serverManager = p_implData.getServerManager();
<a class="jxr_linenumber" name="145" href="#145">145</a> frags = p_implData.getFrags();
-<a class="jxr_linenumber" name="146" href="#146">146</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="146" href="#146">146</a> deadServers = p_implData.getDeadServers();
<a class="jxr_linenumber" name="147" href="#147">147</a> catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();
-<a class="jxr_linenumber" name="148" href="#148">148</a> servers = p_implData.getServers();
-<a class="jxr_linenumber" name="149" href="#149">149</a> filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="150" href="#150">150</a> deadServers = p_implData.getDeadServers();
-<a class="jxr_linenumber" name="151" href="#151">151</a> serverManager = p_implData.getServerManager();
+<a class="jxr_linenumber" name="148" href="#148">148</a> metaLocation = p_implData.getMetaLocation();
+<a class="jxr_linenumber" name="149" href="#149">149</a> assignmentManager = p_implData.getAssignmentManager();
+<a class="jxr_linenumber" name="150" href="#150">150</a> filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="151" href="#151">151</a> servers = p_implData.getServers();
<a class="jxr_linenumber" name="152" href="#152">152</a> }
<a class="jxr_linenumber" name="153" href="#153">153</a>
<a class="jxr_linenumber" name="154" href="#154">154</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
@@ -172,8 +172,8 @@
<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment">// 60, 3</em>
<a class="jxr_linenumber" name="163" href="#163">163</a> {
<a class="jxr_linenumber" name="164" href="#164">164</a> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__<strong class="jxr_keyword">var</strong>_6 = <strong class="jxr_keyword">new</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(<strong class="jxr_keyword">this</strong>.getTemplateManager());
-<a class="jxr_linenumber" name="165" href="#165">165</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFormat(<span class="jxr_string">"json"</span> );
-<a class="jxr_linenumber" name="166" href="#166">166</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFilter(filter);
+<a class="jxr_linenumber" name="165" href="#165">165</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFilter(filter);
+<a class="jxr_linenumber" name="166" href="#166">166</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFormat(<span class="jxr_string">"json"</span> );
<a class="jxr_linenumber" name="167" href="#167">167</a> __jamon__<strong class="jxr_keyword">var</strong>_6.renderNoFlush(jamonWriter);
<a class="jxr_linenumber" name="168" href="#168">168</a> }
<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_comment">// 60, 68</em>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index 1f8f9dc..a19ed5d 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -36,9 +36,9 @@
<a class="jxr_linenumber" name="26" href="#26">26</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"regionServer"</span>, type = <span class="jxr_string">"HRegionServer"</span>)},
<a class="jxr_linenumber" name="27" href="#27">27</a> optionalArguments = {
<a class="jxr_linenumber" name="28" href="#28">28</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcn"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="29" href="#29">29</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcv"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="30" href="#30">30</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="31" href="#31">31</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>)})
+<a class="jxr_linenumber" name="29" href="#29">29</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="30" href="#30">30</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcv"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="31" href="#31">31</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>)})
<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html">RSStatusTmpl</a>
<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
<a class="jxr_linenumber" name="34" href="#34">34</a> {
@@ -96,57 +96,57 @@
<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">return</strong> m_bcn__IsNotDefault;
<a class="jxr_linenumber" name="87" href="#87">87</a> }
<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcn__IsNotDefault;
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcv(String bcv)
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
<a class="jxr_linenumber" name="91" href="#91">91</a> {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> m_bcv = bcv;
-<a class="jxr_linenumber" name="94" href="#94">94</a> m_bcv__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="93" href="#93">93</a> m_format = format;
+<a class="jxr_linenumber" name="94" href="#94">94</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="95" href="#95">95</a> }
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> String getBcv()
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> String getFormat()
<a class="jxr_linenumber" name="97" href="#97">97</a> {
-<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">return</strong> m_bcv;
+<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">return</strong> m_format;
<a class="jxr_linenumber" name="99" href="#99">99</a> }
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> String m_bcv;
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcv__IsNotDefault()
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
<a class="jxr_linenumber" name="102" href="#102">102</a> {
-<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">return</strong> m_bcv__IsNotDefault;
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
<a class="jxr_linenumber" name="104" href="#104">104</a> }
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcv__IsNotDefault;
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_comment">// 21, 1</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcv(String bcv)
<a class="jxr_linenumber" name="108" href="#108">108</a> {
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// 21, 1</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> m_filter = filter;
-<a class="jxr_linenumber" name="111" href="#111">111</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> m_bcv = bcv;
+<a class="jxr_linenumber" name="111" href="#111">111</a> m_bcv__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="112" href="#112">112</a> }
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">public</strong> String getBcv()
<a class="jxr_linenumber" name="114" href="#114">114</a> {
-<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">return</strong> m_bcv;
<a class="jxr_linenumber" name="116" href="#116">116</a> }
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">private</strong> String m_bcv;
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcv__IsNotDefault()
<a class="jxr_linenumber" name="119" href="#119">119</a> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_bcv__IsNotDefault;
<a class="jxr_linenumber" name="121" href="#121">121</a> }
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcv__IsNotDefault;
+<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// 21, 1</em>
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
<a class="jxr_linenumber" name="125" href="#125">125</a> {
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> m_format = format;
-<a class="jxr_linenumber" name="128" href="#128">128</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// 21, 1</em>
+<a class="jxr_linenumber" name="127" href="#127">127</a> m_filter = filter;
+<a class="jxr_linenumber" name="128" href="#128">128</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="129" href="#129">129</a> }
-<a class="jxr_linenumber" name="130" href="#130">130</a> <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="130" href="#130">130</a> <strong class="jxr_keyword">public</strong> String getFilter()
<a class="jxr_linenumber" name="131" href="#131">131</a> {
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">return</strong> m_filter;
<a class="jxr_linenumber" name="133" href="#133">133</a> }
-<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
<a class="jxr_linenumber" name="136" href="#136">136</a> {
-<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="138" href="#138">138</a> }
-<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="140" href="#140">140</a> }
<a class="jxr_linenumber" name="141" href="#141">141</a> @Override
<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -165,24 +165,24 @@
<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="156" href="#156">156</a> }
<a class="jxr_linenumber" name="157" href="#157">157</a>
-<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">protected</strong> String bcv;
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)
+<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)
<a class="jxr_linenumber" name="160" href="#160">160</a> {
-<a class="jxr_linenumber" name="161" href="#161">161</a> (getImplData()).setBcv(p_bcv);
+<a class="jxr_linenumber" name="161" href="#161">161</a> (getImplData()).setFormat(p_format);
<a class="jxr_linenumber" name="162" href="#162">162</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="163" href="#163">163</a> }
<a class="jxr_linenumber" name="164" href="#164">164</a>
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">protected</strong> String bcv;
+<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)
<a class="jxr_linenumber" name="167" href="#167">167</a> {
-<a class="jxr_linenumber" name="168" href="#168">168</a> (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="168" href="#168">168</a> (getImplData()).setBcv(p_bcv);
<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="170" href="#170">170</a> }
<a class="jxr_linenumber" name="171" href="#171">171</a>
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)
<a class="jxr_linenumber" name="174" href="#174">174</a> {
-<a class="jxr_linenumber" name="175" href="#175">175</a> (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="175" href="#175">175</a> (getImplData()).setFilter(p_filter);
<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="177" href="#177">177</a> }
<a class="jxr_linenumber" name="178" href="#178">178</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index c8e0bfd..3e775bc 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -37,26 +37,26 @@
<a class="jxr_linenumber" name="27" href="#27">27</a> {
<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html">HRegionServer</a> regionServer;
<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcn;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcv;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcv;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData p_implData)
<a class="jxr_linenumber" name="34" href="#34">34</a> {
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcn__IsNotDefault())
<a class="jxr_linenumber" name="36" href="#36">36</a> {
<a class="jxr_linenumber" name="37" href="#37">37</a> p_implData.setBcn(<span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="38" href="#38">38</a> }
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcv__IsNotDefault())
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
<a class="jxr_linenumber" name="40" href="#40">40</a> {
-<a class="jxr_linenumber" name="41" href="#41">41</a> p_implData.setBcv(<span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="41" href="#41">41</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
<a class="jxr_linenumber" name="42" href="#42">42</a> }
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcv__IsNotDefault())
<a class="jxr_linenumber" name="44" href="#44">44</a> {
-<a class="jxr_linenumber" name="45" href="#45">45</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="45" href="#45">45</a> p_implData.setBcv(<span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="46" href="#46">46</a> }
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
<a class="jxr_linenumber" name="48" href="#48">48</a> {
-<a class="jxr_linenumber" name="49" href="#49">49</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="49" href="#49">49</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
<a class="jxr_linenumber" name="50" href="#50">50</a> }
<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">return</strong> p_implData;
<a class="jxr_linenumber" name="52" href="#52">52</a> }
@@ -65,9 +65,9 @@
<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
<a class="jxr_linenumber" name="56" href="#56">56</a> regionServer = p_implData.getRegionServer();
<a class="jxr_linenumber" name="57" href="#57">57</a> bcn = p_implData.getBcn();
-<a class="jxr_linenumber" name="58" href="#58">58</a> bcv = p_implData.getBcv();
-<a class="jxr_linenumber" name="59" href="#59">59</a> filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="60" href="#60">60</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="58" href="#58">58</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="59" href="#59">59</a> bcv = p_implData.getBcv();
+<a class="jxr_linenumber" name="60" href="#60">60</a> filter = p_implData.getFilter();
<a class="jxr_linenumber" name="61" href="#61">61</a> }
<a class="jxr_linenumber" name="62" href="#62">62</a>
<a class="jxr_linenumber" name="63" href="#63">63</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
@@ -96,8 +96,8 @@
<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// 41, 3</em>
<a class="jxr_linenumber" name="87" href="#87">87</a> {
<a class="jxr_linenumber" name="88" href="#88">88</a> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__<strong class="jxr_keyword">var</strong>_1 = <strong class="jxr_keyword">new</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(<strong class="jxr_keyword">this</strong>.getTemplateManager());
-<a class="jxr_linenumber" name="89" href="#89">89</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFormat(<span class="jxr_string">"json"</span> );
-<a class="jxr_linenumber" name="90" href="#90">90</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFilter(filter);
+<a class="jxr_linenumber" name="89" href="#89">89</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFilter(filter);
+<a class="jxr_linenumber" name="90" href="#90">90</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFormat(<span class="jxr_string">"json"</span> );
<a class="jxr_linenumber" name="91" href="#91">91</a> __jamon__<strong class="jxr_keyword">var</strong>_1.renderNoFlush(jamonWriter);
<a class="jxr_linenumber" name="92" href="#92">92</a> }
<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// 41, 68</em>
[16/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
index 4b7d070..f29d477 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
@@ -99,704 +99,706 @@
<span class="sourceLineNo">091</span> // If true, bad lines are logged to stderr. Default: false.<a name="line.91"></a>
<span class="sourceLineNo">092</span> public final static String LOG_BAD_LINES_CONF_KEY = "importtsv.log.bad.lines";<a name="line.92"></a>
<span class="sourceLineNo">093</span> public final static String SKIP_LINES_CONF_KEY = "importtsv.skip.bad.lines";<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.96"></a>
-<span class="sourceLineNo">097</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.97"></a>
-<span class="sourceLineNo">098</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.99"></a>
-<span class="sourceLineNo">100</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.102"></a>
-<span class="sourceLineNo">103</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.105"></a>
-<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * flipped to delete it when MR ends.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static class TsvParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Column families and qualifiers mapped to the TSV columns<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private final byte[][] families;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private final byte[][] qualifiers;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> private final byte separatorByte;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> private int rowKeyColumnIndex;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> private int maxColumnCount;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Default value must be negative<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @param separatorStr<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // Configure separator<a name="line.158"></a>
-<span class="sourceLineNo">159</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> Preconditions.checkArgument(separator.length == 1,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> "TsvParser only supports single-byte separators");<a name="line.161"></a>
-<span class="sourceLineNo">162</span> separatorByte = separator[0];<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Configure columns<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> maxColumnCount = columnStrings.size();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> families = new byte[maxColumnCount][];<a name="line.169"></a>
-<span class="sourceLineNo">170</span> qualifiers = new byte[maxColumnCount][];<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> String str = columnStrings.get(i);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rowKeyColumnIndex = i;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> continue;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> timestampKeyColumnIndex = i;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> continue;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> attrKeyColumnIndex = i;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> continue;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> cellVisibilityColumnIndex = i;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> continue;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> cellTTLColumnIndex = i;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> continue;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> String[] parts = str.split(":", 2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (parts.length == 1) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> families[i] = str.getBytes();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } else {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> families[i] = parts[0].getBytes();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> qualifiers[i] = parts[1].getBytes();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<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> public int getTimestampKeyColumnIndex() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return timestampKeyColumnIndex;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> public boolean hasAttributes() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> public boolean hasCellVisibility() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasCellTTL() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> public int getAttributesKeyColumnIndex() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return attrKeyColumnIndex;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public int getCellVisibilityColumnIndex() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return cellVisibilityColumnIndex;<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">233</span> public int getCellTTLColumnIndex() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return cellTTLColumnIndex;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> public int getRowKeyColumnIndex() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return rowKeyColumnIndex;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> public byte[] getFamily(int idx) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return families[idx];<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public byte[] getQualifier(int idx) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return qualifiers[idx];<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> throws BadTsvLineException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // Enumerate separator offsets<a name="line.250"></a>
-<span class="sourceLineNo">251</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < length; i++) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (lineBytes[i] == separatorByte) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> tabOffsets.add(i);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (tabOffsets.isEmpty()) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> throw new BadTsvLineException("No delimiter");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> tabOffsets.add(length);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> throw new BadTsvLineException("Excessive columns");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throw new BadTsvLineException("No row key");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> } else if (hasTimestamp()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new BadTsvLineException("No timestamp");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new BadTsvLineException("No attributes specified");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.273"></a>
-<span class="sourceLineNo">274</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> class ParsedLine {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> private final ArrayList<Integer> tabOffsets;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private byte[] lineBytes;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ParsedLine(ArrayList<Integer> tabOffsets, byte[] lineBytes) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.tabOffsets = tabOffsets;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.lineBytes = lineBytes;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> public int getRowKeyOffset() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return getColumnOffset(rowKeyColumnIndex);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public int getRowKeyLength() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return getColumnLength(rowKeyColumnIndex);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> public long getTimestamp(long ts) throws BadTsvLineException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // Return ts if HBASE_TS_KEY is not configured in column spec<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (!hasTimestamp()) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return ts;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> String timeStampStr = Bytes.toString(lineBytes,<a name="line.302"></a>
-<span class="sourceLineNo">303</span> getColumnOffset(timestampKeyColumnIndex),<a name="line.303"></a>
-<span class="sourceLineNo">304</span> getColumnLength(timestampKeyColumnIndex));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return Long.parseLong(timeStampStr);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> } catch (NumberFormatException nfe) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // treat this record as bad record<a name="line.308"></a>
-<span class="sourceLineNo">309</span> throw new BadTsvLineException("Invalid timestamp " + timeStampStr);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> private String getAttributes() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (!hasAttributes()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return Bytes.toString(lineBytes, getColumnOffset(attrKeyColumnIndex),<a name="line.317"></a>
-<span class="sourceLineNo">318</span> getColumnLength(attrKeyColumnIndex));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public String[] getIndividualAttributes() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> String attributes = getAttributes();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (attributes != null) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return attributes.split(DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return null;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> public int getAttributeKeyOffset() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (hasAttributes()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return getColumnOffset(attrKeyColumnIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> public int getAttributeKeyLength() {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (hasAttributes()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return getColumnLength(attrKeyColumnIndex);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> public int getCellVisibilityColumnOffset() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (hasCellVisibility()) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return getColumnOffset(cellVisibilityColumnIndex);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> public int getCellVisibilityColumnLength() {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> if (hasCellVisibility()) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return getColumnLength(cellVisibilityColumnIndex);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> } else {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> public String getCellVisibility() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (!hasCellVisibility()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return null;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return Bytes.toString(lineBytes, getColumnOffset(cellVisibilityColumnIndex),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> getColumnLength(cellVisibilityColumnIndex));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> public int getCellTTLColumnOffset() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (hasCellTTL()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return getColumnOffset(cellTTLColumnIndex);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } else {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> public int getCellTTLColumnLength() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (hasCellTTL()) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return getColumnLength(cellTTLColumnIndex);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> public long getCellTTL() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (!hasCellTTL()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return 0;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } else {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return Bytes.toLong(lineBytes, getColumnOffset(cellTTLColumnIndex),<a name="line.392"></a>
-<span class="sourceLineNo">393</span> getColumnLength(cellTTLColumnIndex));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> public int getColumnOffset(int idx) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (idx > 0)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return tabOffsets.get(idx - 1) + 1;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> else<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return 0;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public int getColumnLength(int idx) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return tabOffsets.get(idx) - getColumnOffset(idx);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> public int getColumnCount() {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return tabOffsets.size();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public byte[] getLineBytes() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return lineBytes;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> public static class BadTsvLineException extends Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public BadTsvLineException(String err) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super(err);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> private static final long serialVersionUID = 1L;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Return starting position and length of row key from the specified line bytes.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * @param lineBytes<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * @param length<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * @return Pair of row key offset and length.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * @throws BadTsvLineException<a name="line.426"></a>
-<span class="sourceLineNo">427</span> */<a name="line.427"></a>
-<span class="sourceLineNo">428</span> public Pair<Integer, Integer> parseRowKey(byte[] lineBytes, int length)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> throws BadTsvLineException {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> int rkColumnIndex = 0;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> int startPos = 0, endPos = 0;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (int i = 0; i <= length; i++) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (i == length || lineBytes[i] == separatorByte) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> endPos = i - 1;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (rkColumnIndex++ == getRowKeyColumnIndex()) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if ((endPos + 1) == startPos) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throw new BadTsvLineException("Empty value for ROW KEY.");<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> startPos = endPos + 2;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (i == length) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> throw new BadTsvLineException(<a name="line.445"></a>
-<span class="sourceLineNo">446</span> "Row key does not exist as number of columns in the line"<a name="line.446"></a>
-<span class="sourceLineNo">447</span> + " are less than row key position.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return new Pair<Integer, Integer>(startPos, endPos - startPos + 1);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Sets up the actual job.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param conf The current configuration.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param args The command line parameters.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @return The newly created job.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @throws IOException When setting up the job fails.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> throws IOException, ClassNotFoundException {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Job job = null;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> boolean isDryRun = conf.getBoolean(DRY_RUN_CONF_KEY, false);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try (Connection connection = ConnectionFactory.createConnection(conf)) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> try (Admin admin = connection.getAdmin()) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> // Support non-XML supported characters<a name="line.468"></a>
-<span class="sourceLineNo">469</span> // by re-encoding the passed separator as a Base64 string.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (actualSeparator != null) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> // See if a non-default Mapper was set<a name="line.476"></a>
-<span class="sourceLineNo">477</span> String mapperClassName = conf.get(MAPPER_CONF_KEY);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Class mapperClass = mapperClassName != null? Class.forName(mapperClassName): DEFAULT_MAPPER;<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> Path inputDir = new Path(args[1]);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + "_" + tableName.getNameAsString());<a name="line.482"></a>
-<span class="sourceLineNo">483</span> job = Job.getInstance(conf, jobName);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> job.setJarByClass(mapperClass);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> FileInputFormat.setInputPaths(job, inputDir);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> job.setInputFormatClass(TextInputFormat.class);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> job.setMapperClass(mapperClass);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> String[] columns = conf.getStrings(COLUMNS_CONF_KEY);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> String fileLoc = conf.get(CREDENTIALS_LOCATION);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> job.getCredentials().addAll(cred);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (hfileOutPath != null) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (!admin.tableExists(tableName)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> LOG.warn(format("Table '%s' does not exist.", tableName));<a name="line.499"></a>
-<span class="sourceLineNo">500</span> if ("yes".equalsIgnoreCase(conf.get(CREATE_TABLE_CONF_KEY, "yes"))) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> // TODO: this is backwards. Instead of depending on the existence of a table,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // create a sane splits file for HFileOutputFormat based on data sampling.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> createTable(admin, tableName, columns);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (isDryRun) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> LOG.warn("Dry run: Table will be deleted at end of dry run.");<a name="line.505"></a>
-<span class="sourceLineNo">506</span> synchronized (ImportTsv.class) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> DRY_RUN_TABLE_CREATED = true;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String errorMsg =<a name="line.511"></a>
-<span class="sourceLineNo">512</span> format("Table '%s' does not exist and '%s' is set to no.", tableName,<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CREATE_TABLE_CONF_KEY);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> LOG.error(errorMsg);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> throw new TableNotFoundException(errorMsg);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> try (Table table = connection.getTable(tableName);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> RegionLocator regionLocator = connection.getRegionLocator(tableName)) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> boolean noStrict = conf.getBoolean(NO_STRICT_COL_FAMILY, false);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> // if no.strict is false then check column family<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if(!noStrict) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> ArrayList<String> unmatchedFamilies = new ArrayList<String>();<a name="line.523"></a>
-<span class="sourceLineNo">524</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> HTableDescriptor tDesc = table.getTableDescriptor();<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (String cf : cfSet) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> if(tDesc.getFamily(Bytes.toBytes(cf)) == null) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> unmatchedFamilies.add(cf);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> if(unmatchedFamilies.size() > 0) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> ArrayList<String> familyNames = new ArrayList<String>();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> for (HColumnDescriptor family : table.getTableDescriptor().getFamilies()) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> familyNames.add(family.getNameAsString());<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> String msg =<a name="line.536"></a>
-<span class="sourceLineNo">537</span> "Column Families " + unmatchedFamilies + " specified in " + COLUMNS_CONF_KEY<a name="line.537"></a>
-<span class="sourceLineNo">538</span> + " does not match with any of the table " + tableName<a name="line.538"></a>
-<span class="sourceLineNo">539</span> + " column families " + familyNames + ".\n"<a name="line.539"></a>
-<span class="sourceLineNo">540</span> + "To disable column family check, use -D" + NO_STRICT_COL_FAMILY<a name="line.540"></a>
-<span class="sourceLineNo">541</span> + "=true.\n";<a name="line.541"></a>
-<span class="sourceLineNo">542</span> usage(msg);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> System.exit(-1);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> }<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> job.setMapOutputValueClass(Text.class);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> job.setReducerClass(TextSortReducer.class);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> job.setMapOutputValueClass(Put.class);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> job.setCombinerClass(PutCombiner.class);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> job.setReducerClass(PutSortReducer.class);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (!isDryRun) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> Path outputDir = new Path(hfileOutPath);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> FileOutputFormat.setOutputPath(job, outputDir);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> HFileOutputFormat2.configureIncrementalLoad(job, table.getTableDescriptor(),<a name="line.557"></a>
-<span class="sourceLineNo">558</span> regionLocator);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> } else {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> if (!admin.tableExists(tableName)) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> String errorMsg = format("Table '%s' does not exist.", tableName);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> LOG.error(errorMsg);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> throw new TableNotFoundException(errorMsg);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> usage(TsvImporterTextMapper.class.toString()<a name="line.568"></a>
-<span class="sourceLineNo">569</span> + " should not be used for non bulkloading case. use "<a name="line.569"></a>
-<span class="sourceLineNo">570</span> + TsvImporterMapper.class.toString()<a name="line.570"></a>
-<span class="sourceLineNo">571</span> + " or custom mapper whose value type is Put.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> System.exit(-1);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (!isDryRun) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // No reducers. Just write straight to table. Call initTableReducerJob<a name="line.575"></a>
-<span class="sourceLineNo">576</span> // to set up the TableOutputFormat.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> job.setNumReduceTasks(0);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> if (isDryRun) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> job.setOutputFormatClass(NullOutputFormat.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> job.getConfiguration().setStrings("io.serializations",<a name="line.583"></a>
-<span class="sourceLineNo">584</span> job.getConfiguration().get("io.serializations"),<a name="line.584"></a>
-<span class="sourceLineNo">585</span> MutationSerialization.class.getName(), ResultSerialization.class.getName(),<a name="line.585"></a>
-<span class="sourceLineNo">586</span> KeyValueSerialization.class.getName());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> TableMapReduceUtil.addDependencyJars(job);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a name="line.589"></a>
-<span class="sourceLineNo">590</span> com.google.common.base.Function.class /* Guava used by TsvParser */);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> return job;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span> private static void createTable(Admin admin, TableName tableName, String[] columns)<a name="line.596"></a>
-<span class="sourceLineNo">597</span> throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> for (String cf : cfSet) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> HColumnDescriptor hcd = new HColumnDescriptor(Bytes.toBytes(cf));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> htd.addFamily(hcd);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> LOG.warn(format("Creating table '%s' with '%s' columns and default descriptors.",<a name="line.604"></a>
-<span class="sourceLineNo">605</span> tableName, cfSet));<a name="line.605"></a>
-<span class="sourceLineNo">606</span> admin.createTable(htd);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> private static void deleteTable(Configuration conf, String[] args) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> try (Connection connection = ConnectionFactory.createConnection(conf);<a name="line.611"></a>
-<span class="sourceLineNo">612</span> Admin admin = connection.getAdmin()) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> admin.disableTable(tableName);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (TableNotEnabledException e) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> LOG.debug("Dry mode: Table: " + tableName + " already disabled, so just deleting it.");<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> admin.deleteTable(tableName);<a name="line.618"></a>
-<span class="sourceLineNo">619</span> } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> LOG.error(format("***Dry run: Failed to delete table '%s'.***%n%s", tableName,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> e.toString()));<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> LOG.info(format("Dry run: Deleted table '%s'.", tableName));<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> private static Set<String> getColumnFamilies(String[] columns) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> Set<String> cfSet = new HashSet<String>();<a name="line.628"></a>
-<span class="sourceLineNo">629</span> for (String aColumn : columns) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span> if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)<a name="line.630"></a>
-<span class="sourceLineNo">631</span> || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)<a name="line.631"></a>
-<span class="sourceLineNo">632</span> || TsvParser.CELL_VISIBILITY_COLUMN_SPEC.equals(aColumn)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> || TsvParser.CELL_TTL_COLUMN_SPEC.equals(aColumn)<a name="line.633"></a>
-<span class="sourceLineNo">634</span> || TsvParser.ATTRIBUTES_COLUMN_SPEC.equals(aColumn))<a name="line.634"></a>
-<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
-<span class="sourceLineNo">636</span> // we are only concerned with the first one (in case this is a cf:cq)<a name="line.636"></a>
-<span class="sourceLineNo">637</span> cfSet.add(aColumn.split(":", 2)[0]);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> }<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return cfSet;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> /*<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param errorMsg Error message. Can be null.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> */<a name="line.644"></a>
-<span class="sourceLineNo">645</span> private static void usage(final String errorMsg) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> System.err.println("ERROR: " + errorMsg);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> String usage =<a name="line.649"></a>
-<span class="sourceLineNo">650</span> "Usage: " + NAME + " -D"+ COLUMNS_CONF_KEY + "=a,b,c <tablename> <inputdir>\n" +<a name="line.650"></a>
-<span class="sourceLineNo">651</span> "\n" +<a name="line.651"></a>
-<span class="sourceLineNo">652</span> "Imports the given input directory of TSV data into the specified table.\n" +<a name="line.652"></a>
-<span class="sourceLineNo">653</span> "\n" +<a name="line.653"></a>
-<span class="sourceLineNo">654</span> "The column names of the TSV data must be specified using the -D" + COLUMNS_CONF_KEY + "\n" +<a name="line.654"></a>
-<span class="sourceLineNo">655</span> "option. This option takes the form of comma-separated column names, where each\n" +<a name="line.655"></a>
-<span class="sourceLineNo">656</span> "column name is either a simple column family, or a columnfamily:qualifier. The special\n" +<a name="line.656"></a>
-<span class="sourceLineNo">657</span> "column name " + TsvParser.ROWKEY_COLUMN_SPEC + " is used to designate that this column should be used\n" +<a name="line.657"></a>
-<span class="sourceLineNo">658</span> "as the row key for each imported record. You must specify exactly one column\n" +<a name="line.658"></a>
-<span class="sourceLineNo">659</span> "to be the row key, and you must specify a column name for every column that exists in the\n" +<a name="line.659"></a>
-<span class="sourceLineNo">660</span> "input data. Another special column" + TsvParser.TIMESTAMPKEY_COLUMN_SPEC +<a name="line.660"></a>
-<span class="sourceLineNo">661</span> " designates that this column should be\n" +<a name="line.661"></a>
-<span class="sourceLineNo">662</span> "used as timestamp for each record. Unlike " + TsvParser.ROWKEY_COLUMN_SPEC + ", " +<a name="line.662"></a>
-<span class="sourceLineNo">663</span> TsvParser.TIMESTAMPKEY_COLUMN_SPEC + " is optional." + "\n" +<a name="line.663"></a>
-<span class="sourceLineNo">664</span> "You must specify at most one column as timestamp key for each imported record.\n" +<a name="line.664"></a>
-<span class="sourceLineNo">665</span> "Record with invalid timestamps (blank, non-numeric) will be treated as bad record.\n" +<a name="line.665"></a>
-<span class="sourceLineNo">666</span> "Note: if you use this option, then '" + TIMESTAMP_CONF_KEY + "' option will be ignored.\n" +<a name="line.666"></a>
-<span class="sourceLineNo">667</span> "\n" +<a name="line.667"></a>
-<span class="sourceLineNo">668</span> "Other special columns that can be specified are " + TsvParser.CELL_TTL_COLUMN_SPEC +<a name="line.668"></a>
-<span class="sourceLineNo">669</span> " and " + TsvParser.CELL_VISIBILITY_COLUMN_SPEC + ".\n" +<a name="line.669"></a>
-<span class="sourceLineNo">670</span> TsvParser.CELL_TTL_COLUMN_SPEC + " designates that this column will be used " +<a name="line.670"></a>
-<span class="sourceLineNo">671</span> "as a Cell's Time To Live (TTL) attribute.\n" +<a name="line.671"></a>
-<span class="sourceLineNo">672</span> TsvParser.CELL_VISIBILITY_COLUMN_SPEC + " designates that this column contains the " +<a name="line.672"></a>
-<span class="sourceLineNo">673</span> "visibility label expression.\n" +<a name="line.673"></a>
-<span class="sourceLineNo">674</span> "\n" +<a name="line.674"></a>
-<span class="sourceLineNo">675</span> TsvParser.ATTRIBUTES_COLUMN_SPEC+" can be used to specify Operation Attributes per record.\n"+<a name="line.675"></a>
-<span class="sourceLineNo">676</span> " Should be specified as key=>value where "+TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX+ " is used \n"+<a name="line.676"></a>
-<span class="sourceLineNo">677</span> " as the seperator. Note that more than one OperationAttributes can be specified.\n"+<a name="line.677"></a>
-<span class="sourceLineNo">678</span> "By default importtsv will load data directly into HBase. To instead generate\n" +<a name="line.678"></a>
-<span class="sourceLineNo">679</span> "HFiles of data to prepare for a bulk data load, pass the option:\n" +<a name="line.679"></a>
-<span class="sourceLineNo">680</span> " -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output\n" +<a name="line.680"></a>
-<span class="sourceLineNo">681</span> " Note: if you do not use this option, then the target table must already exist in HBase\n" +<a name="line.681"></a>
-<span class="sourceLineNo">682</span> "\n" +<a name="line.682"></a>
-<span class="sourceLineNo">683</span> "Other options that may be specified with -D include:\n" +<a name="line.683"></a>
-<span class="sourceLineNo">684</span> " -D" + DRY_RUN_CONF_KEY + "=true - Dry run mode. Data is not actually populated into" +<a name="line.684"></a>
-<span class="sourceLineNo">685</span> " table. If table does not exist, it is created but deleted in the end.\n" +<a name="line.685"></a>
-<span class="sourceLineNo">686</span> " -D" + SKIP_LINES_CONF_KEY + "=false - fail if encountering an invalid line\n" +<a name="line.686"></a>
-<span class="sourceLineNo">687</span> " -D" + LOG_BAD_LINES_CONF_KEY + "=true - logs invalid lines to stderr\n" +<a name="line.687"></a>
-<span class="sourceLineNo">688</span> " '-D" + SEPARATOR_CONF_KEY + "=|' - eg separate on pipes instead of tabs\n" +<a name="line.688"></a>
-<span class="sourceLineNo">689</span> " -D" + TIMESTAMP_CONF_KEY + "=currentTimeAsLong - use the specified timestamp for the import\n" +<a name="line.689"></a>
-<span class="sourceLineNo">690</span> " -D" + MAPPER_CONF_KEY + "=my.Mapper - A user-defined Mapper to use instead of " +<a name="line.690"></a>
-<span class="sourceLineNo">691</span> DEFAULT_MAPPER.getName() + "\n" +<a name="line.691"></a>
-<span class="sourceLineNo">692</span> " -D" + JOB_NAME_CONF_KEY + "=jobName - use the specified mapreduce job name for the import\n" +<a name="line.692"></a>
-<span class="sourceLineNo">693</span> " -D" + CREATE_TABLE_CONF_KEY + "=no - can be used to avoid creation of table by this tool\n" +<a name="line.693"></a>
-<span class="sourceLineNo">694</span> " Note: if you set this to 'no', then the target table must already exist in HBase\n" +<a name="line.694"></a>
-<span class="sourceLineNo">695</span> " -D" + NO_STRICT_COL_FAMILY + "=true - ignore column family check in hbase table. " +<a name="line.695"></a>
-<span class="sourceLineNo">696</span> "Default is false\n\n" +<a name="line.696"></a>
-<span class="sourceLineNo">697</span> "For performance consider the following options:\n" +<a name="line.697"></a>
-<span class="sourceLineNo">698</span> " -Dmapreduce.map.speculative=false\n" +<a name="line.698"></a>
-<span class="sourceLineNo">699</span> " -Dmapreduce.reduce.speculative=false";<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> System.err.println(usage);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> @Override<a name="line.704"></a>
-<span class="sourceLineNo">705</span> public int run(String[] args) throws Exception {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> if (args.length < 2) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> usage("Wrong number of arguments: " + args.length);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> return -1;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span> // When MAPPER_CONF_KEY is null, the user wants to use the provided TsvImporterMapper, so<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // perform validation on these additional args. When it's not null, user has provided their<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // own mapper, thus these validation are not relevant.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> // TODO: validation for TsvImporterMapper, not this tool. Move elsewhere.<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (null == getConf().get(MAPPER_CONF_KEY)) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> // Make sure columns are specified<a name="line.716"></a>
-<span class="sourceLineNo">717</span> String[] columns = getConf().getStrings(COLUMNS_CONF_KEY);<a name="line.717"></a>
-<span class="sourceLineNo">718</span> if (columns == null) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> usage("No columns specified. Please specify with -D" +<a name="line.719"></a>
-<span class="sourceLineNo">720</span> COLUMNS_CONF_KEY+"=...");<a name="line.720"></a>
-<span class="sourceLineNo">721</span> return -1;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Make sure they specify exactly one column as the row key<a name="line.724"></a>
-<span class="sourceLineNo">725</span> int rowkeysFound = 0;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> for (String col : columns) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span> if (col.equals(TsvParser.ROWKEY_COLUMN_SPEC)) rowkeysFound++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span> }<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (rowkeysFound != 1) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> usage("Must specify exactly one column as " + TsvParser.ROWKEY_COLUMN_SPEC);<a name="line.730"></a>
-<span class="sourceLineNo">731</span> return -1;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> }<a name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span> // Make sure we have at most one column as the timestamp key<a name="line.734"></a>
-<span class="sourceLineNo">735</span> int tskeysFound = 0;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> for (String col : columns) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (col.equals(TsvParser.TIMESTAMPKEY_COLUMN_SPEC))<a name="line.737"></a>
-<span class="sourceLineNo">738</span> tskeysFound++;<a name="line.738"></a>
-<span class="sourceLineNo">739</span> }<a name="line.739"></a>
-<span class="sourceLineNo">740</span> if (tskeysFound > 1) {<a name="line.740"></a>
-<span class="sourceLineNo">741</span> usage("Must specify at most one column as "<a name="line.741"></a>
-<span class="sourceLineNo">742</span> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return -1;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> int attrKeysFound = 0;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> for (String col : columns) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (col.equals(TsvParser.ATTRIBUTES_COLUMN_SPEC))<a name="line.748"></a>
-<span class="sourceLineNo">749</span> attrKeysFound++;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> if (attrKeysFound > 1) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> usage("Must specify at most one column as "<a name="line.752"></a>
-<span class="sourceLineNo">753</span> + TsvParser.ATTRIBUTES_COLUMN_SPEC);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> return -1;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> }<a name="line.755"></a>
-<span class="sourceLineNo">756</span><a name="line.756"></a>
-<span class="sourceLineNo">757</span> // Make sure one or more columns are specified excluding rowkey and<a name="line.757"></a>
-<span class="sourceLineNo">758</span> // timestamp key<a name="line.758"></a>
-<span class="sourceLineNo">759</span> if (columns.length - (rowkeysFound + tskeysFound + attrKeysFound) < 1) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> usage("One or more columns in addition to the row key and timestamp(optional) are required");<a name="line.760"></a>
-<span class="sourceLineNo">761</span> return -1;<a name="line.761"></a>
-<span class="sourceLineNo">762</span> }<a name="line.762"></a>
-<span class="sourceLineNo">763</span> }<a name="line.763"></a>
-<span class="sourceLineNo">764</span><a name="line.764"></a>
-<span class="sourceLineNo">765</span> // If timestamp option is not specified, use current system time.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> long timstamp = getConf().getLong(TIMESTAMP_CONF_KEY, System.currentTimeMillis());<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span> // Set it back to replace invalid timestamp (non-numeric) with current<a name="line.768"></a>
-<span class="sourceLineNo">769</span> // system time<a name="line.769"></a>
-<span class="sourceLineNo">770</span> getConf().setLong(TIMESTAMP_CONF_KEY, timstamp);<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> synchronized (ImportTsv.class) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span> DRY_RUN_TABLE_CREATED = false;<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span> Job job = createSubmittableJob(getConf(), args);<a name="line.775"></a>
-<span class="sourceLineNo">776</span> boolean success = job.waitForCompletion(true);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> boolean delete = false;<a name="line.777"></a>
-<span class="sourceLineNo">778</span> synchronized (ImportTsv.class) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> delete = DRY_RUN_TABLE_CREATED;<a name="line.779"></a>
-<span class="sourceLineNo">780</span> }<a name="line.780"></a>
-<span class="sourceLineNo">781</span> if (delete) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span> deleteTable(getConf(), args);<a name="line.782"></a>
-<span class="sourceLineNo">783</span> }<a name="line.783"></a>
-<span class="sourceLineNo">784</span> return success ? 0 : 1;<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span> public static void main(String[] args) throws Exception {<a name="line.787"></a>
-<span class="sourceLineNo">788</span> int status = ToolRunner.run(HBaseConfiguration.create(), new ImportTsv(), args);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> System.exit(status);<a name="line.789"></a>
-<span class="sourceLineNo">790</span> }<a name="line.790"></a>
-<span class="sourceLineNo">791</span>}<a name="line.791"></a>
+<span class="sourceLineNo">094</span> public final static String SKIP_EMPTY_COLUMNS = "importtsv.skip.empty.columns";<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.97"></a>
+<span class="sourceLineNo">098</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.98"></a>
+<span class="sourceLineNo">099</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.102"></a>
+<span class="sourceLineNo">103</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * flipped to delete it when MR ends.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> public static class TsvParser {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Column families and qualifiers mapped to the TSV columns<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private final byte[][] families;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private final byte[][] qualifiers;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> private final byte separatorByte;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> private int rowKeyColumnIndex;<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> private int maxColumnCount;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Default value must be negative<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @param separatorStr<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // Configure separator<a name="line.159"></a>
+<span class="sourceLineNo">160</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Preconditions.checkArgument(separator.length == 1,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> "TsvParser only supports single-byte separators");<a name="line.162"></a>
+<span class="sourceLineNo">163</span> separatorByte = separator[0];<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Configure columns<a name="line.165"></a>
+<span class="sourceLineNo">166</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.166"></a>
+<span class="sourceLineNo">167</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> maxColumnCount = columnStrings.size();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> families = new byte[maxColumnCount][];<a name="line.170"></a>
+<span class="sourceLineNo">171</span> qualifiers = new byte[maxColumnCount][];<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String str = columnStrings.get(i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> rowKeyColumnIndex = i;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> continue;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> timestampKeyColumnIndex = i;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> continue;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> attrKeyColumnIndex = i;<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> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> cellVisibilityColumnIndex = i;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> continue;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cellTTLColumnIndex = i;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> continue;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> String[] parts = str.split(":", 2);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (parts.length == 1) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> families[i] = str.getBytes();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } else {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> families[i] = parts[0].getBytes();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> qualifiers[i] = parts[1].getBytes();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> public int getTimestampKeyColumnIndex() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return timestampKeyColumnIndex;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> public boolean hasAttributes() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> public boolean hasCellVisibility() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public boolean hasCellTTL() {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> public int getAttributesKeyColumnIndex() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return attrKeyColumnIndex;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> public int getCellVisibilityColumnIndex() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return cellVisibilityColumnIndex;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> public int getCellTTLColumnIndex() {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return cellTTLColumnIndex;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> public int getRowKeyColumnIndex() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return rowKeyColumnIndex;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> public byte[] getFamily(int idx) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return families[idx];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public byte[] getQualifier(int idx) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return qualifiers[idx];<a name="line.246"></a>
+<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> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> throws BadTsvLineException {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // Enumerate separator offsets<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (int i = 0; i < length; i++) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (lineBytes[i] == separatorByte) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> tabOffsets.add(i);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (tabOffsets.isEmpty()) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> throw new BadTsvLineException("No delimiter");<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> tabOffsets.add(length);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new BadTsvLineException("Excessive columns");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throw new BadTsvLineException("No row key");<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else if (hasTimestamp()<a name="line.268"></a>
+<span class="sourceLineNo">269</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> throw new BadTsvLineException("No timestamp");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new BadTsvLineException("No attributes specified");<a name="line.272"></a>
+<span class="sourceLineNo">273</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> class ParsedLine {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private final ArrayList<Integer> tabOffsets;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private byte[] lineBytes;<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">2
<TRUNCATED>
[04/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref-test/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html b/xref-test/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
index 4b3da36..c39d096 100644
--- a/xref-test/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
+++ b/xref-test/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
@@ -373,199 +373,212 @@
<a class="jxr_linenumber" name="363" href="#363">363</a> doMROnTableTest(util, tn, FAMILY, data, args, 1, 4);
<a class="jxr_linenumber" name="364" href="#364">364</a> util.deleteTable(tn);
<a class="jxr_linenumber" name="365" href="#365">365</a> }
-<a class="jxr_linenumber" name="366" href="#366">366</a>
-<a class="jxr_linenumber" name="367" href="#367">367</a> <strong class="jxr_keyword">private</strong> Tool doMROnTableTest(String data, <strong class="jxr_keyword">int</strong> valueMultiplier) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="368" href="#368">368</a> <strong class="jxr_keyword">return</strong> doMROnTableTest(util, tn, FAMILY, data, args, valueMultiplier,-1);
-<a class="jxr_linenumber" name="369" href="#369">369</a> }
-<a class="jxr_linenumber" name="370" href="#370">370</a>
-<a class="jxr_linenumber" name="371" href="#371">371</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> Tool doMROnTableTest(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> util, TableName table,
-<a class="jxr_linenumber" name="372" href="#372">372</a> String family, String data, Map<String, String> args) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="373" href="#373">373</a> <strong class="jxr_keyword">return</strong> doMROnTableTest(util, table, family, data, args, 1,-1);
-<a class="jxr_linenumber" name="374" href="#374">374</a> }
-<a class="jxr_linenumber" name="375" href="#375">375</a>
-<a class="jxr_linenumber" name="376" href="#376">376</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="377" href="#377">377</a> <em class="jxr_javadoccomment"> * Run an ImportTsv job and perform basic validation on the results.</em>
-<a class="jxr_linenumber" name="378" href="#378">378</a> <em class="jxr_javadoccomment"> * Returns the ImportTsv <code>Tool</code> instance so that other tests can</em>
-<a class="jxr_linenumber" name="379" href="#379">379</a> <em class="jxr_javadoccomment"> * inspect it for further validation as necessary. This method is static to</em>
-<a class="jxr_linenumber" name="380" href="#380">380</a> <em class="jxr_javadoccomment"> * insure non-reliance on instance's util/conf facilities.</em>
-<a class="jxr_linenumber" name="381" href="#381">381</a> <em class="jxr_javadoccomment"> * @param args Any arguments to pass BEFORE inputFile path is appended.</em>
-<a class="jxr_linenumber" name="382" href="#382">382</a> <em class="jxr_javadoccomment"> * @return The Tool instance used to run the test.</em>
-<a class="jxr_linenumber" name="383" href="#383">383</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="366" href="#366">366</a>
+<a class="jxr_linenumber" name="367" href="#367">367</a> @Test
+<a class="jxr_linenumber" name="368" href="#368">368</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSkipEmptyColumns() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="369" href="#369">369</a> Path bulkOutputPath = <strong class="jxr_keyword">new</strong> Path(util.getDataTestDirOnTestFS(tn.getNameAsString()), <span class="jxr_string">"hfiles"</span>);
+<a class="jxr_linenumber" name="370" href="#370">370</a> args.put(ImportTsv.BULK_OUTPUT_CONF_KEY, bulkOutputPath.toString());
+<a class="jxr_linenumber" name="371" href="#371">371</a> args.put(ImportTsv.COLUMNS_CONF_KEY, <span class="jxr_string">"HBASE_ROW_KEY,HBASE_TS_KEY,FAM:A,FAM:B"</span>);
+<a class="jxr_linenumber" name="372" href="#372">372</a> args.put(ImportTsv.SEPARATOR_CONF_KEY, <span class="jxr_string">","</span>);
+<a class="jxr_linenumber" name="373" href="#373">373</a> args.put(ImportTsv.SKIP_EMPTY_COLUMNS, <span class="jxr_string">"true"</span>);
+<a class="jxr_linenumber" name="374" href="#374">374</a> <em class="jxr_comment">// 2 Rows of data as input. Both rows are valid and only 3 columns are no-empty among 4</em>
+<a class="jxr_linenumber" name="375" href="#375">375</a> String data = <span class="jxr_string">"KEY,1234,VALUE1,VALUE2\nKEY,1235,,VALUE2\n"</span>;
+<a class="jxr_linenumber" name="376" href="#376">376</a> doMROnTableTest(util, tn, FAMILY, data, args, 1, 3);
+<a class="jxr_linenumber" name="377" href="#377">377</a> util.deleteTable(tn);
+<a class="jxr_linenumber" name="378" href="#378">378</a> }
+<a class="jxr_linenumber" name="379" href="#379">379</a>
+<a class="jxr_linenumber" name="380" href="#380">380</a> <strong class="jxr_keyword">private</strong> Tool doMROnTableTest(String data, <strong class="jxr_keyword">int</strong> valueMultiplier) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="381" href="#381">381</a> <strong class="jxr_keyword">return</strong> doMROnTableTest(util, tn, FAMILY, data, args, valueMultiplier,-1);
+<a class="jxr_linenumber" name="382" href="#382">382</a> }
+<a class="jxr_linenumber" name="383" href="#383">383</a>
<a class="jxr_linenumber" name="384" href="#384">384</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> Tool doMROnTableTest(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> util, TableName table,
-<a class="jxr_linenumber" name="385" href="#385">385</a> String family, String data, Map<String, String> args, <strong class="jxr_keyword">int</strong> valueMultiplier,<strong class="jxr_keyword">int</strong> expectedKVCount)
-<a class="jxr_linenumber" name="386" href="#386">386</a> <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="387" href="#387">387</a> Configuration conf = <strong class="jxr_keyword">new</strong> Configuration(util.getConfiguration());
+<a class="jxr_linenumber" name="385" href="#385">385</a> String family, String data, Map<String, String> args) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="386" href="#386">386</a> <strong class="jxr_keyword">return</strong> doMROnTableTest(util, table, family, data, args, 1,-1);
+<a class="jxr_linenumber" name="387" href="#387">387</a> }
<a class="jxr_linenumber" name="388" href="#388">388</a>
-<a class="jxr_linenumber" name="389" href="#389">389</a> <em class="jxr_comment">// populate input file</em>
-<a class="jxr_linenumber" name="390" href="#390">390</a> FileSystem fs = FileSystem.get(conf);
-<a class="jxr_linenumber" name="391" href="#391">391</a> Path inputPath = fs.makeQualified(
-<a class="jxr_linenumber" name="392" href="#392">392</a> <strong class="jxr_keyword">new</strong> Path(util.getDataTestDirOnTestFS(table.getNameAsString()), <span class="jxr_string">"input.dat"</span>));
-<a class="jxr_linenumber" name="393" href="#393">393</a> FSDataOutputStream op = fs.create(inputPath, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="394" href="#394">394</a> <strong class="jxr_keyword">if</strong> (data == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="395" href="#395">395</a> data = <span class="jxr_string">"KEY\u001bVALUE1\u001bVALUE2\n"</span>;
-<a class="jxr_linenumber" name="396" href="#396">396</a> }
-<a class="jxr_linenumber" name="397" href="#397">397</a> op.write(Bytes.toBytes(data));
-<a class="jxr_linenumber" name="398" href="#398">398</a> op.close();
-<a class="jxr_linenumber" name="399" href="#399">399</a> LOG.debug(String.format(<span class="jxr_string">"Wrote test data to file: %s"</span>, inputPath));
-<a class="jxr_linenumber" name="400" href="#400">400</a>
-<a class="jxr_linenumber" name="401" href="#401">401</a> <strong class="jxr_keyword">if</strong> (conf.getBoolean(FORCE_COMBINER_CONF, <strong class="jxr_keyword">true</strong>)) {
-<a class="jxr_linenumber" name="402" href="#402">402</a> LOG.debug(<span class="jxr_string">"Forcing combiner."</span>);
-<a class="jxr_linenumber" name="403" href="#403">403</a> conf.setInt(<span class="jxr_string">"mapreduce.map.combine.minspills"</span>, 1);
-<a class="jxr_linenumber" name="404" href="#404">404</a> }
-<a class="jxr_linenumber" name="405" href="#405">405</a>
-<a class="jxr_linenumber" name="406" href="#406">406</a> <em class="jxr_comment">// Build args array.</em>
-<a class="jxr_linenumber" name="407" href="#407">407</a> String[] argsArray = <strong class="jxr_keyword">new</strong> String[args.size() + 2];
-<a class="jxr_linenumber" name="408" href="#408">408</a> Iterator it = args.entrySet().iterator();
-<a class="jxr_linenumber" name="409" href="#409">409</a> <strong class="jxr_keyword">int</strong> i = 0;
-<a class="jxr_linenumber" name="410" href="#410">410</a> <strong class="jxr_keyword">while</strong> (it.hasNext()) {
-<a class="jxr_linenumber" name="411" href="#411">411</a> Map.Entry pair = (Map.Entry) it.next();
-<a class="jxr_linenumber" name="412" href="#412">412</a> argsArray[i] = <span class="jxr_string">"-D"</span> + pair.getKey() + <span class="jxr_string">"="</span> + pair.getValue();
-<a class="jxr_linenumber" name="413" href="#413">413</a> i++;
-<a class="jxr_linenumber" name="414" href="#414">414</a> }
-<a class="jxr_linenumber" name="415" href="#415">415</a> argsArray[i] = table.getNameAsString();
-<a class="jxr_linenumber" name="416" href="#416">416</a> argsArray[i + 1] = inputPath.toString();
-<a class="jxr_linenumber" name="417" href="#417">417</a>
-<a class="jxr_linenumber" name="418" href="#418">418</a> <em class="jxr_comment">// run the import</em>
-<a class="jxr_linenumber" name="419" href="#419">419</a> Tool tool = <strong class="jxr_keyword">new</strong> ImportTsv();
-<a class="jxr_linenumber" name="420" href="#420">420</a> LOG.debug(<span class="jxr_string">"Running ImportTsv with arguments: "</span> + argsArray);
-<a class="jxr_linenumber" name="421" href="#421">421</a> assertEquals(0, ToolRunner.run(conf, tool, argsArray));
-<a class="jxr_linenumber" name="422" href="#422">422</a>
-<a class="jxr_linenumber" name="423" href="#423">423</a> <em class="jxr_comment">// Perform basic validation. If the input args did not include</em>
-<a class="jxr_linenumber" name="424" href="#424">424</a> <em class="jxr_comment">// ImportTsv.BULK_OUTPUT_CONF_KEY then validate data in the table.</em>
-<a class="jxr_linenumber" name="425" href="#425">425</a> <em class="jxr_comment">// Otherwise, validate presence of hfiles.</em>
-<a class="jxr_linenumber" name="426" href="#426">426</a> <strong class="jxr_keyword">boolean</strong> isDryRun = args.containsKey(ImportTsv.DRY_RUN_CONF_KEY) &&
-<a class="jxr_linenumber" name="427" href="#427">427</a> <span class="jxr_string">"true"</span>.equalsIgnoreCase(args.get(ImportTsv.DRY_RUN_CONF_KEY));
-<a class="jxr_linenumber" name="428" href="#428">428</a> <strong class="jxr_keyword">if</strong> (args.containsKey(ImportTsv.BULK_OUTPUT_CONF_KEY)) {
-<a class="jxr_linenumber" name="429" href="#429">429</a> <strong class="jxr_keyword">if</strong> (isDryRun) {
-<a class="jxr_linenumber" name="430" href="#430">430</a> assertFalse(String.format(<span class="jxr_string">"Dry run mode, %s should not have been created."</span>,
-<a class="jxr_linenumber" name="431" href="#431">431</a> ImportTsv.BULK_OUTPUT_CONF_KEY),
-<a class="jxr_linenumber" name="432" href="#432">432</a> fs.exists(<strong class="jxr_keyword">new</strong> Path(ImportTsv.BULK_OUTPUT_CONF_KEY)));
-<a class="jxr_linenumber" name="433" href="#433">433</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="434" href="#434">434</a> validateHFiles(fs, args.get(ImportTsv.BULK_OUTPUT_CONF_KEY), family,expectedKVCount);
-<a class="jxr_linenumber" name="435" href="#435">435</a> }
-<a class="jxr_linenumber" name="436" href="#436">436</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="437" href="#437">437</a> validateTable(conf, table, family, valueMultiplier, isDryRun);
-<a class="jxr_linenumber" name="438" href="#438">438</a> }
-<a class="jxr_linenumber" name="439" href="#439">439</a>
-<a class="jxr_linenumber" name="440" href="#440">440</a> <strong class="jxr_keyword">if</strong> (conf.getBoolean(DELETE_AFTER_LOAD_CONF, <strong class="jxr_keyword">true</strong>)) {
-<a class="jxr_linenumber" name="441" href="#441">441</a> LOG.debug(<span class="jxr_string">"Deleting test subdirectory"</span>);
-<a class="jxr_linenumber" name="442" href="#442">442</a> util.cleanupDataTestDirOnTestFS(table.getNameAsString());
-<a class="jxr_linenumber" name="443" href="#443">443</a> }
-<a class="jxr_linenumber" name="444" href="#444">444</a> <strong class="jxr_keyword">return</strong> tool;
-<a class="jxr_linenumber" name="445" href="#445">445</a> }
-<a class="jxr_linenumber" name="446" href="#446">446</a>
-<a class="jxr_linenumber" name="447" href="#447">447</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="448" href="#448">448</a> <em class="jxr_javadoccomment"> * Confirm ImportTsv via data in online table.</em>
-<a class="jxr_linenumber" name="449" href="#449">449</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="450" href="#450">450</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> validateTable(Configuration conf, TableName tableName,
-<a class="jxr_linenumber" name="451" href="#451">451</a> String family, <strong class="jxr_keyword">int</strong> valueMultiplier, <strong class="jxr_keyword">boolean</strong> isDryRun) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="389" href="#389">389</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="390" href="#390">390</a> <em class="jxr_javadoccomment"> * Run an ImportTsv job and perform basic validation on the results.</em>
+<a class="jxr_linenumber" name="391" href="#391">391</a> <em class="jxr_javadoccomment"> * Returns the ImportTsv <code>Tool</code> instance so that other tests can</em>
+<a class="jxr_linenumber" name="392" href="#392">392</a> <em class="jxr_javadoccomment"> * inspect it for further validation as necessary. This method is static to</em>
+<a class="jxr_linenumber" name="393" href="#393">393</a> <em class="jxr_javadoccomment"> * insure non-reliance on instance's util/conf facilities.</em>
+<a class="jxr_linenumber" name="394" href="#394">394</a> <em class="jxr_javadoccomment"> * @param args Any arguments to pass BEFORE inputFile path is appended.</em>
+<a class="jxr_linenumber" name="395" href="#395">395</a> <em class="jxr_javadoccomment"> * @return The Tool instance used to run the test.</em>
+<a class="jxr_linenumber" name="396" href="#396">396</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="397" href="#397">397</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> Tool doMROnTableTest(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> util, TableName table,
+<a class="jxr_linenumber" name="398" href="#398">398</a> String family, String data, Map<String, String> args, <strong class="jxr_keyword">int</strong> valueMultiplier,<strong class="jxr_keyword">int</strong> expectedKVCount)
+<a class="jxr_linenumber" name="399" href="#399">399</a> <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="400" href="#400">400</a> Configuration conf = <strong class="jxr_keyword">new</strong> Configuration(util.getConfiguration());
+<a class="jxr_linenumber" name="401" href="#401">401</a>
+<a class="jxr_linenumber" name="402" href="#402">402</a> <em class="jxr_comment">// populate input file</em>
+<a class="jxr_linenumber" name="403" href="#403">403</a> FileSystem fs = FileSystem.get(conf);
+<a class="jxr_linenumber" name="404" href="#404">404</a> Path inputPath = fs.makeQualified(
+<a class="jxr_linenumber" name="405" href="#405">405</a> <strong class="jxr_keyword">new</strong> Path(util.getDataTestDirOnTestFS(table.getNameAsString()), <span class="jxr_string">"input.dat"</span>));
+<a class="jxr_linenumber" name="406" href="#406">406</a> FSDataOutputStream op = fs.create(inputPath, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="407" href="#407">407</a> <strong class="jxr_keyword">if</strong> (data == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="408" href="#408">408</a> data = <span class="jxr_string">"KEY\u001bVALUE1\u001bVALUE2\n"</span>;
+<a class="jxr_linenumber" name="409" href="#409">409</a> }
+<a class="jxr_linenumber" name="410" href="#410">410</a> op.write(Bytes.toBytes(data));
+<a class="jxr_linenumber" name="411" href="#411">411</a> op.close();
+<a class="jxr_linenumber" name="412" href="#412">412</a> LOG.debug(String.format(<span class="jxr_string">"Wrote test data to file: %s"</span>, inputPath));
+<a class="jxr_linenumber" name="413" href="#413">413</a>
+<a class="jxr_linenumber" name="414" href="#414">414</a> <strong class="jxr_keyword">if</strong> (conf.getBoolean(FORCE_COMBINER_CONF, <strong class="jxr_keyword">true</strong>)) {
+<a class="jxr_linenumber" name="415" href="#415">415</a> LOG.debug(<span class="jxr_string">"Forcing combiner."</span>);
+<a class="jxr_linenumber" name="416" href="#416">416</a> conf.setInt(<span class="jxr_string">"mapreduce.map.combine.minspills"</span>, 1);
+<a class="jxr_linenumber" name="417" href="#417">417</a> }
+<a class="jxr_linenumber" name="418" href="#418">418</a>
+<a class="jxr_linenumber" name="419" href="#419">419</a> <em class="jxr_comment">// Build args array.</em>
+<a class="jxr_linenumber" name="420" href="#420">420</a> String[] argsArray = <strong class="jxr_keyword">new</strong> String[args.size() + 2];
+<a class="jxr_linenumber" name="421" href="#421">421</a> Iterator it = args.entrySet().iterator();
+<a class="jxr_linenumber" name="422" href="#422">422</a> <strong class="jxr_keyword">int</strong> i = 0;
+<a class="jxr_linenumber" name="423" href="#423">423</a> <strong class="jxr_keyword">while</strong> (it.hasNext()) {
+<a class="jxr_linenumber" name="424" href="#424">424</a> Map.Entry pair = (Map.Entry) it.next();
+<a class="jxr_linenumber" name="425" href="#425">425</a> argsArray[i] = <span class="jxr_string">"-D"</span> + pair.getKey() + <span class="jxr_string">"="</span> + pair.getValue();
+<a class="jxr_linenumber" name="426" href="#426">426</a> i++;
+<a class="jxr_linenumber" name="427" href="#427">427</a> }
+<a class="jxr_linenumber" name="428" href="#428">428</a> argsArray[i] = table.getNameAsString();
+<a class="jxr_linenumber" name="429" href="#429">429</a> argsArray[i + 1] = inputPath.toString();
+<a class="jxr_linenumber" name="430" href="#430">430</a>
+<a class="jxr_linenumber" name="431" href="#431">431</a> <em class="jxr_comment">// run the import</em>
+<a class="jxr_linenumber" name="432" href="#432">432</a> Tool tool = <strong class="jxr_keyword">new</strong> ImportTsv();
+<a class="jxr_linenumber" name="433" href="#433">433</a> LOG.debug(<span class="jxr_string">"Running ImportTsv with arguments: "</span> + argsArray);
+<a class="jxr_linenumber" name="434" href="#434">434</a> assertEquals(0, ToolRunner.run(conf, tool, argsArray));
+<a class="jxr_linenumber" name="435" href="#435">435</a>
+<a class="jxr_linenumber" name="436" href="#436">436</a> <em class="jxr_comment">// Perform basic validation. If the input args did not include</em>
+<a class="jxr_linenumber" name="437" href="#437">437</a> <em class="jxr_comment">// ImportTsv.BULK_OUTPUT_CONF_KEY then validate data in the table.</em>
+<a class="jxr_linenumber" name="438" href="#438">438</a> <em class="jxr_comment">// Otherwise, validate presence of hfiles.</em>
+<a class="jxr_linenumber" name="439" href="#439">439</a> <strong class="jxr_keyword">boolean</strong> isDryRun = args.containsKey(ImportTsv.DRY_RUN_CONF_KEY) &&
+<a class="jxr_linenumber" name="440" href="#440">440</a> <span class="jxr_string">"true"</span>.equalsIgnoreCase(args.get(ImportTsv.DRY_RUN_CONF_KEY));
+<a class="jxr_linenumber" name="441" href="#441">441</a> <strong class="jxr_keyword">if</strong> (args.containsKey(ImportTsv.BULK_OUTPUT_CONF_KEY)) {
+<a class="jxr_linenumber" name="442" href="#442">442</a> <strong class="jxr_keyword">if</strong> (isDryRun) {
+<a class="jxr_linenumber" name="443" href="#443">443</a> assertFalse(String.format(<span class="jxr_string">"Dry run mode, %s should not have been created."</span>,
+<a class="jxr_linenumber" name="444" href="#444">444</a> ImportTsv.BULK_OUTPUT_CONF_KEY),
+<a class="jxr_linenumber" name="445" href="#445">445</a> fs.exists(<strong class="jxr_keyword">new</strong> Path(ImportTsv.BULK_OUTPUT_CONF_KEY)));
+<a class="jxr_linenumber" name="446" href="#446">446</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="447" href="#447">447</a> validateHFiles(fs, args.get(ImportTsv.BULK_OUTPUT_CONF_KEY), family,expectedKVCount);
+<a class="jxr_linenumber" name="448" href="#448">448</a> }
+<a class="jxr_linenumber" name="449" href="#449">449</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="450" href="#450">450</a> validateTable(conf, table, family, valueMultiplier, isDryRun);
+<a class="jxr_linenumber" name="451" href="#451">451</a> }
<a class="jxr_linenumber" name="452" href="#452">452</a>
-<a class="jxr_linenumber" name="453" href="#453">453</a> LOG.debug(<span class="jxr_string">"Validating table."</span>);
-<a class="jxr_linenumber" name="454" href="#454">454</a> Connection connection = ConnectionFactory.createConnection(conf);
-<a class="jxr_linenumber" name="455" href="#455">455</a> Table table = connection.getTable(tableName);
-<a class="jxr_linenumber" name="456" href="#456">456</a> <strong class="jxr_keyword">boolean</strong> verified = false;
-<a class="jxr_linenumber" name="457" href="#457">457</a> <strong class="jxr_keyword">long</strong> pause = conf.getLong(<span class="jxr_string">"hbase.client.pause"</span>, 5 * 1000);
-<a class="jxr_linenumber" name="458" href="#458">458</a> <strong class="jxr_keyword">int</strong> numRetries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 5);
-<a class="jxr_linenumber" name="459" href="#459">459</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < numRetries; i++) {
-<a class="jxr_linenumber" name="460" href="#460">460</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="461" href="#461">461</a> Scan scan = <strong class="jxr_keyword">new</strong> Scan();
-<a class="jxr_linenumber" name="462" href="#462">462</a> <em class="jxr_comment">// Scan entire family.</em>
-<a class="jxr_linenumber" name="463" href="#463">463</a> scan.addFamily(Bytes.toBytes(family));
-<a class="jxr_linenumber" name="464" href="#464">464</a> ResultScanner resScanner = table.getScanner(scan);
-<a class="jxr_linenumber" name="465" href="#465">465</a> <strong class="jxr_keyword">int</strong> numRows = 0;
-<a class="jxr_linenumber" name="466" href="#466">466</a> <strong class="jxr_keyword">for</strong> (Result res : resScanner) {
-<a class="jxr_linenumber" name="467" href="#467">467</a> numRows++;
-<a class="jxr_linenumber" name="468" href="#468">468</a> assertEquals(2, res.size());
-<a class="jxr_linenumber" name="469" href="#469">469</a> List<Cell> kvs = res.listCells();
-<a class="jxr_linenumber" name="470" href="#470">470</a> assertTrue(CellUtil.matchingRow(kvs.get(0), Bytes.toBytes(<span class="jxr_string">"KEY"</span>)));
-<a class="jxr_linenumber" name="471" href="#471">471</a> assertTrue(CellUtil.matchingRow(kvs.get(1), Bytes.toBytes(<span class="jxr_string">"KEY"</span>)));
-<a class="jxr_linenumber" name="472" href="#472">472</a> assertTrue(CellUtil.matchingValue(kvs.get(0), Bytes.toBytes(<span class="jxr_string">"VALUE"</span> + valueMultiplier)));
-<a class="jxr_linenumber" name="473" href="#473">473</a> assertTrue(CellUtil.matchingValue(kvs.get(1), Bytes.toBytes(<span class="jxr_string">"VALUE"</span> + 2 * valueMultiplier)));
-<a class="jxr_linenumber" name="474" href="#474">474</a> <em class="jxr_comment">// Only one result set is expected, so let it loop.</em>
-<a class="jxr_linenumber" name="475" href="#475">475</a> }
-<a class="jxr_linenumber" name="476" href="#476">476</a> <strong class="jxr_keyword">if</strong> (isDryRun) {
-<a class="jxr_linenumber" name="477" href="#477">477</a> assertEquals(0, numRows);
-<a class="jxr_linenumber" name="478" href="#478">478</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="479" href="#479">479</a> assertEquals(1, numRows);
-<a class="jxr_linenumber" name="480" href="#480">480</a> }
-<a class="jxr_linenumber" name="481" href="#481">481</a> verified = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="482" href="#482">482</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="483" href="#483">483</a> } <strong class="jxr_keyword">catch</strong> (NullPointerException e) {
-<a class="jxr_linenumber" name="484" href="#484">484</a> <em class="jxr_comment">// If here, a cell was empty. Presume its because updates came in</em>
-<a class="jxr_linenumber" name="485" href="#485">485</a> <em class="jxr_comment">// after the scanner had been opened. Wait a while and retry.</em>
-<a class="jxr_linenumber" name="486" href="#486">486</a> }
-<a class="jxr_linenumber" name="487" href="#487">487</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="488" href="#488">488</a> Thread.sleep(pause);
-<a class="jxr_linenumber" name="489" href="#489">489</a> } <strong class="jxr_keyword">catch</strong> (InterruptedException e) {
-<a class="jxr_linenumber" name="490" href="#490">490</a> <em class="jxr_comment">// continue</em>
-<a class="jxr_linenumber" name="491" href="#491">491</a> }
-<a class="jxr_linenumber" name="492" href="#492">492</a> }
-<a class="jxr_linenumber" name="493" href="#493">493</a> table.close();
-<a class="jxr_linenumber" name="494" href="#494">494</a> connection.close();
-<a class="jxr_linenumber" name="495" href="#495">495</a> assertTrue(verified);
-<a class="jxr_linenumber" name="496" href="#496">496</a> }
-<a class="jxr_linenumber" name="497" href="#497">497</a>
-<a class="jxr_linenumber" name="498" href="#498">498</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="499" href="#499">499</a> <em class="jxr_javadoccomment"> * Confirm ImportTsv via HFiles on fs.</em>
-<a class="jxr_linenumber" name="500" href="#500">500</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="501" href="#501">501</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> validateHFiles(FileSystem fs, String outputPath, String family,
-<a class="jxr_linenumber" name="502" href="#502">502</a> <strong class="jxr_keyword">int</strong> expectedKVCount) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="503" href="#503">503</a> <em class="jxr_comment">// validate number and content of output columns</em>
-<a class="jxr_linenumber" name="504" href="#504">504</a> LOG.debug(<span class="jxr_string">"Validating HFiles."</span>);
-<a class="jxr_linenumber" name="505" href="#505">505</a> Set<String> configFamilies = <strong class="jxr_keyword">new</strong> HashSet<String>();
-<a class="jxr_linenumber" name="506" href="#506">506</a> configFamilies.add(family);
-<a class="jxr_linenumber" name="507" href="#507">507</a> Set<String> foundFamilies = <strong class="jxr_keyword">new</strong> HashSet<String>();
-<a class="jxr_linenumber" name="508" href="#508">508</a> <strong class="jxr_keyword">int</strong> actualKVCount = 0;
-<a class="jxr_linenumber" name="509" href="#509">509</a> <strong class="jxr_keyword">for</strong> (FileStatus cfStatus : fs.listStatus(<strong class="jxr_keyword">new</strong> Path(outputPath), <strong class="jxr_keyword">new</strong> OutputFilesFilter())) {
-<a class="jxr_linenumber" name="510" href="#510">510</a> String[] elements = cfStatus.getPath().toString().split(Path.SEPARATOR);
-<a class="jxr_linenumber" name="511" href="#511">511</a> String cf = elements[elements.length - 1];
-<a class="jxr_linenumber" name="512" href="#512">512</a> foundFamilies.add(cf);
-<a class="jxr_linenumber" name="513" href="#513">513</a> assertTrue(
-<a class="jxr_linenumber" name="514" href="#514">514</a> String.format(
-<a class="jxr_linenumber" name="515" href="#515">515</a> <span class="jxr_string">"HFile output contains a column family (%s) not present in input families (%s)"</span>,
-<a class="jxr_linenumber" name="516" href="#516">516</a> cf, configFamilies),
-<a class="jxr_linenumber" name="517" href="#517">517</a> configFamilies.contains(cf));
-<a class="jxr_linenumber" name="518" href="#518">518</a> <strong class="jxr_keyword">for</strong> (FileStatus hfile : fs.listStatus(cfStatus.getPath())) {
-<a class="jxr_linenumber" name="519" href="#519">519</a> assertTrue(
-<a class="jxr_linenumber" name="520" href="#520">520</a> String.format(<span class="jxr_string">"HFile %s appears to contain no data."</span>, hfile.getPath()),
-<a class="jxr_linenumber" name="521" href="#521">521</a> hfile.getLen() > 0);
-<a class="jxr_linenumber" name="522" href="#522">522</a> <em class="jxr_comment">// count the number of KVs from all the hfiles</em>
-<a class="jxr_linenumber" name="523" href="#523">523</a> <strong class="jxr_keyword">if</strong> (expectedKVCount > -1) {
-<a class="jxr_linenumber" name="524" href="#524">524</a> actualKVCount += getKVCountFromHfile(fs, hfile.getPath());
-<a class="jxr_linenumber" name="525" href="#525">525</a> }
-<a class="jxr_linenumber" name="526" href="#526">526</a> }
-<a class="jxr_linenumber" name="527" href="#527">527</a> }
-<a class="jxr_linenumber" name="528" href="#528">528</a> assertTrue(String.format(<span class="jxr_string">"HFile output does not contain the input family '%s'."</span>, family),
-<a class="jxr_linenumber" name="529" href="#529">529</a> foundFamilies.contains(family));
-<a class="jxr_linenumber" name="530" href="#530">530</a> <strong class="jxr_keyword">if</strong> (expectedKVCount > -1) {
-<a class="jxr_linenumber" name="531" href="#531">531</a> assertTrue(String.format(
-<a class="jxr_linenumber" name="532" href="#532">532</a> <span class="jxr_string">"KV count in ouput hfile=<%d> doesn't match with expected KV count=<%d>"</span>, actualKVCount,
-<a class="jxr_linenumber" name="533" href="#533">533</a> expectedKVCount), actualKVCount == expectedKVCount);
-<a class="jxr_linenumber" name="534" href="#534">534</a> }
-<a class="jxr_linenumber" name="535" href="#535">535</a> }
-<a class="jxr_linenumber" name="536" href="#536">536</a>
-<a class="jxr_linenumber" name="537" href="#537">537</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="538" href="#538">538</a> <em class="jxr_javadoccomment"> * Method returns the total KVs in given hfile</em>
-<a class="jxr_linenumber" name="539" href="#539">539</a> <em class="jxr_javadoccomment"> * @param fs File System</em>
-<a class="jxr_linenumber" name="540" href="#540">540</a> <em class="jxr_javadoccomment"> * @param p HFile path</em>
-<a class="jxr_linenumber" name="541" href="#541">541</a> <em class="jxr_javadoccomment"> * @return KV count in the given hfile</em>
-<a class="jxr_linenumber" name="542" href="#542">542</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
-<a class="jxr_linenumber" name="543" href="#543">543</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="544" href="#544">544</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> getKVCountFromHfile(FileSystem fs, Path p) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="545" href="#545">545</a> Configuration conf = util.getConfiguration();
-<a class="jxr_linenumber" name="546" href="#546">546</a> HFile.Reader reader = HFile.createReader(fs, p, <strong class="jxr_keyword">new</strong> CacheConfig(conf), conf);
-<a class="jxr_linenumber" name="547" href="#547">547</a> reader.loadFileInfo();
-<a class="jxr_linenumber" name="548" href="#548">548</a> HFileScanner scanner = reader.getScanner(false, false);
-<a class="jxr_linenumber" name="549" href="#549">549</a> scanner.seekTo();
-<a class="jxr_linenumber" name="550" href="#550">550</a> <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="551" href="#551">551</a> <strong class="jxr_keyword">do</strong> {
-<a class="jxr_linenumber" name="552" href="#552">552</a> count++;
-<a class="jxr_linenumber" name="553" href="#553">553</a> } <strong class="jxr_keyword">while</strong> (scanner.next());
-<a class="jxr_linenumber" name="554" href="#554">554</a> reader.close();
-<a class="jxr_linenumber" name="555" href="#555">555</a> <strong class="jxr_keyword">return</strong> count;
-<a class="jxr_linenumber" name="556" href="#556">556</a> }
-<a class="jxr_linenumber" name="557" href="#557">557</a> }
-<a class="jxr_linenumber" name="558" href="#558">558</a>
+<a class="jxr_linenumber" name="453" href="#453">453</a> <strong class="jxr_keyword">if</strong> (conf.getBoolean(DELETE_AFTER_LOAD_CONF, <strong class="jxr_keyword">true</strong>)) {
+<a class="jxr_linenumber" name="454" href="#454">454</a> LOG.debug(<span class="jxr_string">"Deleting test subdirectory"</span>);
+<a class="jxr_linenumber" name="455" href="#455">455</a> util.cleanupDataTestDirOnTestFS(table.getNameAsString());
+<a class="jxr_linenumber" name="456" href="#456">456</a> }
+<a class="jxr_linenumber" name="457" href="#457">457</a> <strong class="jxr_keyword">return</strong> tool;
+<a class="jxr_linenumber" name="458" href="#458">458</a> }
+<a class="jxr_linenumber" name="459" href="#459">459</a>
+<a class="jxr_linenumber" name="460" href="#460">460</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="461" href="#461">461</a> <em class="jxr_javadoccomment"> * Confirm ImportTsv via data in online table.</em>
+<a class="jxr_linenumber" name="462" href="#462">462</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="463" href="#463">463</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> validateTable(Configuration conf, TableName tableName,
+<a class="jxr_linenumber" name="464" href="#464">464</a> String family, <strong class="jxr_keyword">int</strong> valueMultiplier, <strong class="jxr_keyword">boolean</strong> isDryRun) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="465" href="#465">465</a>
+<a class="jxr_linenumber" name="466" href="#466">466</a> LOG.debug(<span class="jxr_string">"Validating table."</span>);
+<a class="jxr_linenumber" name="467" href="#467">467</a> Connection connection = ConnectionFactory.createConnection(conf);
+<a class="jxr_linenumber" name="468" href="#468">468</a> Table table = connection.getTable(tableName);
+<a class="jxr_linenumber" name="469" href="#469">469</a> <strong class="jxr_keyword">boolean</strong> verified = false;
+<a class="jxr_linenumber" name="470" href="#470">470</a> <strong class="jxr_keyword">long</strong> pause = conf.getLong(<span class="jxr_string">"hbase.client.pause"</span>, 5 * 1000);
+<a class="jxr_linenumber" name="471" href="#471">471</a> <strong class="jxr_keyword">int</strong> numRetries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 5);
+<a class="jxr_linenumber" name="472" href="#472">472</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < numRetries; i++) {
+<a class="jxr_linenumber" name="473" href="#473">473</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="474" href="#474">474</a> Scan scan = <strong class="jxr_keyword">new</strong> Scan();
+<a class="jxr_linenumber" name="475" href="#475">475</a> <em class="jxr_comment">// Scan entire family.</em>
+<a class="jxr_linenumber" name="476" href="#476">476</a> scan.addFamily(Bytes.toBytes(family));
+<a class="jxr_linenumber" name="477" href="#477">477</a> ResultScanner resScanner = table.getScanner(scan);
+<a class="jxr_linenumber" name="478" href="#478">478</a> <strong class="jxr_keyword">int</strong> numRows = 0;
+<a class="jxr_linenumber" name="479" href="#479">479</a> <strong class="jxr_keyword">for</strong> (Result res : resScanner) {
+<a class="jxr_linenumber" name="480" href="#480">480</a> numRows++;
+<a class="jxr_linenumber" name="481" href="#481">481</a> assertEquals(2, res.size());
+<a class="jxr_linenumber" name="482" href="#482">482</a> List<Cell> kvs = res.listCells();
+<a class="jxr_linenumber" name="483" href="#483">483</a> assertTrue(CellUtil.matchingRow(kvs.get(0), Bytes.toBytes(<span class="jxr_string">"KEY"</span>)));
+<a class="jxr_linenumber" name="484" href="#484">484</a> assertTrue(CellUtil.matchingRow(kvs.get(1), Bytes.toBytes(<span class="jxr_string">"KEY"</span>)));
+<a class="jxr_linenumber" name="485" href="#485">485</a> assertTrue(CellUtil.matchingValue(kvs.get(0), Bytes.toBytes(<span class="jxr_string">"VALUE"</span> + valueMultiplier)));
+<a class="jxr_linenumber" name="486" href="#486">486</a> assertTrue(CellUtil.matchingValue(kvs.get(1), Bytes.toBytes(<span class="jxr_string">"VALUE"</span> + 2 * valueMultiplier)));
+<a class="jxr_linenumber" name="487" href="#487">487</a> <em class="jxr_comment">// Only one result set is expected, so let it loop.</em>
+<a class="jxr_linenumber" name="488" href="#488">488</a> }
+<a class="jxr_linenumber" name="489" href="#489">489</a> <strong class="jxr_keyword">if</strong> (isDryRun) {
+<a class="jxr_linenumber" name="490" href="#490">490</a> assertEquals(0, numRows);
+<a class="jxr_linenumber" name="491" href="#491">491</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="492" href="#492">492</a> assertEquals(1, numRows);
+<a class="jxr_linenumber" name="493" href="#493">493</a> }
+<a class="jxr_linenumber" name="494" href="#494">494</a> verified = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="495" href="#495">495</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="496" href="#496">496</a> } <strong class="jxr_keyword">catch</strong> (NullPointerException e) {
+<a class="jxr_linenumber" name="497" href="#497">497</a> <em class="jxr_comment">// If here, a cell was empty. Presume its because updates came in</em>
+<a class="jxr_linenumber" name="498" href="#498">498</a> <em class="jxr_comment">// after the scanner had been opened. Wait a while and retry.</em>
+<a class="jxr_linenumber" name="499" href="#499">499</a> }
+<a class="jxr_linenumber" name="500" href="#500">500</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="501" href="#501">501</a> Thread.sleep(pause);
+<a class="jxr_linenumber" name="502" href="#502">502</a> } <strong class="jxr_keyword">catch</strong> (InterruptedException e) {
+<a class="jxr_linenumber" name="503" href="#503">503</a> <em class="jxr_comment">// continue</em>
+<a class="jxr_linenumber" name="504" href="#504">504</a> }
+<a class="jxr_linenumber" name="505" href="#505">505</a> }
+<a class="jxr_linenumber" name="506" href="#506">506</a> table.close();
+<a class="jxr_linenumber" name="507" href="#507">507</a> connection.close();
+<a class="jxr_linenumber" name="508" href="#508">508</a> assertTrue(verified);
+<a class="jxr_linenumber" name="509" href="#509">509</a> }
+<a class="jxr_linenumber" name="510" href="#510">510</a>
+<a class="jxr_linenumber" name="511" href="#511">511</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="512" href="#512">512</a> <em class="jxr_javadoccomment"> * Confirm ImportTsv via HFiles on fs.</em>
+<a class="jxr_linenumber" name="513" href="#513">513</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="514" href="#514">514</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> validateHFiles(FileSystem fs, String outputPath, String family,
+<a class="jxr_linenumber" name="515" href="#515">515</a> <strong class="jxr_keyword">int</strong> expectedKVCount) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="516" href="#516">516</a> <em class="jxr_comment">// validate number and content of output columns</em>
+<a class="jxr_linenumber" name="517" href="#517">517</a> LOG.debug(<span class="jxr_string">"Validating HFiles."</span>);
+<a class="jxr_linenumber" name="518" href="#518">518</a> Set<String> configFamilies = <strong class="jxr_keyword">new</strong> HashSet<String>();
+<a class="jxr_linenumber" name="519" href="#519">519</a> configFamilies.add(family);
+<a class="jxr_linenumber" name="520" href="#520">520</a> Set<String> foundFamilies = <strong class="jxr_keyword">new</strong> HashSet<String>();
+<a class="jxr_linenumber" name="521" href="#521">521</a> <strong class="jxr_keyword">int</strong> actualKVCount = 0;
+<a class="jxr_linenumber" name="522" href="#522">522</a> <strong class="jxr_keyword">for</strong> (FileStatus cfStatus : fs.listStatus(<strong class="jxr_keyword">new</strong> Path(outputPath), <strong class="jxr_keyword">new</strong> OutputFilesFilter())) {
+<a class="jxr_linenumber" name="523" href="#523">523</a> String[] elements = cfStatus.getPath().toString().split(Path.SEPARATOR);
+<a class="jxr_linenumber" name="524" href="#524">524</a> String cf = elements[elements.length - 1];
+<a class="jxr_linenumber" name="525" href="#525">525</a> foundFamilies.add(cf);
+<a class="jxr_linenumber" name="526" href="#526">526</a> assertTrue(
+<a class="jxr_linenumber" name="527" href="#527">527</a> String.format(
+<a class="jxr_linenumber" name="528" href="#528">528</a> <span class="jxr_string">"HFile output contains a column family (%s) not present in input families (%s)"</span>,
+<a class="jxr_linenumber" name="529" href="#529">529</a> cf, configFamilies),
+<a class="jxr_linenumber" name="530" href="#530">530</a> configFamilies.contains(cf));
+<a class="jxr_linenumber" name="531" href="#531">531</a> <strong class="jxr_keyword">for</strong> (FileStatus hfile : fs.listStatus(cfStatus.getPath())) {
+<a class="jxr_linenumber" name="532" href="#532">532</a> assertTrue(
+<a class="jxr_linenumber" name="533" href="#533">533</a> String.format(<span class="jxr_string">"HFile %s appears to contain no data."</span>, hfile.getPath()),
+<a class="jxr_linenumber" name="534" href="#534">534</a> hfile.getLen() > 0);
+<a class="jxr_linenumber" name="535" href="#535">535</a> <em class="jxr_comment">// count the number of KVs from all the hfiles</em>
+<a class="jxr_linenumber" name="536" href="#536">536</a> <strong class="jxr_keyword">if</strong> (expectedKVCount > -1) {
+<a class="jxr_linenumber" name="537" href="#537">537</a> actualKVCount += getKVCountFromHfile(fs, hfile.getPath());
+<a class="jxr_linenumber" name="538" href="#538">538</a> }
+<a class="jxr_linenumber" name="539" href="#539">539</a> }
+<a class="jxr_linenumber" name="540" href="#540">540</a> }
+<a class="jxr_linenumber" name="541" href="#541">541</a> assertTrue(String.format(<span class="jxr_string">"HFile output does not contain the input family '%s'."</span>, family),
+<a class="jxr_linenumber" name="542" href="#542">542</a> foundFamilies.contains(family));
+<a class="jxr_linenumber" name="543" href="#543">543</a> <strong class="jxr_keyword">if</strong> (expectedKVCount > -1) {
+<a class="jxr_linenumber" name="544" href="#544">544</a> assertTrue(String.format(
+<a class="jxr_linenumber" name="545" href="#545">545</a> <span class="jxr_string">"KV count in ouput hfile=<%d> doesn't match with expected KV count=<%d>"</span>, actualKVCount,
+<a class="jxr_linenumber" name="546" href="#546">546</a> expectedKVCount), actualKVCount == expectedKVCount);
+<a class="jxr_linenumber" name="547" href="#547">547</a> }
+<a class="jxr_linenumber" name="548" href="#548">548</a> }
+<a class="jxr_linenumber" name="549" href="#549">549</a>
+<a class="jxr_linenumber" name="550" href="#550">550</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="551" href="#551">551</a> <em class="jxr_javadoccomment"> * Method returns the total KVs in given hfile</em>
+<a class="jxr_linenumber" name="552" href="#552">552</a> <em class="jxr_javadoccomment"> * @param fs File System</em>
+<a class="jxr_linenumber" name="553" href="#553">553</a> <em class="jxr_javadoccomment"> * @param p HFile path</em>
+<a class="jxr_linenumber" name="554" href="#554">554</a> <em class="jxr_javadoccomment"> * @return KV count in the given hfile</em>
+<a class="jxr_linenumber" name="555" href="#555">555</a> <em class="jxr_javadoccomment"> * @throws IOException</em>
+<a class="jxr_linenumber" name="556" href="#556">556</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="557" href="#557">557</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> getKVCountFromHfile(FileSystem fs, Path p) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="558" href="#558">558</a> Configuration conf = util.getConfiguration();
+<a class="jxr_linenumber" name="559" href="#559">559</a> HFile.Reader reader = HFile.createReader(fs, p, <strong class="jxr_keyword">new</strong> CacheConfig(conf), conf);
+<a class="jxr_linenumber" name="560" href="#560">560</a> reader.loadFileInfo();
+<a class="jxr_linenumber" name="561" href="#561">561</a> HFileScanner scanner = reader.getScanner(false, false);
+<a class="jxr_linenumber" name="562" href="#562">562</a> scanner.seekTo();
+<a class="jxr_linenumber" name="563" href="#563">563</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="564" href="#564">564</a> <strong class="jxr_keyword">do</strong> {
+<a class="jxr_linenumber" name="565" href="#565">565</a> count++;
+<a class="jxr_linenumber" name="566" href="#566">566</a> } <strong class="jxr_keyword">while</strong> (scanner.next());
+<a class="jxr_linenumber" name="567" href="#567">567</a> reader.close();
+<a class="jxr_linenumber" name="568" href="#568">568</a> <strong class="jxr_keyword">return</strong> count;
+<a class="jxr_linenumber" name="569" href="#569">569</a> }
+<a class="jxr_linenumber" name="570" href="#570">570</a> }
+<a class="jxr_linenumber" name="571" href="#571">571</a>
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
[07/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
index 385118d..3b498d7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
@@ -67,15 +67,15 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.63"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.65"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.65"></a>
<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager")})<a name="line.70"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,40 +116,40 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 22, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setMetaLocation(ServerName metaLocation)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 27, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setFormat(String format)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 22, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_metaLocation = metaLocation;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_metaLocation__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 27, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_format = format;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_format__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public ServerName getMetaLocation()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public String getFormat()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_metaLocation;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_format;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private ServerName m_metaLocation;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getMetaLocation__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private String m_format;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getFormat__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_format__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 29, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.129"></a>
+<span class="sourceLineNo">127</span> private boolean m_format__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // 28, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 29, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_assignmentManager = assignmentManager;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_assignmentManager__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 28, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_serverManager = serverManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_serverManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public AssignmentManager getAssignmentManager()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public ServerManager getServerManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_assignmentManager;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_serverManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private AssignmentManager m_assignmentManager;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private ServerManager m_serverManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_assignmentManager__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_serverManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span> private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
@@ -167,23 +167,23 @@
<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 27, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setFormat(String format)<a name="line.163"></a>
+<span class="sourceLineNo">162</span> // 24, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 27, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_format = format;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_format__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 24, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_deadServers = deadServers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_deadServers__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getFormat()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public Set<ServerName> getDeadServers()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_format;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_deadServers;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private String m_format;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getFormat__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private Set<ServerName> m_deadServers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getDeadServers__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_format__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_deadServers__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_format__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">178</span> private boolean m_deadServers__IsNotDefault;<a name="line.178"></a>
<span class="sourceLineNo">179</span> // 25, 1<a name="line.179"></a>
<span class="sourceLineNo">180</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
@@ -201,74 +201,74 @@
<span class="sourceLineNo">193</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
<span class="sourceLineNo">195</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 23, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setServers(List<ServerName> servers)<a name="line.197"></a>
+<span class="sourceLineNo">196</span> // 22, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setMetaLocation(ServerName metaLocation)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 23, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_servers = servers;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_servers__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 22, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_metaLocation = metaLocation;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_metaLocation__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public List<ServerName> getServers()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public ServerName getMetaLocation()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_servers;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_metaLocation;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private List<ServerName> m_servers;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getServers__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private ServerName m_metaLocation;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getMetaLocation__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_servers__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_metaLocation__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_servers__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_metaLocation__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 29, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 29, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_assignmentManager = assignmentManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public AssignmentManager getAssignmentManager()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_assignmentManager;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private AssignmentManager m_assignmentManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 26, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setFilter(String filter)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 26, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_filter = filter;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_filter__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public String getFilter()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_filter;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private String m_filter;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getFilter__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_filter__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 28, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setServerManager(ServerManager serverManager)<a name="line.248"></a>
+<span class="sourceLineNo">246</span> private boolean m_filter__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 28, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_serverManager = serverManager;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_serverManager__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServerManager getServerManager()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_serverManager;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private ServerManager m_serverManager;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getServerManager__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_serverManager__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_serverManager__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,17 +280,17 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<a name="line.272"></a>
<span class="sourceLineNo">273</span> }<a name="line.273"></a>
<span class="sourceLineNo">274</span> <a name="line.274"></a>
-<span class="sourceLineNo">275</span> protected ServerName metaLocation;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected String format;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setFormat(p_format);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected AssignmentManager assignmentManager;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected ServerManager serverManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span> <a name="line.288"></a>
@@ -301,10 +301,10 @@
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected String format;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected Set<ServerName> deadServers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setFormat(p_format);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
@@ -315,31 +315,31 @@
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected List<ServerName> servers;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected ServerName metaLocation;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setServers(p_servers);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected AssignmentManager assignmentManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<a name="line.321"></a>
<span class="sourceLineNo">322</span> }<a name="line.322"></a>
<span class="sourceLineNo">323</span> <a name="line.323"></a>
-<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected String filter;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setFilter(p_filter);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<a name="line.328"></a>
<span class="sourceLineNo">329</span> }<a name="line.329"></a>
<span class="sourceLineNo">330</span> <a name="line.330"></a>
-<span class="sourceLineNo">331</span> protected ServerManager serverManager;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setServerManager(p_serverManager);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<a name="line.335"></a>
<span class="sourceLineNo">336</span> }<a name="line.336"></a>
<span class="sourceLineNo">337</span> <a name="line.337"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index 385118d..3b498d7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -67,15 +67,15 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.63"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.65"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.65"></a>
<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager")})<a name="line.70"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,40 +116,40 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 22, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setMetaLocation(ServerName metaLocation)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 27, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setFormat(String format)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 22, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_metaLocation = metaLocation;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_metaLocation__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 27, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_format = format;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_format__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public ServerName getMetaLocation()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public String getFormat()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_metaLocation;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_format;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private ServerName m_metaLocation;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getMetaLocation__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private String m_format;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getFormat__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_format__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 29, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.129"></a>
+<span class="sourceLineNo">127</span> private boolean m_format__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // 28, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 29, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_assignmentManager = assignmentManager;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_assignmentManager__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 28, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_serverManager = serverManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_serverManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public AssignmentManager getAssignmentManager()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public ServerManager getServerManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_assignmentManager;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_serverManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private AssignmentManager m_assignmentManager;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private ServerManager m_serverManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_assignmentManager__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_serverManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span> private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
@@ -167,23 +167,23 @@
<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 27, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setFormat(String format)<a name="line.163"></a>
+<span class="sourceLineNo">162</span> // 24, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 27, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_format = format;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_format__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 24, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_deadServers = deadServers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_deadServers__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getFormat()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public Set<ServerName> getDeadServers()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_format;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_deadServers;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private String m_format;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getFormat__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private Set<ServerName> m_deadServers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getDeadServers__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_format__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_deadServers__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_format__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">178</span> private boolean m_deadServers__IsNotDefault;<a name="line.178"></a>
<span class="sourceLineNo">179</span> // 25, 1<a name="line.179"></a>
<span class="sourceLineNo">180</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
@@ -201,74 +201,74 @@
<span class="sourceLineNo">193</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
<span class="sourceLineNo">195</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 23, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setServers(List<ServerName> servers)<a name="line.197"></a>
+<span class="sourceLineNo">196</span> // 22, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setMetaLocation(ServerName metaLocation)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 23, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_servers = servers;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_servers__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 22, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_metaLocation = metaLocation;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_metaLocation__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public List<ServerName> getServers()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public ServerName getMetaLocation()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_servers;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_metaLocation;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private List<ServerName> m_servers;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getServers__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private ServerName m_metaLocation;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getMetaLocation__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_servers__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_metaLocation__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_servers__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_metaLocation__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 29, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 29, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_assignmentManager = assignmentManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public AssignmentManager getAssignmentManager()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_assignmentManager;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private AssignmentManager m_assignmentManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 26, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setFilter(String filter)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 26, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_filter = filter;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_filter__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public String getFilter()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_filter;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private String m_filter;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getFilter__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_filter__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 28, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setServerManager(ServerManager serverManager)<a name="line.248"></a>
+<span class="sourceLineNo">246</span> private boolean m_filter__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 28, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_serverManager = serverManager;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_serverManager__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServerManager getServerManager()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_serverManager;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private ServerManager m_serverManager;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getServerManager__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_serverManager__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_serverManager__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,17 +280,17 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<a name="line.272"></a>
<span class="sourceLineNo">273</span> }<a name="line.273"></a>
<span class="sourceLineNo">274</span> <a name="line.274"></a>
-<span class="sourceLineNo">275</span> protected ServerName metaLocation;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected String format;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setFormat(p_format);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected AssignmentManager assignmentManager;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected ServerManager serverManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span> <a name="line.288"></a>
@@ -301,10 +301,10 @@
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected String format;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected Set<ServerName> deadServers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setFormat(p_format);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
@@ -315,31 +315,31 @@
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected List<ServerName> servers;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected ServerName metaLocation;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setServers(p_servers);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected AssignmentManager assignmentManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<a name="line.321"></a>
<span class="sourceLineNo">322</span> }<a name="line.322"></a>
<span class="sourceLineNo">323</span> <a name="line.323"></a>
-<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected String filter;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setFilter(p_filter);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<a name="line.328"></a>
<span class="sourceLineNo">329</span> }<a name="line.329"></a>
<span class="sourceLineNo">330</span> <a name="line.330"></a>
-<span class="sourceLineNo">331</span> protected ServerManager serverManager;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setServerManager(p_serverManager);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<a name="line.335"></a>
<span class="sourceLineNo">336</span> }<a name="line.336"></a>
<span class="sourceLineNo">337</span> <a name="line.337"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index 9fe63ea..046f180 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -68,15 +68,15 @@
<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> private final HMaster master;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> private final ServerName metaLocation;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private final AssignmentManager assignmentManager;<a name="line.64"></a>
+<span class="sourceLineNo">063</span> private final String format;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> private final ServerManager serverManager;<a name="line.64"></a>
<span class="sourceLineNo">065</span> private final Map<String,Integer> frags;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private final String format;<a name="line.66"></a>
+<span class="sourceLineNo">066</span> private final Set<ServerName> deadServers;<a name="line.66"></a>
<span class="sourceLineNo">067</span> private final boolean catalogJanitorEnabled;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private final List<ServerName> servers;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private final String filter;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private final Set<ServerName> deadServers;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private final ServerManager serverManager;<a name="line.71"></a>
+<span class="sourceLineNo">068</span> private final ServerName metaLocation;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private final AssignmentManager assignmentManager;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private final String filter;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final List<ServerName> servers;<a name="line.71"></a>
<span class="sourceLineNo">072</span> // 68, 1<a name="line.72"></a>
<span class="sourceLineNo">073</span> <a name="line.73"></a>
<span class="sourceLineNo">074</span> public String formatZKString() {<a name="line.74"></a>
@@ -106,41 +106,41 @@
<span class="sourceLineNo">098</span><a name="line.98"></a>
<span class="sourceLineNo">099</span> protected static org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData p_implData)<a name="line.99"></a>
<span class="sourceLineNo">100</span> {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> if(! p_implData.getMetaLocation__IsNotDefault())<a name="line.101"></a>
+<span class="sourceLineNo">101</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> p_implData.setMetaLocation(null);<a name="line.103"></a>
+<span class="sourceLineNo">103</span> p_implData.setFormat("html");<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if(! p_implData.getAssignmentManager__IsNotDefault())<a name="line.105"></a>
+<span class="sourceLineNo">105</span> if(! p_implData.getServerManager__IsNotDefault())<a name="line.105"></a>
<span class="sourceLineNo">106</span> {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> p_implData.setAssignmentManager(null);<a name="line.107"></a>
+<span class="sourceLineNo">107</span> p_implData.setServerManager(null);<a name="line.107"></a>
<span class="sourceLineNo">108</span> }<a name="line.108"></a>
<span class="sourceLineNo">109</span> if(! p_implData.getFrags__IsNotDefault())<a name="line.109"></a>
<span class="sourceLineNo">110</span> {<a name="line.110"></a>
<span class="sourceLineNo">111</span> p_implData.setFrags(null);<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.113"></a>
+<span class="sourceLineNo">113</span> if(! p_implData.getDeadServers__IsNotDefault())<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> p_implData.setFormat("html");<a name="line.115"></a>
+<span class="sourceLineNo">115</span> p_implData.setDeadServers(null);<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
<span class="sourceLineNo">117</span> if(! p_implData.getCatalogJanitorEnabled__IsNotDefault())<a name="line.117"></a>
<span class="sourceLineNo">118</span> {<a name="line.118"></a>
<span class="sourceLineNo">119</span> p_implData.setCatalogJanitorEnabled(true);<a name="line.119"></a>
<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span> if(! p_implData.getServers__IsNotDefault())<a name="line.121"></a>
+<span class="sourceLineNo">121</span> if(! p_implData.getMetaLocation__IsNotDefault())<a name="line.121"></a>
<span class="sourceLineNo">122</span> {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> p_implData.setServers(null);<a name="line.123"></a>
+<span class="sourceLineNo">123</span> p_implData.setMetaLocation(null);<a name="line.123"></a>
<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.125"></a>
+<span class="sourceLineNo">125</span> if(! p_implData.getAssignmentManager__IsNotDefault())<a name="line.125"></a>
<span class="sourceLineNo">126</span> {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> p_implData.setFilter("general");<a name="line.127"></a>
+<span class="sourceLineNo">127</span> p_implData.setAssignmentManager(null);<a name="line.127"></a>
<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if(! p_implData.getDeadServers__IsNotDefault())<a name="line.129"></a>
+<span class="sourceLineNo">129</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> p_implData.setDeadServers(null);<a name="line.131"></a>
+<span class="sourceLineNo">131</span> p_implData.setFilter("general");<a name="line.131"></a>
<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if(! p_implData.getServerManager__IsNotDefault())<a name="line.133"></a>
+<span class="sourceLineNo">133</span> if(! p_implData.getServers__IsNotDefault())<a name="line.133"></a>
<span class="sourceLineNo">134</span> {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> p_implData.setServerManager(null);<a name="line.135"></a>
+<span class="sourceLineNo">135</span> p_implData.setServers(null);<a name="line.135"></a>
<span class="sourceLineNo">136</span> }<a name="line.136"></a>
<span class="sourceLineNo">137</span> return p_implData;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
@@ -148,15 +148,15 @@
<span class="sourceLineNo">140</span> {<a name="line.140"></a>
<span class="sourceLineNo">141</span> super(p_templateManager, __jamon_setOptionalArguments(p_implData));<a name="line.141"></a>
<span class="sourceLineNo">142</span> master = p_implData.getMaster();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> metaLocation = p_implData.getMetaLocation();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> assignmentManager = p_implData.getAssignmentManager();<a name="line.144"></a>
+<span class="sourceLineNo">143</span> format = p_implData.getFormat();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> serverManager = p_implData.getServerManager();<a name="line.144"></a>
<span class="sourceLineNo">145</span> frags = p_implData.getFrags();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> format = p_implData.getFormat();<a name="line.146"></a>
+<span class="sourceLineNo">146</span> deadServers = p_implData.getDeadServers();<a name="line.146"></a>
<span class="sourceLineNo">147</span> catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> servers = p_implData.getServers();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> filter = p_implData.getFilter();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> deadServers = p_implData.getDeadServers();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> serverManager = p_implData.getServerManager();<a name="line.151"></a>
+<span class="sourceLineNo">148</span> metaLocation = p_implData.getMetaLocation();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assignmentManager = p_implData.getAssignmentManager();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> filter = p_implData.getFilter();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> servers = p_implData.getServers();<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> @Override public void renderNoFlush(final java.io.Writer jamonWriter)<a name="line.154"></a>
@@ -170,8 +170,8 @@
<span class="sourceLineNo">162</span> // 60, 3<a name="line.162"></a>
<span class="sourceLineNo">163</span> {<a name="line.163"></a>
<span class="sourceLineNo">164</span> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__var_6 = new org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(this.getTemplateManager());<a name="line.164"></a>
-<span class="sourceLineNo">165</span> __jamon__var_6.setFormat("json" );<a name="line.165"></a>
-<span class="sourceLineNo">166</span> __jamon__var_6.setFilter(filter);<a name="line.166"></a>
+<span class="sourceLineNo">165</span> __jamon__var_6.setFilter(filter);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> __jamon__var_6.setFormat("json" );<a name="line.166"></a>
<span class="sourceLineNo">167</span> __jamon__var_6.renderNoFlush(jamonWriter);<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
<span class="sourceLineNo">169</span> // 60, 68<a name="line.169"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
index 278aefb..da81736 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
@@ -34,9 +34,9 @@
<span class="sourceLineNo">026</span> @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
<span class="sourceLineNo">027</span> optionalArguments = {<a name="line.27"></a>
<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.28"></a>
-<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.29"></a>
+<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "filter", type = "String")})<a name="line.31"></a>
<span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
<span class="sourceLineNo">033</span> extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
<span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -94,57 +94,57 @@
<span class="sourceLineNo">086</span> return m_bcn__IsNotDefault;<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
<span class="sourceLineNo">088</span> private boolean m_bcn__IsNotDefault;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // 24, 1<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void setBcv(String bcv)<a name="line.90"></a>
+<span class="sourceLineNo">089</span> // 22, 1<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void setFormat(String format)<a name="line.90"></a>
<span class="sourceLineNo">091</span> {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // 24, 1<a name="line.92"></a>
-<span class="sourceLineNo">093</span> m_bcv = bcv;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> m_bcv__IsNotDefault = true;<a name="line.94"></a>
+<span class="sourceLineNo">092</span> // 22, 1<a name="line.92"></a>
+<span class="sourceLineNo">093</span> m_format = format;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> m_format__IsNotDefault = true;<a name="line.94"></a>
<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public String getBcv()<a name="line.96"></a>
+<span class="sourceLineNo">096</span> public String getFormat()<a name="line.96"></a>
<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return m_bcv;<a name="line.98"></a>
+<span class="sourceLineNo">098</span> return m_format;<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private String m_bcv;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean getBcv__IsNotDefault()<a name="line.101"></a>
+<span class="sourceLineNo">100</span> private String m_format;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public boolean getFormat__IsNotDefault()<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return m_bcv__IsNotDefault;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> return m_format__IsNotDefault;<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private boolean m_bcv__IsNotDefault;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // 21, 1<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public void setFilter(String filter)<a name="line.107"></a>
+<span class="sourceLineNo">105</span> private boolean m_format__IsNotDefault;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // 24, 1<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setBcv(String bcv)<a name="line.107"></a>
<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // 21, 1<a name="line.109"></a>
-<span class="sourceLineNo">110</span> m_filter = filter;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> m_filter__IsNotDefault = true;<a name="line.111"></a>
+<span class="sourceLineNo">109</span> // 24, 1<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m_bcv = bcv;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> m_bcv__IsNotDefault = true;<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public String getFilter()<a name="line.113"></a>
+<span class="sourceLineNo">113</span> public String getBcv()<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m_filter;<a name="line.115"></a>
+<span class="sourceLineNo">115</span> return m_bcv;<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String m_filter;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean getFilter__IsNotDefault()<a name="line.118"></a>
+<span class="sourceLineNo">117</span> private String m_bcv;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean getBcv__IsNotDefault()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_filter__IsNotDefault;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_bcv__IsNotDefault;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private boolean m_filter__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // 22, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setFormat(String format)<a name="line.124"></a>
+<span class="sourceLineNo">122</span> private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // 21, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setFilter(String filter)<a name="line.124"></a>
<span class="sourceLineNo">125</span> {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // 22, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span> m_format = format;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> m_format__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span> // 21, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span> m_filter = filter;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> m_filter__IsNotDefault = true;<a name="line.128"></a>
<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public String getFormat()<a name="line.130"></a>
+<span class="sourceLineNo">130</span> public String getFilter()<a name="line.130"></a>
<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return m_format;<a name="line.132"></a>
+<span class="sourceLineNo">132</span> return m_filter;<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> private String m_format;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getFormat__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span> private String m_filter;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean getFilter__IsNotDefault()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_format__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_filter__IsNotDefault;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_format__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span> private boolean m_filter__IsNotDefault;<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> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -163,24 +163,24 @@
<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
<span class="sourceLineNo">156</span> }<a name="line.156"></a>
<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> protected String bcv;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.159"></a>
+<span class="sourceLineNo">158</span> protected String format;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.159"></a>
<span class="sourceLineNo">160</span> {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> (getImplData()).setBcv(p_bcv);<a name="line.161"></a>
+<span class="sourceLineNo">161</span> (getImplData()).setFormat(p_format);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
<span class="sourceLineNo">164</span> <a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected String filter;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.166"></a>
+<span class="sourceLineNo">165</span> protected String bcv;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.166"></a>
<span class="sourceLineNo">167</span> {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> (getImplData()).setFilter(p_filter);<a name="line.168"></a>
+<span class="sourceLineNo">168</span> (getImplData()).setBcv(p_bcv);<a name="line.168"></a>
<span class="sourceLineNo">169</span> return this;<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> protected String format;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
+<span class="sourceLineNo">172</span> protected String filter;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.173"></a>
<span class="sourceLineNo">174</span> {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> (getImplData()).setFormat(p_format);<a name="line.175"></a>
+<span class="sourceLineNo">175</span> (getImplData()).setFilter(p_filter);<a name="line.175"></a>
<span class="sourceLineNo">176</span> return this;<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>
[17/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
Published site at 9c832109458ced70d0db701e7f58ef41b1df0fc7.
Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/9bc06f81
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/9bc06f81
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/9bc06f81
Branch: refs/heads/asf-site
Commit: 9bc06f81ca3e36095fc3edc62f4fdc207de0a378
Parents: 1b9384b
Author: jenkins <bu...@apache.org>
Authored: Fri Feb 5 18:00:13 2016 +0000
Committer: Misty Stanley-Jones <ms...@cloudera.com>
Committed: Fri Feb 5 17:33:48 2016 -0800
----------------------------------------------------------------------
apache_hbase_reference_guide.pdf | 4 +-
apache_hbase_reference_guide.pdfmarks | 4 +-
apidocs/constant-values.html | 9 +-
apidocs/index-all.html | 2 +
.../hadoop/hbase/mapreduce/ImportTsv.html | 34 +-
.../hbase/mapreduce/TsvImporterMapper.html | 26 +-
.../hadoop/hbase/mapreduce/ImportTsv.html | 1398 +++++++++---------
.../hbase/mapreduce/TsvImporterMapper.html | 329 +++--
book.html | 2 +-
checkstyle-aggregate.html | 48 +-
devapidocs/constant-values.html | 9 +-
devapidocs/index-all.html | 6 +
...ImportTsv.TsvParser.BadTsvLineException.html | 6 +-
.../ImportTsv.TsvParser.ParsedLine.html | 42 +-
.../hbase/mapreduce/ImportTsv.TsvParser.html | 66 +-
.../hadoop/hbase/mapreduce/ImportTsv.html | 52 +-
.../hbase/mapreduce/TsvImporterMapper.html | 54 +-
.../tmpl/master/MasterStatusTmpl.ImplData.html | 210 +--
.../hbase/tmpl/master/MasterStatusTmpl.html | 84 +-
.../hbase/tmpl/master/MasterStatusTmplImpl.html | 42 +-
.../regionserver/RSStatusTmpl.ImplData.html | 90 +-
.../hbase/tmpl/regionserver/RSStatusTmpl.html | 36 +-
.../tmpl/regionserver/RSStatusTmplImpl.html | 18 +-
...ImportTsv.TsvParser.BadTsvLineException.html | 1398 +++++++++---------
.../ImportTsv.TsvParser.ParsedLine.html | 1398 +++++++++---------
.../hbase/mapreduce/ImportTsv.TsvParser.html | 1398 +++++++++---------
.../hadoop/hbase/mapreduce/ImportTsv.html | 1398 +++++++++---------
.../hbase/mapreduce/TsvImporterMapper.html | 329 +++--
.../tmpl/master/MasterStatusTmpl.ImplData.html | 210 +--
.../tmpl/master/MasterStatusTmpl.Intf.html | 210 +--
.../hbase/tmpl/master/MasterStatusTmpl.html | 210 +--
.../hbase/tmpl/master/MasterStatusTmplImpl.html | 60 +-
.../regionserver/RSStatusTmpl.ImplData.html | 90 +-
.../tmpl/regionserver/RSStatusTmpl.Intf.html | 90 +-
.../hbase/tmpl/regionserver/RSStatusTmpl.html | 90 +-
.../tmpl/regionserver/RSStatusTmplImpl.html | 28 +-
images/hbasecon2016-stacked.png | Bin 0 -> 24924 bytes
testdevapidocs/index-all.html | 2 +
.../hadoop/hbase/io/hfile/package-tree.html | 2 +-
.../hadoop/hbase/mapreduce/TestImportTsv.html | 34 +-
.../org/apache/hadoop/hbase/package-tree.html | 10 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
.../hadoop/hbase/regionserver/package-tree.html | 2 +-
.../apache/hadoop/hbase/test/package-tree.html | 4 +-
.../apache/hadoop/hbase/wal/package-tree.html | 2 +-
.../hadoop/hbase/mapreduce/TestImportTsv.html | 393 ++---
.../hadoop/hbase/mapreduce/TestImportTsv.html | 393 ++---
.../hadoop/hbase/mapreduce/ImportTsv.html | 1398 +++++++++---------
.../hbase/mapreduce/TsvImporterMapper.html | 329 +++--
.../hbase/tmpl/common/TaskMonitorTmpl.html | 60 +-
.../hbase/tmpl/common/TaskMonitorTmplImpl.html | 16 +-
.../hbase/tmpl/master/MasterStatusTmpl.html | 210 +--
.../hbase/tmpl/master/MasterStatusTmplImpl.html | 60 +-
.../hbase/tmpl/regionserver/RSStatusTmpl.html | 90 +-
.../tmpl/regionserver/RSStatusTmplImpl.html | 28 +-
55 files changed, 6326 insertions(+), 6189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 10d9d46..05b6499 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
/Author (Apache HBase Team)
/Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
/Producer (Apache HBase Team)
-/CreationDate (D:20160205151536+00'00')
-/ModDate (D:20160205151536+00'00')
+/CreationDate (D:20160205175452+00'00')
+/ModDate (D:20160205175452+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apache_hbase_reference_guide.pdfmarks
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdfmarks b/apache_hbase_reference_guide.pdfmarks
index a3925f5..38e8548 100644
--- a/apache_hbase_reference_guide.pdfmarks
+++ b/apache_hbase_reference_guide.pdfmarks
@@ -2,8 +2,8 @@
/Author (Apache HBase Team)
/Subject ()
/Keywords ()
- /ModDate (D:20160205151727)
- /CreationDate (D:20160205151727)
+ /ModDate (D:20160205175643)
+ /CreationDate (D:20160205175643)
/Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
/Producer ()
/DOCINFO pdfmark
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/apidocs/constant-values.html b/apidocs/constant-values.html
index 5f68710..d16cfe9 100644
--- a/apidocs/constant-values.html
+++ b/apidocs/constant-values.html
@@ -3407,13 +3407,20 @@
<td class="colLast"><code>"importtsv.separator"</code></td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_EMPTY_COLUMNS">
+<!-- -->
+</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_EMPTY_COLUMNS">SKIP_EMPTY_COLUMNS</a></code></td>
+<td class="colLast"><code>"importtsv.skip.empty.columns"</code></td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_LINES_CONF_KEY">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></code></td>
<td class="colLast"><code>"importtsv.skip.bad.lines"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.mapreduce.ImportTsv.TIMESTAMP_CONF_KEY">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/apidocs/index-all.html b/apidocs/index-all.html
index e9631f8..2f46e05 100644
--- a/apidocs/index-all.html
+++ b/apidocs/index-all.html
@@ -12649,6 +12649,8 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
</dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/filter/ParseConstants.html#SKIP_BUFFER">SKIP_BUFFER</a></span> - Static variable in class org.apache.hadoop.hbase.filter.<a href="./org/apache/hadoop/hbase/filter/ParseConstants.html" title="class in org.apache.hadoop.hbase.filter">ParseConstants</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_EMPTY_COLUMNS">SKIP_EMPTY_COLUMNS</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv</a></dt>
<dd> </dd>
<dt><a href="./org/apache/hadoop/hbase/filter/SkipFilter.html" title="class in org.apache.hadoop.hbase.filter"><span class="strong">SkipFilter</span></a> - Class in <a href="./org/apache/hadoop/hbase/filter/package-summary.html">org.apache.hadoop.hbase.filter</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html b/apidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
index c0b5cef..92a670e 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
@@ -182,10 +182,14 @@ implements org.apache.hadoop.util.Tool</pre>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></strong></code> </td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_EMPTY_COLUMNS">SKIP_EMPTY_COLUMNS</a></strong></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></strong></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#TIMESTAMP_CONF_KEY">TIMESTAMP_CONF_KEY</a></strong></code> </td>
</tr>
</table>
@@ -350,13 +354,23 @@ implements org.apache.hadoop.util.Tool</pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_LINES_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
+<a name="SKIP_EMPTY_COLUMNS">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SKIP_EMPTY_COLUMNS</h4>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.94">SKIP_EMPTY_COLUMNS</a></pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_EMPTY_COLUMNS">Constant Field Values</a></dd></dl>
+</li>
+</ul>
<a name="COLUMNS_CONF_KEY">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>COLUMNS_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.94">COLUMNS_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.95">COLUMNS_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.COLUMNS_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -366,7 +380,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>SEPARATOR_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.95">SEPARATOR_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.96">SEPARATOR_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.SEPARATOR_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -376,7 +390,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>ATTRIBUTE_SEPERATOR_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.96">ATTRIBUTE_SEPERATOR_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.97">ATTRIBUTE_SEPERATOR_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.ATTRIBUTE_SEPERATOR_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -386,7 +400,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>CREDENTIALS_LOCATION</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.99">CREDENTIALS_LOCATION</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.100">CREDENTIALS_LOCATION</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.CREDENTIALS_LOCATION">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -396,7 +410,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>CREATE_TABLE_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.104">CREATE_TABLE_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.105">CREATE_TABLE_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.CREATE_TABLE_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -406,7 +420,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>NO_STRICT_COL_FAMILY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.105">NO_STRICT_COL_FAMILY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.106">NO_STRICT_COL_FAMILY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.NO_STRICT_COL_FAMILY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -441,7 +455,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>createSubmittableJob</h4>
-<pre>protected static org.apache.hadoop.mapreduce.Job <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.462">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>protected static org.apache.hadoop.mapreduce.Job <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.463">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassNotFoundException.html?is-external=true" title="class or interface in java.lang">ClassNotFoundException</a></pre>
@@ -459,7 +473,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>run</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.705">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.707">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><strong>Specified by:</strong></dt>
@@ -474,7 +488,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.787">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.789">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html b/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
index d1705a8..cb36930 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -269,7 +269,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>parser</h4>
-<pre>protected org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.64">parser</a></pre>
+<pre>protected org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.66">parser</a></pre>
</li>
</ul>
<a name="conf">
@@ -278,7 +278,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>conf</h4>
-<pre>protected org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.66">conf</a></pre>
+<pre>protected org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.68">conf</a></pre>
</li>
</ul>
<a name="cellVisibilityExpr">
@@ -287,7 +287,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>cellVisibilityExpr</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.68">cellVisibilityExpr</a></pre>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.70">cellVisibilityExpr</a></pre>
</li>
</ul>
<a name="ttl">
@@ -296,7 +296,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>ttl</h4>
-<pre>protected long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.70">ttl</a></pre>
+<pre>protected long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.72">ttl</a></pre>
</li>
</ul>
<a name="kvCreator">
@@ -305,7 +305,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockListLast">
<li class="blockList">
<h4>kvCreator</h4>
-<pre>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.72">kvCreator</a></pre>
+<pre>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.74">kvCreator</a></pre>
</li>
</ul>
</li>
@@ -339,7 +339,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>getTs</h4>
-<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.79">getTs</a>()</pre>
+<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.81">getTs</a>()</pre>
</li>
</ul>
<a name="getSkipBadLines()">
@@ -348,7 +348,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>getSkipBadLines</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.83">getSkipBadLines</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.85">getSkipBadLines</a>()</pre>
</li>
</ul>
<a name="getBadLineCount()">
@@ -357,7 +357,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>getBadLineCount</h4>
-<pre>public org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.87">getBadLineCount</a>()</pre>
+<pre>public org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.89">getBadLineCount</a>()</pre>
</li>
</ul>
<a name="incrementBadLineCount(int)">
@@ -366,7 +366,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>incrementBadLineCount</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.91">incrementBadLineCount</a>(int count)</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.93">incrementBadLineCount</a>(int count)</pre>
</li>
</ul>
<a name="setup(org.apache.hadoop.mapreduce.Mapper.Context)">
@@ -375,7 +375,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>setup</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.104">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.106">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
<div class="block">Handles initializing this class with objects specific to it (i.e., the parser).
Common initialization that might be leveraged by a subsclass is done in
<code>doSetup</code>. Hence a subclass may choose to override this method
@@ -392,7 +392,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>doSetup</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.121">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.123">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
<div class="block">Handles common parameter initialization that a subclass might want to leverage.</div>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>context</code> - </dd></dl>
</li>
@@ -403,7 +403,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>map</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.147">map</a>(org.apache.hadoop.io.LongWritable offset,
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.151">map</a>(org.apache.hadoop.io.LongWritable offset,
org.apache.hadoop.io.Text value,
org.apache.hadoop.mapreduce.Mapper.Context context)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -421,7 +421,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockListLast">
<li class="blockList">
<h4>populatePut</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.203">populatePut</a>(byte[] lineBytes,
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.208">populatePut</a>(byte[] lineBytes,
org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.ParsedLine parsed,
<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a> put,
int i)
[13/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index 7d8b234..4ba80bd 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -323,22 +323,22 @@ extends org.jamon.AbstractTemplateProxy</pre>
<!-- -->
</a>
<h3>Field Detail</h3>
-<a name="metaLocation">
+<a name="format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>metaLocation</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.275">metaLocation</a></pre>
+<h4>format</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.275">format</a></pre>
</li>
</ul>
-<a name="assignmentManager">
+<a name="serverManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>assignmentManager</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.282">assignmentManager</a></pre>
+<h4>serverManager</h4>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.282">serverManager</a></pre>
</li>
</ul>
<a name="frags">
@@ -350,13 +350,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.289">frags</a></pre>
</li>
</ul>
-<a name="format">
+<a name="deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.296">format</a></pre>
+<h4>deadServers</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.296">deadServers</a></pre>
</li>
</ul>
<a name="catalogJanitorEnabled">
@@ -368,40 +368,40 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.303">catalogJanitorEnabled</a></pre>
</li>
</ul>
-<a name="servers">
+<a name="metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>servers</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.310">servers</a></pre>
+<h4>metaLocation</h4>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.310">metaLocation</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="assignmentManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.317">filter</a></pre>
+<h4>assignmentManager</h4>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.317">assignmentManager</a></pre>
</li>
</ul>
-<a name="deadServers">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>deadServers</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.324">deadServers</a></pre>
+<h4>filter</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.324">filter</a></pre>
</li>
</ul>
-<a name="serverManager">
+<a name="servers">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>serverManager</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.331">serverManager</a></pre>
+<h4>servers</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.331">servers</a></pre>
</li>
</ul>
</li>
@@ -473,22 +473,22 @@ extends org.jamon.AbstractTemplateProxy</pre>
</dl>
</li>
</ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.276">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> p_metaLocation)</pre>
+<h4>setFormat</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.276">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
</li>
</ul>
-<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
+<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setAssignmentManager</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.283">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> p_assignmentManager)</pre>
+<h4>setServerManager</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.283">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> p_serverManager)</pre>
</li>
</ul>
<a name="setFrags(java.util.Map)">
@@ -500,13 +500,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.290">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> p_frags)</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setDeadServers(java.util.Set)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.297">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
+<h4>setDeadServers</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.297">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_deadServers)</pre>
</li>
</ul>
<a name="setCatalogJanitorEnabled(boolean)">
@@ -518,40 +518,40 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.304">setCatalogJanitorEnabled</a>(boolean p_catalogJanitorEnabled)</pre>
</li>
</ul>
-<a name="setServers(java.util.List)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServers</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.311">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_servers)</pre>
+<h4>setMetaLocation</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.311">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> p_metaLocation)</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.318">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
+<h4>setAssignmentManager</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.318">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> p_assignmentManager)</pre>
</li>
</ul>
-<a name="setDeadServers(java.util.Set)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setDeadServers</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.325">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_deadServers)</pre>
+<h4>setFilter</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.325">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
</li>
</ul>
-<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
+<a name="setServers(java.util.List)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServerManager</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.332">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> p_serverManager)</pre>
+<h4>setServers</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.332">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_servers)</pre>
</li>
</ul>
<a name="constructImpl(java.lang.Class)">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index ad863a3..6aa468e 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -264,22 +264,22 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/Master
<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.62">master</a></pre>
</li>
</ul>
-<a name="metaLocation">
+<a name="format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>metaLocation</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.63">metaLocation</a></pre>
+<h4>format</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.63">format</a></pre>
</li>
</ul>
-<a name="assignmentManager">
+<a name="serverManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>assignmentManager</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.64">assignmentManager</a></pre>
+<h4>serverManager</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.64">serverManager</a></pre>
</li>
</ul>
<a name="frags">
@@ -291,13 +291,13 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/Master
<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.65">frags</a></pre>
</li>
</ul>
-<a name="format">
+<a name="deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.66">format</a></pre>
+<h4>deadServers</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.66">deadServers</a></pre>
</li>
</ul>
<a name="catalogJanitorEnabled">
@@ -309,40 +309,40 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/Master
<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.67">catalogJanitorEnabled</a></pre>
</li>
</ul>
-<a name="servers">
+<a name="metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>servers</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.68">servers</a></pre>
+<h4>metaLocation</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.68">metaLocation</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="assignmentManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.69">filter</a></pre>
+<h4>assignmentManager</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.69">assignmentManager</a></pre>
</li>
</ul>
-<a name="deadServers">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>deadServers</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.70">deadServers</a></pre>
+<h4>filter</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.70">filter</a></pre>
</li>
</ul>
-<a name="serverManager">
+<a name="servers">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>serverManager</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.71">serverManager</a></pre>
+<h4>servers</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.71">servers</a></pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
index 3cc438b..754b178 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
@@ -297,58 +297,58 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.88">m_bcn__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_bcv">
+<a name="m_format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_bcv</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.100">m_bcv</a></pre>
+<h4>m_format</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.100">m_format</a></pre>
</li>
</ul>
-<a name="m_bcv__IsNotDefault">
+<a name="m_format__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_bcv__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.105">m_bcv__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.105">m_format__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_filter">
+<a name="m_bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.117">m_filter</a></pre>
+<h4>m_bcv</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.117">m_bcv</a></pre>
</li>
</ul>
-<a name="m_filter__IsNotDefault">
+<a name="m_bcv__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.122">m_filter__IsNotDefault</a></pre>
+<h4>m_bcv__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.122">m_bcv__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_format">
+<a name="m_filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.134">m_format</a></pre>
+<h4>m_filter</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.134">m_filter</a></pre>
</li>
</ul>
-<a name="m_format__IsNotDefault">
+<a name="m_filter__IsNotDefault">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.139">m_format__IsNotDefault</a></pre>
+<h4>m_filter__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.139">m_filter__IsNotDefault</a></pre>
</li>
</ul>
</li>
@@ -421,85 +421,85 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.84">getBcn__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setBcv(java.lang.String)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setBcv</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.90">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> bcv)</pre>
+<h4>setFormat</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.90">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
</li>
</ul>
-<a name="getBcv()">
+<a name="getFormat()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getBcv</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.96">getBcv</a>()</pre>
+<h4>getFormat</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.96">getFormat</a>()</pre>
</li>
</ul>
-<a name="getBcv__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getBcv__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.101">getBcv__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.101">getFormat__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setBcv(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.107">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
+<h4>setBcv</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.107">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> bcv)</pre>
</li>
</ul>
-<a name="getFilter()">
+<a name="getBcv()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.113">getFilter</a>()</pre>
+<h4>getBcv</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.113">getBcv</a>()</pre>
</li>
</ul>
-<a name="getFilter__IsNotDefault()">
+<a name="getBcv__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.118">getFilter__IsNotDefault</a>()</pre>
+<h4>getBcv__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.118">getBcv__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.124">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
+<h4>setFilter</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.124">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
</li>
</ul>
-<a name="getFormat()">
+<a name="getFilter()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.130">getFormat</a>()</pre>
+<h4>getFilter</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.130">getFilter</a>()</pre>
</li>
</ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getFilter__IsNotDefault()">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.135">getFormat__IsNotDefault</a>()</pre>
+<h4>getFilter__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.135">getFilter__IsNotDefault</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index e5f0b41..25ec26c 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -292,31 +292,31 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.151">bcn</a></pre>
</li>
</ul>
-<a name="bcv">
+<a name="format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>bcv</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.158">bcv</a></pre>
+<h4>format</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.158">format</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.165">filter</a></pre>
+<h4>bcv</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.165">bcv</a></pre>
</li>
</ul>
-<a name="format">
+<a name="filter">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>format</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.172">format</a></pre>
+<h4>filter</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.172">filter</a></pre>
</li>
</ul>
</li>
@@ -397,31 +397,31 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.152">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcn)</pre>
</li>
</ul>
-<a name="setBcv(java.lang.String)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setBcv</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.159">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcv)</pre>
+<h4>setFormat</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.159">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setBcv(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.166">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
+<h4>setBcv</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.166">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcv)</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.173">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
+<h4>setFilter</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.173">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
</li>
</ul>
<a name="constructImpl(java.lang.Class)">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index 799fa18..c70a745 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -233,31 +233,31 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/
<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.29">bcn</a></pre>
</li>
</ul>
-<a name="bcv">
+<a name="format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>bcv</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.30">bcv</a></pre>
+<h4>format</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.30">format</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">filter</a></pre>
+<h4>bcv</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">bcv</a></pre>
</li>
</ul>
-<a name="format">
+<a name="filter">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>format</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">format</a></pre>
+<h4>filter</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">filter</a></pre>
</li>
</ul>
</li>
[08/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
index de127b0..3cc021f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -66,175 +66,180 @@
<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> 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">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<Tag> 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> * <code>doSetup</code>. Hence a subclass may choose to override this method<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * and call <code>doSetup</code> 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<Tag>();<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.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> skipBadLines = context.getConfiguration().getBoolean(<a name="line.136"></a>
-<span class="sourceLineNo">137</span> ImportTsv.SKIP_LINES_CONF_KEY, true);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> badLineCount = context.getCounter("ImportTsv", "Bad Lines");<a name="line.138"></a>
-<span class="sourceLineNo">139</span> logBadLines = context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, false);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> hfileOutPath = conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * Convert a line of TSV text into an HBase table row.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public void map(LongWritable offset, Text value,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> Context context)<a name="line.148"></a>
-<span class="sourceLineNo">149</span> throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> byte[] lineBytes = value.getBytes();<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> ImportTsv.TsvParser.ParsedLine parsed = parser.parse(<a name="line.153"></a>
-<span class="sourceLineNo">154</span> lineBytes, value.getLength());<a name="line.154"></a>
-<span class="sourceLineNo">155</span> ImmutableBytesWritable rowKey =<a name="line.155"></a>
-<span class="sourceLineNo">156</span> new ImmutableBytesWritable(lineBytes,<a name="line.156"></a>
-<span class="sourceLineNo">157</span> parsed.getRowKeyOffset(),<a name="line.157"></a>
-<span class="sourceLineNo">158</span> parsed.getRowKeyLength());<a name="line.158"></a>
-<span class="sourceLineNo">159</span> // Retrieve timestamp if exists<a name="line.159"></a>
-<span class="sourceLineNo">160</span> ts = parsed.getTimestamp(ts);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> cellVisibilityExpr = parsed.getCellVisibility();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> ttl = parsed.getCellTTL();<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // create tags for the parsed line<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (hfileOutPath != null) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> tags.clear();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (cellVisibilityExpr != null) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> tags.addAll(kvCreator.getVisibilityExpressionResolver().createVisibilityExpTags(<a name="line.168"></a>
-<span class="sourceLineNo">169</span> cellVisibilityExpr));<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // Add TTL directly to the KV so we can vary them when packing more than one KV<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // into puts<a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (ttl > 0) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> tags.add(new ArrayBackedTag(TagType.TTL_TAG_TYPE, Bytes.toBytes(ttl)));<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Put put = new Put(rowKey.copyBytes());<a name="line.177"></a>
-<span class="sourceLineNo">178</span> for (int i = 0; i < parsed.getColumnCount(); i++) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (i == parser.getRowKeyColumnIndex() || i == parser.getTimestampKeyColumnIndex()<a name="line.179"></a>
-<span class="sourceLineNo">180</span> || i == parser.getAttributesKeyColumnIndex() || i == parser.getCellVisibilityColumnIndex()<a name="line.180"></a>
-<span class="sourceLineNo">181</span> || i == parser.getCellTTLColumnIndex()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> continue;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> populatePut(lineBytes, parsed, put, i);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> context.write(rowKey, put);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> } catch (ImportTsv.TsvParser.BadTsvLineException | IllegalArgumentException<a name="line.187"></a>
-<span class="sourceLineNo">188</span> | InvalidLabelException badLine) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (logBadLines) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> System.err.println(value);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> System.err.println("Bad line at offset: " + offset.get() + ":\n" + badLine.getMessage());<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (skipBadLines) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> incrementBadLineCount(1);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return;<a name="line.195"></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<Tag> 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> * <code>doSetup</code>. Hence a subclass may choose to override this method<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * and call <code>doSetup</code> 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<Tag>();<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.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 > 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 < 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> && 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> throw new IOException(badLine);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } catch (InterruptedException e) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> e.printStackTrace();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> protected void populatePut(byte[] lineBytes, ImportTsv.TsvParser.ParsedLine parsed, Put put,<a name="line.203"></a>
-<span class="sourceLineNo">204</span> int i) throws BadTsvLineException, IOException {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Cell cell = null;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> if (hfileOutPath == null) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> cell = new KeyValue(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.207"></a>
-<span class="sourceLineNo">208</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.208"></a>
-<span class="sourceLineNo">209</span> parser.getQualifier(i).length, ts, KeyValue.Type.Put, lineBytes,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> parsed.getColumnOffset(i), parsed.getColumnLength(i));<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (cellVisibilityExpr != null) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> // We won't be validating the expression here. The Visibility CP will do<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // the validation<a name="line.213"></a>
-<span class="sourceLineNo">214</span> put.setCellVisibility(new CellVisibility(cellVisibilityExpr));<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (ttl > 0) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> put.setTTL(ttl);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> } else {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // Creating the KV which needs to be directly written to HFiles. Using the Facade<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // KVCreator for creation of kvs.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> cell = this.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.222"></a>
-<span class="sourceLineNo">223</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> parser.getQualifier(i).length, ts, lineBytes, parsed.getColumnOffset(i),<a name="line.224"></a>
-<span class="sourceLineNo">225</span> parsed.getColumnLength(i), tags);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> put.add(cell);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>}<a name="line.229"></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> e.printStackTrace();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<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> protected void populatePut(byte[] lineBytes, ImportTsv.TsvParser.ParsedLine parsed, Put put,<a name="line.208"></a>
+<span class="sourceLineNo">209</span> int i) throws BadTsvLineException, IOException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> Cell cell = null;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> if (hfileOutPath == null) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> cell = new KeyValue(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.212"></a>
+<span class="sourceLineNo">213</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.213"></a>
+<span class="sourceLineNo">214</span> parser.getQualifier(i).length, ts, KeyValue.Type.Put, lineBytes,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> parsed.getColumnOffset(i), parsed.getColumnLength(i));<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (cellVisibilityExpr != null) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> // We won't be validating the expression here. The Visibility CP will do<a name="line.217"></a>
+<span class="sourceLineNo">218</span> // the validation<a name="line.218"></a>
+<span class="sourceLineNo">219</span> put.setCellVisibility(new CellVisibility(cellVisibilityExpr));<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> if (ttl > 0) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> put.setTTL(ttl);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> } else {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Creating the KV which needs to be directly written to HFiles. Using the Facade<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // KVCreator for creation of kvs.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> cell = this.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.227"></a>
+<span class="sourceLineNo">228</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.228"></a>
+<span class="sourceLineNo">229</span> parser.getQualifier(i).length, ts, lineBytes, parsed.getColumnOffset(i),<a name="line.229"></a>
+<span class="sourceLineNo">230</span> parsed.getColumnLength(i), tags);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span> put.add(cell);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>}<a name="line.234"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index 385118d..3b498d7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -67,15 +67,15 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.63"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.65"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.65"></a>
<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager")})<a name="line.70"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,40 +116,40 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 22, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setMetaLocation(ServerName metaLocation)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 27, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setFormat(String format)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 22, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_metaLocation = metaLocation;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_metaLocation__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 27, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_format = format;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_format__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public ServerName getMetaLocation()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public String getFormat()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_metaLocation;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_format;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private ServerName m_metaLocation;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getMetaLocation__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private String m_format;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getFormat__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_format__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 29, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.129"></a>
+<span class="sourceLineNo">127</span> private boolean m_format__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // 28, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 29, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_assignmentManager = assignmentManager;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_assignmentManager__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 28, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_serverManager = serverManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_serverManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public AssignmentManager getAssignmentManager()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public ServerManager getServerManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_assignmentManager;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_serverManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private AssignmentManager m_assignmentManager;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private ServerManager m_serverManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_assignmentManager__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_serverManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span> private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
@@ -167,23 +167,23 @@
<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 27, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setFormat(String format)<a name="line.163"></a>
+<span class="sourceLineNo">162</span> // 24, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 27, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_format = format;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_format__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 24, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_deadServers = deadServers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_deadServers__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getFormat()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public Set<ServerName> getDeadServers()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_format;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_deadServers;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private String m_format;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getFormat__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private Set<ServerName> m_deadServers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getDeadServers__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_format__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_deadServers__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_format__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">178</span> private boolean m_deadServers__IsNotDefault;<a name="line.178"></a>
<span class="sourceLineNo">179</span> // 25, 1<a name="line.179"></a>
<span class="sourceLineNo">180</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
@@ -201,74 +201,74 @@
<span class="sourceLineNo">193</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
<span class="sourceLineNo">195</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 23, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setServers(List<ServerName> servers)<a name="line.197"></a>
+<span class="sourceLineNo">196</span> // 22, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setMetaLocation(ServerName metaLocation)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 23, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_servers = servers;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_servers__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 22, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_metaLocation = metaLocation;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_metaLocation__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public List<ServerName> getServers()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public ServerName getMetaLocation()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_servers;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_metaLocation;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private List<ServerName> m_servers;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getServers__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private ServerName m_metaLocation;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getMetaLocation__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_servers__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_metaLocation__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_servers__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_metaLocation__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 29, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 29, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_assignmentManager = assignmentManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public AssignmentManager getAssignmentManager()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_assignmentManager;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private AssignmentManager m_assignmentManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 26, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setFilter(String filter)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 26, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_filter = filter;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_filter__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public String getFilter()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_filter;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private String m_filter;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getFilter__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_filter__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 28, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setServerManager(ServerManager serverManager)<a name="line.248"></a>
+<span class="sourceLineNo">246</span> private boolean m_filter__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 28, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_serverManager = serverManager;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_serverManager__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServerManager getServerManager()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_serverManager;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private ServerManager m_serverManager;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getServerManager__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_serverManager__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_serverManager__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,17 +280,17 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<a name="line.272"></a>
<span class="sourceLineNo">273</span> }<a name="line.273"></a>
<span class="sourceLineNo">274</span> <a name="line.274"></a>
-<span class="sourceLineNo">275</span> protected ServerName metaLocation;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected String format;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setFormat(p_format);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected AssignmentManager assignmentManager;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected ServerManager serverManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span> <a name="line.288"></a>
@@ -301,10 +301,10 @@
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected String format;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected Set<ServerName> deadServers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setFormat(p_format);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
@@ -315,31 +315,31 @@
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected List<ServerName> servers;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected ServerName metaLocation;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setServers(p_servers);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected AssignmentManager assignmentManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<a name="line.321"></a>
<span class="sourceLineNo">322</span> }<a name="line.322"></a>
<span class="sourceLineNo">323</span> <a name="line.323"></a>
-<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected String filter;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setFilter(p_filter);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<a name="line.328"></a>
<span class="sourceLineNo">329</span> }<a name="line.329"></a>
<span class="sourceLineNo">330</span> <a name="line.330"></a>
-<span class="sourceLineNo">331</span> protected ServerManager serverManager;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setServerManager(p_serverManager);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<a name="line.335"></a>
<span class="sourceLineNo">336</span> }<a name="line.336"></a>
<span class="sourceLineNo">337</span> <a name="line.337"></a>
[05/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
index 4d1025b..ead7bbb 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
@@ -371,199 +371,212 @@
<span class="sourceLineNo">363</span> doMROnTableTest(util, tn, FAMILY, data, args, 1, 4);<a name="line.363"></a>
<span class="sourceLineNo">364</span> util.deleteTable(tn);<a name="line.364"></a>
<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> private Tool doMROnTableTest(String data, int valueMultiplier) throws Exception {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return doMROnTableTest(util, tn, FAMILY, data, args, valueMultiplier,-1);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> protected static Tool doMROnTableTest(HBaseTestingUtility util, TableName table,<a name="line.371"></a>
-<span class="sourceLineNo">372</span> String family, String data, Map<String, String> args) throws Exception {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return doMROnTableTest(util, table, family, data, args, 1,-1);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> /**<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * Run an ImportTsv job and perform basic validation on the results.<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * Returns the ImportTsv <code>Tool</code> instance so that other tests can<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * inspect it for further validation as necessary. This method is static to<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * insure non-reliance on instance's util/conf facilities.<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @param args Any arguments to pass BEFORE inputFile path is appended.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return The Tool instance used to run the test.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
+<span class="sourceLineNo">366</span> <a name="line.366"></a>
+<span class="sourceLineNo">367</span> @Test<a name="line.367"></a>
+<span class="sourceLineNo">368</span> public void testSkipEmptyColumns() throws Exception {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> Path bulkOutputPath = new Path(util.getDataTestDirOnTestFS(tn.getNameAsString()), "hfiles");<a name="line.369"></a>
+<span class="sourceLineNo">370</span> args.put(ImportTsv.BULK_OUTPUT_CONF_KEY, bulkOutputPath.toString());<a name="line.370"></a>
+<span class="sourceLineNo">371</span> args.put(ImportTsv.COLUMNS_CONF_KEY, "HBASE_ROW_KEY,HBASE_TS_KEY,FAM:A,FAM:B");<a name="line.371"></a>
+<span class="sourceLineNo">372</span> args.put(ImportTsv.SEPARATOR_CONF_KEY, ",");<a name="line.372"></a>
+<span class="sourceLineNo">373</span> args.put(ImportTsv.SKIP_EMPTY_COLUMNS, "true");<a name="line.373"></a>
+<span class="sourceLineNo">374</span> // 2 Rows of data as input. Both rows are valid and only 3 columns are no-empty among 4<a name="line.374"></a>
+<span class="sourceLineNo">375</span> String data = "KEY,1234,VALUE1,VALUE2\nKEY,1235,,VALUE2\n";<a name="line.375"></a>
+<span class="sourceLineNo">376</span> doMROnTableTest(util, tn, FAMILY, data, args, 1, 3);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> util.deleteTable(tn);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> private Tool doMROnTableTest(String data, int valueMultiplier) throws Exception {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> return doMROnTableTest(util, tn, FAMILY, data, args, valueMultiplier,-1);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
<span class="sourceLineNo">384</span> protected static Tool doMROnTableTest(HBaseTestingUtility util, TableName table,<a name="line.384"></a>
-<span class="sourceLineNo">385</span> String family, String data, Map<String, String> args, int valueMultiplier,int expectedKVCount)<a name="line.385"></a>
-<span class="sourceLineNo">386</span> throws Exception {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> Configuration conf = new Configuration(util.getConfiguration());<a name="line.387"></a>
+<span class="sourceLineNo">385</span> String family, String data, Map<String, String> args) throws Exception {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> return doMROnTableTest(util, table, family, data, args, 1,-1);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> // populate input file<a name="line.389"></a>
-<span class="sourceLineNo">390</span> FileSystem fs = FileSystem.get(conf);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> Path inputPath = fs.makeQualified(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> new Path(util.getDataTestDirOnTestFS(table.getNameAsString()), "input.dat"));<a name="line.392"></a>
-<span class="sourceLineNo">393</span> FSDataOutputStream op = fs.create(inputPath, true);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> if (data == null) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> data = "KEY\u001bVALUE1\u001bVALUE2\n";<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span> op.write(Bytes.toBytes(data));<a name="line.397"></a>
-<span class="sourceLineNo">398</span> op.close();<a name="line.398"></a>
-<span class="sourceLineNo">399</span> LOG.debug(String.format("Wrote test data to file: %s", inputPath));<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (conf.getBoolean(FORCE_COMBINER_CONF, true)) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> LOG.debug("Forcing combiner.");<a name="line.402"></a>
-<span class="sourceLineNo">403</span> conf.setInt("mapreduce.map.combine.minspills", 1);<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> // Build args array.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> String[] argsArray = new String[args.size() + 2];<a name="line.407"></a>
-<span class="sourceLineNo">408</span> Iterator it = args.entrySet().iterator();<a name="line.408"></a>
-<span class="sourceLineNo">409</span> int i = 0;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> while (it.hasNext()) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> Map.Entry pair = (Map.Entry) it.next();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> argsArray[i] = "-D" + pair.getKey() + "=" + pair.getValue();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> i++;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span> argsArray[i] = table.getNameAsString();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> argsArray[i + 1] = inputPath.toString();<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> // run the import<a name="line.418"></a>
-<span class="sourceLineNo">419</span> Tool tool = new ImportTsv();<a name="line.419"></a>
-<span class="sourceLineNo">420</span> LOG.debug("Running ImportTsv with arguments: " + argsArray);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> assertEquals(0, ToolRunner.run(conf, tool, argsArray));<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // Perform basic validation. If the input args did not include<a name="line.423"></a>
-<span class="sourceLineNo">424</span> // ImportTsv.BULK_OUTPUT_CONF_KEY then validate data in the table.<a name="line.424"></a>
-<span class="sourceLineNo">425</span> // Otherwise, validate presence of hfiles.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> boolean isDryRun = args.containsKey(ImportTsv.DRY_RUN_CONF_KEY) &&<a name="line.426"></a>
-<span class="sourceLineNo">427</span> "true".equalsIgnoreCase(args.get(ImportTsv.DRY_RUN_CONF_KEY));<a name="line.427"></a>
-<span class="sourceLineNo">428</span> if (args.containsKey(ImportTsv.BULK_OUTPUT_CONF_KEY)) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> if (isDryRun) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> assertFalse(String.format("Dry run mode, %s should not have been created.",<a name="line.430"></a>
-<span class="sourceLineNo">431</span> ImportTsv.BULK_OUTPUT_CONF_KEY),<a name="line.431"></a>
-<span class="sourceLineNo">432</span> fs.exists(new Path(ImportTsv.BULK_OUTPUT_CONF_KEY)));<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } else {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> validateHFiles(fs, args.get(ImportTsv.BULK_OUTPUT_CONF_KEY), family,expectedKVCount);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span> } else {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> validateTable(conf, table, family, valueMultiplier, isDryRun);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (conf.getBoolean(DELETE_AFTER_LOAD_CONF, true)) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> LOG.debug("Deleting test subdirectory");<a name="line.441"></a>
-<span class="sourceLineNo">442</span> util.cleanupDataTestDirOnTestFS(table.getNameAsString());<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return tool;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> /**<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * Confirm ImportTsv via data in online table.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> */<a name="line.449"></a>
-<span class="sourceLineNo">450</span> private static void validateTable(Configuration conf, TableName tableName,<a name="line.450"></a>
-<span class="sourceLineNo">451</span> String family, int valueMultiplier, boolean isDryRun) throws IOException {<a name="line.451"></a>
+<span class="sourceLineNo">389</span> /**<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * Run an ImportTsv job and perform basic validation on the results.<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * Returns the ImportTsv <code>Tool</code> instance so that other tests can<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * inspect it for further validation as necessary. This method is static to<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * insure non-reliance on instance's util/conf facilities.<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * @param args Any arguments to pass BEFORE inputFile path is appended.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * @return The Tool instance used to run the test.<a name="line.395"></a>
+<span class="sourceLineNo">396</span> */<a name="line.396"></a>
+<span class="sourceLineNo">397</span> protected static Tool doMROnTableTest(HBaseTestingUtility util, TableName table,<a name="line.397"></a>
+<span class="sourceLineNo">398</span> String family, String data, Map<String, String> args, int valueMultiplier,int expectedKVCount)<a name="line.398"></a>
+<span class="sourceLineNo">399</span> throws Exception {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> Configuration conf = new Configuration(util.getConfiguration());<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> // populate input file<a name="line.402"></a>
+<span class="sourceLineNo">403</span> FileSystem fs = FileSystem.get(conf);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> Path inputPath = fs.makeQualified(<a name="line.404"></a>
+<span class="sourceLineNo">405</span> new Path(util.getDataTestDirOnTestFS(table.getNameAsString()), "input.dat"));<a name="line.405"></a>
+<span class="sourceLineNo">406</span> FSDataOutputStream op = fs.create(inputPath, true);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> if (data == null) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> data = "KEY\u001bVALUE1\u001bVALUE2\n";<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span> op.write(Bytes.toBytes(data));<a name="line.410"></a>
+<span class="sourceLineNo">411</span> op.close();<a name="line.411"></a>
+<span class="sourceLineNo">412</span> LOG.debug(String.format("Wrote test data to file: %s", inputPath));<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> if (conf.getBoolean(FORCE_COMBINER_CONF, true)) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> LOG.debug("Forcing combiner.");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> conf.setInt("mapreduce.map.combine.minspills", 1);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> // Build args array.<a name="line.419"></a>
+<span class="sourceLineNo">420</span> String[] argsArray = new String[args.size() + 2];<a name="line.420"></a>
+<span class="sourceLineNo">421</span> Iterator it = args.entrySet().iterator();<a name="line.421"></a>
+<span class="sourceLineNo">422</span> int i = 0;<a name="line.422"></a>
+<span class="sourceLineNo">423</span> while (it.hasNext()) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> Map.Entry pair = (Map.Entry) it.next();<a name="line.424"></a>
+<span class="sourceLineNo">425</span> argsArray[i] = "-D" + pair.getKey() + "=" + pair.getValue();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> i++;<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> argsArray[i] = table.getNameAsString();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> argsArray[i + 1] = inputPath.toString();<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> // run the import<a name="line.431"></a>
+<span class="sourceLineNo">432</span> Tool tool = new ImportTsv();<a name="line.432"></a>
+<span class="sourceLineNo">433</span> LOG.debug("Running ImportTsv with arguments: " + argsArray);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> assertEquals(0, ToolRunner.run(conf, tool, argsArray));<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span> // Perform basic validation. If the input args did not include<a name="line.436"></a>
+<span class="sourceLineNo">437</span> // ImportTsv.BULK_OUTPUT_CONF_KEY then validate data in the table.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> // Otherwise, validate presence of hfiles.<a name="line.438"></a>
+<span class="sourceLineNo">439</span> boolean isDryRun = args.containsKey(ImportTsv.DRY_RUN_CONF_KEY) &&<a name="line.439"></a>
+<span class="sourceLineNo">440</span> "true".equalsIgnoreCase(args.get(ImportTsv.DRY_RUN_CONF_KEY));<a name="line.440"></a>
+<span class="sourceLineNo">441</span> if (args.containsKey(ImportTsv.BULK_OUTPUT_CONF_KEY)) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> if (isDryRun) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> assertFalse(String.format("Dry run mode, %s should not have been created.",<a name="line.443"></a>
+<span class="sourceLineNo">444</span> ImportTsv.BULK_OUTPUT_CONF_KEY),<a name="line.444"></a>
+<span class="sourceLineNo">445</span> fs.exists(new Path(ImportTsv.BULK_OUTPUT_CONF_KEY)));<a name="line.445"></a>
+<span class="sourceLineNo">446</span> } else {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> validateHFiles(fs, args.get(ImportTsv.BULK_OUTPUT_CONF_KEY), family,expectedKVCount);<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span> } else {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> validateTable(conf, table, family, valueMultiplier, isDryRun);<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> LOG.debug("Validating table.");<a name="line.453"></a>
-<span class="sourceLineNo">454</span> Connection connection = ConnectionFactory.createConnection(conf);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Table table = connection.getTable(tableName);<a name="line.455"></a>
-<span class="sourceLineNo">456</span> boolean verified = false;<a name="line.456"></a>
-<span class="sourceLineNo">457</span> long pause = conf.getLong("hbase.client.pause", 5 * 1000);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> int numRetries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 5);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> for (int i = 0; i < numRetries; i++) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> try {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> Scan scan = new Scan();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> // Scan entire family.<a name="line.462"></a>
-<span class="sourceLineNo">463</span> scan.addFamily(Bytes.toBytes(family));<a name="line.463"></a>
-<span class="sourceLineNo">464</span> ResultScanner resScanner = table.getScanner(scan);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> int numRows = 0;<a name="line.465"></a>
-<span class="sourceLineNo">466</span> for (Result res : resScanner) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> numRows++;<a name="line.467"></a>
-<span class="sourceLineNo">468</span> assertEquals(2, res.size());<a name="line.468"></a>
-<span class="sourceLineNo">469</span> List<Cell> kvs = res.listCells();<a name="line.469"></a>
-<span class="sourceLineNo">470</span> assertTrue(CellUtil.matchingRow(kvs.get(0), Bytes.toBytes("KEY")));<a name="line.470"></a>
-<span class="sourceLineNo">471</span> assertTrue(CellUtil.matchingRow(kvs.get(1), Bytes.toBytes("KEY")));<a name="line.471"></a>
-<span class="sourceLineNo">472</span> assertTrue(CellUtil.matchingValue(kvs.get(0), Bytes.toBytes("VALUE" + valueMultiplier)));<a name="line.472"></a>
-<span class="sourceLineNo">473</span> assertTrue(CellUtil.matchingValue(kvs.get(1), Bytes.toBytes("VALUE" + 2 * valueMultiplier)));<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // Only one result set is expected, so let it loop.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> if (isDryRun) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> assertEquals(0, numRows);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> } else {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> assertEquals(1, numRows);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span> verified = true;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> break;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> } catch (NullPointerException e) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> // If here, a cell was empty. Presume its because updates came in<a name="line.484"></a>
-<span class="sourceLineNo">485</span> // after the scanner had been opened. Wait a while and retry.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> }<a name="line.486"></a>
-<span class="sourceLineNo">487</span> try {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> Thread.sleep(pause);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> } catch (InterruptedException e) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> // continue<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> table.close();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> connection.close();<a name="line.494"></a>
-<span class="sourceLineNo">495</span> assertTrue(verified);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span><a name="line.497"></a>
-<span class="sourceLineNo">498</span> /**<a name="line.498"></a>
-<span class="sourceLineNo">499</span> * Confirm ImportTsv via HFiles on fs.<a name="line.499"></a>
-<span class="sourceLineNo">500</span> */<a name="line.500"></a>
-<span class="sourceLineNo">501</span> private static void validateHFiles(FileSystem fs, String outputPath, String family,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> int expectedKVCount) throws IOException {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> // validate number and content of output columns<a name="line.503"></a>
-<span class="sourceLineNo">504</span> LOG.debug("Validating HFiles.");<a name="line.504"></a>
-<span class="sourceLineNo">505</span> Set<String> configFamilies = new HashSet<String>();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> configFamilies.add(family);<a name="line.506"></a>
-<span class="sourceLineNo">507</span> Set<String> foundFamilies = new HashSet<String>();<a name="line.507"></a>
-<span class="sourceLineNo">508</span> int actualKVCount = 0;<a name="line.508"></a>
-<span class="sourceLineNo">509</span> for (FileStatus cfStatus : fs.listStatus(new Path(outputPath), new OutputFilesFilter())) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> String[] elements = cfStatus.getPath().toString().split(Path.SEPARATOR);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String cf = elements[elements.length - 1];<a name="line.511"></a>
-<span class="sourceLineNo">512</span> foundFamilies.add(cf);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> assertTrue(<a name="line.513"></a>
-<span class="sourceLineNo">514</span> String.format(<a name="line.514"></a>
-<span class="sourceLineNo">515</span> "HFile output contains a column family (%s) not present in input families (%s)",<a name="line.515"></a>
-<span class="sourceLineNo">516</span> cf, configFamilies),<a name="line.516"></a>
-<span class="sourceLineNo">517</span> configFamilies.contains(cf));<a name="line.517"></a>
-<span class="sourceLineNo">518</span> for (FileStatus hfile : fs.listStatus(cfStatus.getPath())) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> assertTrue(<a name="line.519"></a>
-<span class="sourceLineNo">520</span> String.format("HFile %s appears to contain no data.", hfile.getPath()),<a name="line.520"></a>
-<span class="sourceLineNo">521</span> hfile.getLen() > 0);<a name="line.521"></a>
-<span class="sourceLineNo">522</span> // count the number of KVs from all the hfiles<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (expectedKVCount > -1) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> actualKVCount += getKVCountFromHfile(fs, hfile.getPath());<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> }<a name="line.527"></a>
-<span class="sourceLineNo">528</span> assertTrue(String.format("HFile output does not contain the input family '%s'.", family),<a name="line.528"></a>
-<span class="sourceLineNo">529</span> foundFamilies.contains(family));<a name="line.529"></a>
-<span class="sourceLineNo">530</span> if (expectedKVCount > -1) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span> assertTrue(String.format(<a name="line.531"></a>
-<span class="sourceLineNo">532</span> "KV count in ouput hfile=<%d> doesn't match with expected KV count=<%d>", actualKVCount,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> expectedKVCount), actualKVCount == expectedKVCount);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> }<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> /**<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * Method returns the total KVs in given hfile<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @param fs File System<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param p HFile path<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * @return KV count in the given hfile<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @throws IOException<a name="line.542"></a>
-<span class="sourceLineNo">543</span> */<a name="line.543"></a>
-<span class="sourceLineNo">544</span> private static int getKVCountFromHfile(FileSystem fs, Path p) throws IOException {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> Configuration conf = util.getConfiguration();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> HFile.Reader reader = HFile.createReader(fs, p, new CacheConfig(conf), conf);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> reader.loadFileInfo();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> HFileScanner scanner = reader.getScanner(false, false);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> scanner.seekTo();<a name="line.549"></a>
-<span class="sourceLineNo">550</span> int count = 0;<a name="line.550"></a>
-<span class="sourceLineNo">551</span> do {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> count++;<a name="line.552"></a>
-<span class="sourceLineNo">553</span> } while (scanner.next());<a name="line.553"></a>
-<span class="sourceLineNo">554</span> reader.close();<a name="line.554"></a>
-<span class="sourceLineNo">555</span> return count;<a name="line.555"></a>
-<span class="sourceLineNo">556</span> }<a name="line.556"></a>
-<span class="sourceLineNo">557</span>}<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">453</span> if (conf.getBoolean(DELETE_AFTER_LOAD_CONF, true)) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> LOG.debug("Deleting test subdirectory");<a name="line.454"></a>
+<span class="sourceLineNo">455</span> util.cleanupDataTestDirOnTestFS(table.getNameAsString());<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span> return tool;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span> /**<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * Confirm ImportTsv via data in online table.<a name="line.461"></a>
+<span class="sourceLineNo">462</span> */<a name="line.462"></a>
+<span class="sourceLineNo">463</span> private static void validateTable(Configuration conf, TableName tableName,<a name="line.463"></a>
+<span class="sourceLineNo">464</span> String family, int valueMultiplier, boolean isDryRun) throws IOException {<a name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span> LOG.debug("Validating table.");<a name="line.466"></a>
+<span class="sourceLineNo">467</span> Connection connection = ConnectionFactory.createConnection(conf);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> Table table = connection.getTable(tableName);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> boolean verified = false;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> long pause = conf.getLong("hbase.client.pause", 5 * 1000);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> int numRetries = conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 5);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> for (int i = 0; i < numRetries; i++) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> try {<a name="line.473"></a>
+<span class="sourceLineNo">474</span> Scan scan = new Scan();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> // Scan entire family.<a name="line.475"></a>
+<span class="sourceLineNo">476</span> scan.addFamily(Bytes.toBytes(family));<a name="line.476"></a>
+<span class="sourceLineNo">477</span> ResultScanner resScanner = table.getScanner(scan);<a name="line.477"></a>
+<span class="sourceLineNo">478</span> int numRows = 0;<a name="line.478"></a>
+<span class="sourceLineNo">479</span> for (Result res : resScanner) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> numRows++;<a name="line.480"></a>
+<span class="sourceLineNo">481</span> assertEquals(2, res.size());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> List<Cell> kvs = res.listCells();<a name="line.482"></a>
+<span class="sourceLineNo">483</span> assertTrue(CellUtil.matchingRow(kvs.get(0), Bytes.toBytes("KEY")));<a name="line.483"></a>
+<span class="sourceLineNo">484</span> assertTrue(CellUtil.matchingRow(kvs.get(1), Bytes.toBytes("KEY")));<a name="line.484"></a>
+<span class="sourceLineNo">485</span> assertTrue(CellUtil.matchingValue(kvs.get(0), Bytes.toBytes("VALUE" + valueMultiplier)));<a name="line.485"></a>
+<span class="sourceLineNo">486</span> assertTrue(CellUtil.matchingValue(kvs.get(1), Bytes.toBytes("VALUE" + 2 * valueMultiplier)));<a name="line.486"></a>
+<span class="sourceLineNo">487</span> // Only one result set is expected, so let it loop.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (isDryRun) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> assertEquals(0, numRows);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> } else {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> assertEquals(1, numRows);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span> verified = true;<a name="line.494"></a>
+<span class="sourceLineNo">495</span> break;<a name="line.495"></a>
+<span class="sourceLineNo">496</span> } catch (NullPointerException e) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> // If here, a cell was empty. Presume its because updates came in<a name="line.497"></a>
+<span class="sourceLineNo">498</span> // after the scanner had been opened. Wait a while and retry.<a name="line.498"></a>
+<span class="sourceLineNo">499</span> }<a name="line.499"></a>
+<span class="sourceLineNo">500</span> try {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> Thread.sleep(pause);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> } catch (InterruptedException e) {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> // continue<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span> table.close();<a name="line.506"></a>
+<span class="sourceLineNo">507</span> connection.close();<a name="line.507"></a>
+<span class="sourceLineNo">508</span> assertTrue(verified);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Confirm ImportTsv via HFiles on fs.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> */<a name="line.513"></a>
+<span class="sourceLineNo">514</span> private static void validateHFiles(FileSystem fs, String outputPath, String family,<a name="line.514"></a>
+<span class="sourceLineNo">515</span> int expectedKVCount) throws IOException {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> // validate number and content of output columns<a name="line.516"></a>
+<span class="sourceLineNo">517</span> LOG.debug("Validating HFiles.");<a name="line.517"></a>
+<span class="sourceLineNo">518</span> Set<String> configFamilies = new HashSet<String>();<a name="line.518"></a>
+<span class="sourceLineNo">519</span> configFamilies.add(family);<a name="line.519"></a>
+<span class="sourceLineNo">520</span> Set<String> foundFamilies = new HashSet<String>();<a name="line.520"></a>
+<span class="sourceLineNo">521</span> int actualKVCount = 0;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> for (FileStatus cfStatus : fs.listStatus(new Path(outputPath), new OutputFilesFilter())) {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> String[] elements = cfStatus.getPath().toString().split(Path.SEPARATOR);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> String cf = elements[elements.length - 1];<a name="line.524"></a>
+<span class="sourceLineNo">525</span> foundFamilies.add(cf);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> assertTrue(<a name="line.526"></a>
+<span class="sourceLineNo">527</span> String.format(<a name="line.527"></a>
+<span class="sourceLineNo">528</span> "HFile output contains a column family (%s) not present in input families (%s)",<a name="line.528"></a>
+<span class="sourceLineNo">529</span> cf, configFamilies),<a name="line.529"></a>
+<span class="sourceLineNo">530</span> configFamilies.contains(cf));<a name="line.530"></a>
+<span class="sourceLineNo">531</span> for (FileStatus hfile : fs.listStatus(cfStatus.getPath())) {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> assertTrue(<a name="line.532"></a>
+<span class="sourceLineNo">533</span> String.format("HFile %s appears to contain no data.", hfile.getPath()),<a name="line.533"></a>
+<span class="sourceLineNo">534</span> hfile.getLen() > 0);<a name="line.534"></a>
+<span class="sourceLineNo">535</span> // count the number of KVs from all the hfiles<a name="line.535"></a>
+<span class="sourceLineNo">536</span> if (expectedKVCount > -1) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> actualKVCount += getKVCountFromHfile(fs, hfile.getPath());<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span> assertTrue(String.format("HFile output does not contain the input family '%s'.", family),<a name="line.541"></a>
+<span class="sourceLineNo">542</span> foundFamilies.contains(family));<a name="line.542"></a>
+<span class="sourceLineNo">543</span> if (expectedKVCount > -1) {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> assertTrue(String.format(<a name="line.544"></a>
+<span class="sourceLineNo">545</span> "KV count in ouput hfile=<%d> doesn't match with expected KV count=<%d>", actualKVCount,<a name="line.545"></a>
+<span class="sourceLineNo">546</span> expectedKVCount), actualKVCount == expectedKVCount);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> }<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span><a name="line.549"></a>
+<span class="sourceLineNo">550</span> /**<a name="line.550"></a>
+<span class="sourceLineNo">551</span> * Method returns the total KVs in given hfile<a name="line.551"></a>
+<span class="sourceLineNo">552</span> * @param fs File System<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * @param p HFile path<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * @return KV count in the given hfile<a name="line.554"></a>
+<span class="sourceLineNo">555</span> * @throws IOException<a name="line.555"></a>
+<span class="sourceLineNo">556</span> */<a name="line.556"></a>
+<span class="sourceLineNo">557</span> private static int getKVCountFromHfile(FileSystem fs, Path p) throws IOException {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> Configuration conf = util.getConfiguration();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> HFile.Reader reader = HFile.createReader(fs, p, new CacheConfig(conf), conf);<a name="line.559"></a>
+<span class="sourceLineNo">560</span> reader.loadFileInfo();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> HFileScanner scanner = reader.getScanner(false, false);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> scanner.seekTo();<a name="line.562"></a>
+<span class="sourceLineNo">563</span> int count = 0;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> do {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> count++;<a name="line.565"></a>
+<span class="sourceLineNo">566</span> } while (scanner.next());<a name="line.566"></a>
+<span class="sourceLineNo">567</span> reader.close();<a name="line.567"></a>
+<span class="sourceLineNo">568</span> return count;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> }<a name="line.569"></a>
+<span class="sourceLineNo">570</span>}<a name="line.570"></a>
+<span class="sourceLineNo">571</span><a name="line.571"></a>
[09/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
index 4b7d070..f29d477 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
@@ -99,704 +99,706 @@
<span class="sourceLineNo">091</span> // If true, bad lines are logged to stderr. Default: false.<a name="line.91"></a>
<span class="sourceLineNo">092</span> public final static String LOG_BAD_LINES_CONF_KEY = "importtsv.log.bad.lines";<a name="line.92"></a>
<span class="sourceLineNo">093</span> public final static String SKIP_LINES_CONF_KEY = "importtsv.skip.bad.lines";<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.96"></a>
-<span class="sourceLineNo">097</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.97"></a>
-<span class="sourceLineNo">098</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.99"></a>
-<span class="sourceLineNo">100</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.102"></a>
-<span class="sourceLineNo">103</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.105"></a>
-<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * flipped to delete it when MR ends.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static class TsvParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Column families and qualifiers mapped to the TSV columns<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private final byte[][] families;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private final byte[][] qualifiers;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> private final byte separatorByte;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> private int rowKeyColumnIndex;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> private int maxColumnCount;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Default value must be negative<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @param separatorStr<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // Configure separator<a name="line.158"></a>
-<span class="sourceLineNo">159</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> Preconditions.checkArgument(separator.length == 1,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> "TsvParser only supports single-byte separators");<a name="line.161"></a>
-<span class="sourceLineNo">162</span> separatorByte = separator[0];<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Configure columns<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> maxColumnCount = columnStrings.size();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> families = new byte[maxColumnCount][];<a name="line.169"></a>
-<span class="sourceLineNo">170</span> qualifiers = new byte[maxColumnCount][];<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> String str = columnStrings.get(i);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rowKeyColumnIndex = i;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> continue;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> timestampKeyColumnIndex = i;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> continue;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> attrKeyColumnIndex = i;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> continue;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> cellVisibilityColumnIndex = i;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> continue;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> cellTTLColumnIndex = i;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> continue;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> String[] parts = str.split(":", 2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (parts.length == 1) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> families[i] = str.getBytes();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } else {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> families[i] = parts[0].getBytes();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> qualifiers[i] = parts[1].getBytes();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<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> public int getTimestampKeyColumnIndex() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return timestampKeyColumnIndex;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> public boolean hasAttributes() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> public boolean hasCellVisibility() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasCellTTL() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> public int getAttributesKeyColumnIndex() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return attrKeyColumnIndex;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public int getCellVisibilityColumnIndex() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return cellVisibilityColumnIndex;<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">233</span> public int getCellTTLColumnIndex() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return cellTTLColumnIndex;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> public int getRowKeyColumnIndex() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return rowKeyColumnIndex;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> public byte[] getFamily(int idx) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return families[idx];<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public byte[] getQualifier(int idx) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return qualifiers[idx];<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> throws BadTsvLineException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // Enumerate separator offsets<a name="line.250"></a>
-<span class="sourceLineNo">251</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < length; i++) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (lineBytes[i] == separatorByte) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> tabOffsets.add(i);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (tabOffsets.isEmpty()) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> throw new BadTsvLineException("No delimiter");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> tabOffsets.add(length);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> throw new BadTsvLineException("Excessive columns");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throw new BadTsvLineException("No row key");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> } else if (hasTimestamp()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new BadTsvLineException("No timestamp");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new BadTsvLineException("No attributes specified");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.273"></a>
-<span class="sourceLineNo">274</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> class ParsedLine {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> private final ArrayList<Integer> tabOffsets;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private byte[] lineBytes;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ParsedLine(ArrayList<Integer> tabOffsets, byte[] lineBytes) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.tabOffsets = tabOffsets;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.lineBytes = lineBytes;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> public int getRowKeyOffset() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return getColumnOffset(rowKeyColumnIndex);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public int getRowKeyLength() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return getColumnLength(rowKeyColumnIndex);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> public long getTimestamp(long ts) throws BadTsvLineException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // Return ts if HBASE_TS_KEY is not configured in column spec<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (!hasTimestamp()) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return ts;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> String timeStampStr = Bytes.toString(lineBytes,<a name="line.302"></a>
-<span class="sourceLineNo">303</span> getColumnOffset(timestampKeyColumnIndex),<a name="line.303"></a>
-<span class="sourceLineNo">304</span> getColumnLength(timestampKeyColumnIndex));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return Long.parseLong(timeStampStr);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> } catch (NumberFormatException nfe) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // treat this record as bad record<a name="line.308"></a>
-<span class="sourceLineNo">309</span> throw new BadTsvLineException("Invalid timestamp " + timeStampStr);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> private String getAttributes() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (!hasAttributes()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return Bytes.toString(lineBytes, getColumnOffset(attrKeyColumnIndex),<a name="line.317"></a>
-<span class="sourceLineNo">318</span> getColumnLength(attrKeyColumnIndex));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public String[] getIndividualAttributes() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> String attributes = getAttributes();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (attributes != null) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return attributes.split(DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return null;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> public int getAttributeKeyOffset() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (hasAttributes()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return getColumnOffset(attrKeyColumnIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> public int getAttributeKeyLength() {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (hasAttributes()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return getColumnLength(attrKeyColumnIndex);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> public int getCellVisibilityColumnOffset() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (hasCellVisibility()) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return getColumnOffset(cellVisibilityColumnIndex);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> public int getCellVisibilityColumnLength() {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> if (hasCellVisibility()) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return getColumnLength(cellVisibilityColumnIndex);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> } else {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> public String getCellVisibility() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (!hasCellVisibility()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return null;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return Bytes.toString(lineBytes, getColumnOffset(cellVisibilityColumnIndex),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> getColumnLength(cellVisibilityColumnIndex));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> public int getCellTTLColumnOffset() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (hasCellTTL()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return getColumnOffset(cellTTLColumnIndex);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } else {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> public int getCellTTLColumnLength() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (hasCellTTL()) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return getColumnLength(cellTTLColumnIndex);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> public long getCellTTL() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (!hasCellTTL()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return 0;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } else {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return Bytes.toLong(lineBytes, getColumnOffset(cellTTLColumnIndex),<a name="line.392"></a>
-<span class="sourceLineNo">393</span> getColumnLength(cellTTLColumnIndex));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> public int getColumnOffset(int idx) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (idx > 0)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return tabOffsets.get(idx - 1) + 1;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> else<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return 0;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public int getColumnLength(int idx) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return tabOffsets.get(idx) - getColumnOffset(idx);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> public int getColumnCount() {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return tabOffsets.size();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public byte[] getLineBytes() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return lineBytes;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> public static class BadTsvLineException extends Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public BadTsvLineException(String err) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super(err);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> private static final long serialVersionUID = 1L;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Return starting position and length of row key from the specified line bytes.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * @param lineBytes<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * @param length<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * @return Pair of row key offset and length.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * @throws BadTsvLineException<a name="line.426"></a>
-<span class="sourceLineNo">427</span> */<a name="line.427"></a>
-<span class="sourceLineNo">428</span> public Pair<Integer, Integer> parseRowKey(byte[] lineBytes, int length)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> throws BadTsvLineException {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> int rkColumnIndex = 0;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> int startPos = 0, endPos = 0;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (int i = 0; i <= length; i++) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (i == length || lineBytes[i] == separatorByte) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> endPos = i - 1;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (rkColumnIndex++ == getRowKeyColumnIndex()) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if ((endPos + 1) == startPos) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throw new BadTsvLineException("Empty value for ROW KEY.");<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> startPos = endPos + 2;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (i == length) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> throw new BadTsvLineException(<a name="line.445"></a>
-<span class="sourceLineNo">446</span> "Row key does not exist as number of columns in the line"<a name="line.446"></a>
-<span class="sourceLineNo">447</span> + " are less than row key position.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return new Pair<Integer, Integer>(startPos, endPos - startPos + 1);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Sets up the actual job.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param conf The current configuration.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param args The command line parameters.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @return The newly created job.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @throws IOException When setting up the job fails.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> throws IOException, ClassNotFoundException {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Job job = null;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> boolean isDryRun = conf.getBoolean(DRY_RUN_CONF_KEY, false);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try (Connection connection = ConnectionFactory.createConnection(conf)) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> try (Admin admin = connection.getAdmin()) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> // Support non-XML supported characters<a name="line.468"></a>
-<span class="sourceLineNo">469</span> // by re-encoding the passed separator as a Base64 string.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (actualSeparator != null) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> // See if a non-default Mapper was set<a name="line.476"></a>
-<span class="sourceLineNo">477</span> String mapperClassName = conf.get(MAPPER_CONF_KEY);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Class mapperClass = mapperClassName != null? Class.forName(mapperClassName): DEFAULT_MAPPER;<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> Path inputDir = new Path(args[1]);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + "_" + tableName.getNameAsString());<a name="line.482"></a>
-<span class="sourceLineNo">483</span> job = Job.getInstance(conf, jobName);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> job.setJarByClass(mapperClass);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> FileInputFormat.setInputPaths(job, inputDir);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> job.setInputFormatClass(TextInputFormat.class);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> job.setMapperClass(mapperClass);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> String[] columns = conf.getStrings(COLUMNS_CONF_KEY);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> String fileLoc = conf.get(CREDENTIALS_LOCATION);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> job.getCredentials().addAll(cred);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (hfileOutPath != null) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (!admin.tableExists(tableName)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> LOG.warn(format("Table '%s' does not exist.", tableName));<a name="line.499"></a>
-<span class="sourceLineNo">500</span> if ("yes".equalsIgnoreCase(conf.get(CREATE_TABLE_CONF_KEY, "yes"))) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> // TODO: this is backwards. Instead of depending on the existence of a table,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // create a sane splits file for HFileOutputFormat based on data sampling.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> createTable(admin, tableName, columns);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (isDryRun) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> LOG.warn("Dry run: Table will be deleted at end of dry run.");<a name="line.505"></a>
-<span class="sourceLineNo">506</span> synchronized (ImportTsv.class) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> DRY_RUN_TABLE_CREATED = true;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String errorMsg =<a name="line.511"></a>
-<span class="sourceLineNo">512</span> format("Table '%s' does not exist and '%s' is set to no.", tableName,<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CREATE_TABLE_CONF_KEY);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> LOG.error(errorMsg);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> throw new TableNotFoundException(errorMsg);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> try (Table table = connection.getTable(tableName);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> RegionLocator regionLocator = connection.getRegionLocator(tableName)) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> boolean noStrict = conf.getBoolean(NO_STRICT_COL_FAMILY, false);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> // if no.strict is false then check column family<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if(!noStrict) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> ArrayList<String> unmatchedFamilies = new ArrayList<String>();<a name="line.523"></a>
-<span class="sourceLineNo">524</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> HTableDescriptor tDesc = table.getTableDescriptor();<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (String cf : cfSet) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> if(tDesc.getFamily(Bytes.toBytes(cf)) == null) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> unmatchedFamilies.add(cf);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> if(unmatchedFamilies.size() > 0) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> ArrayList<String> familyNames = new ArrayList<String>();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> for (HColumnDescriptor family : table.getTableDescriptor().getFamilies()) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> familyNames.add(family.getNameAsString());<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> String msg =<a name="line.536"></a>
-<span class="sourceLineNo">537</span> "Column Families " + unmatchedFamilies + " specified in " + COLUMNS_CONF_KEY<a name="line.537"></a>
-<span class="sourceLineNo">538</span> + " does not match with any of the table " + tableName<a name="line.538"></a>
-<span class="sourceLineNo">539</span> + " column families " + familyNames + ".\n"<a name="line.539"></a>
-<span class="sourceLineNo">540</span> + "To disable column family check, use -D" + NO_STRICT_COL_FAMILY<a name="line.540"></a>
-<span class="sourceLineNo">541</span> + "=true.\n";<a name="line.541"></a>
-<span class="sourceLineNo">542</span> usage(msg);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> System.exit(-1);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> }<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> job.setMapOutputValueClass(Text.class);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> job.setReducerClass(TextSortReducer.class);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> job.setMapOutputValueClass(Put.class);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> job.setCombinerClass(PutCombiner.class);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> job.setReducerClass(PutSortReducer.class);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (!isDryRun) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> Path outputDir = new Path(hfileOutPath);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> FileOutputFormat.setOutputPath(job, outputDir);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> HFileOutputFormat2.configureIncrementalLoad(job, table.getTableDescriptor(),<a name="line.557"></a>
-<span class="sourceLineNo">558</span> regionLocator);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> } else {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> if (!admin.tableExists(tableName)) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> String errorMsg = format("Table '%s' does not exist.", tableName);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> LOG.error(errorMsg);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> throw new TableNotFoundException(errorMsg);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> usage(TsvImporterTextMapper.class.toString()<a name="line.568"></a>
-<span class="sourceLineNo">569</span> + " should not be used for non bulkloading case. use "<a name="line.569"></a>
-<span class="sourceLineNo">570</span> + TsvImporterMapper.class.toString()<a name="line.570"></a>
-<span class="sourceLineNo">571</span> + " or custom mapper whose value type is Put.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> System.exit(-1);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (!isDryRun) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // No reducers. Just write straight to table. Call initTableReducerJob<a name="line.575"></a>
-<span class="sourceLineNo">576</span> // to set up the TableOutputFormat.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> job.setNumReduceTasks(0);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> if (isDryRun) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> job.setOutputFormatClass(NullOutputFormat.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> job.getConfiguration().setStrings("io.serializations",<a name="line.583"></a>
-<span class="sourceLineNo">584</span> job.getConfiguration().get("io.serializations"),<a name="line.584"></a>
-<span class="sourceLineNo">585</span> MutationSerialization.class.getName(), ResultSerialization.class.getName(),<a name="line.585"></a>
-<span class="sourceLineNo">586</span> KeyValueSerialization.class.getName());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> TableMapReduceUtil.addDependencyJars(job);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a name="line.589"></a>
-<span class="sourceLineNo">590</span> com.google.common.base.Function.class /* Guava used by TsvParser */);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> return job;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span> private static void createTable(Admin admin, TableName tableName, String[] columns)<a name="line.596"></a>
-<span class="sourceLineNo">597</span> throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> for (String cf : cfSet) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> HColumnDescriptor hcd = new HColumnDescriptor(Bytes.toBytes(cf));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> htd.addFamily(hcd);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> LOG.warn(format("Creating table '%s' with '%s' columns and default descriptors.",<a name="line.604"></a>
-<span class="sourceLineNo">605</span> tableName, cfSet));<a name="line.605"></a>
-<span class="sourceLineNo">606</span> admin.createTable(htd);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> private static void deleteTable(Configuration conf, String[] args) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> try (Connection connection = ConnectionFactory.createConnection(conf);<a name="line.611"></a>
-<span class="sourceLineNo">612</span> Admin admin = connection.getAdmin()) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> admin.disableTable(tableName);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (TableNotEnabledException e) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> LOG.debug("Dry mode: Table: " + tableName + " already disabled, so just deleting it.");<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> admin.deleteTable(tableName);<a name="line.618"></a>
-<span class="sourceLineNo">619</span> } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> LOG.error(format("***Dry run: Failed to delete table '%s'.***%n%s", tableName,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> e.toString()));<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> LOG.info(format("Dry run: Deleted table '%s'.", tableName));<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> private static Set<String> getColumnFamilies(String[] columns) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> Set<String> cfSet = new HashSet<String>();<a name="line.628"></a>
-<span class="sourceLineNo">629</span> for (String aColumn : columns) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span> if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)<a name="line.630"></a>
-<span class="sourceLineNo">631</span> || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)<a name="line.631"></a>
-<span class="sourceLineNo">632</span> || TsvParser.CELL_VISIBILITY_COLUMN_SPEC.equals(aColumn)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> || TsvParser.CELL_TTL_COLUMN_SPEC.equals(aColumn)<a name="line.633"></a>
-<span class="sourceLineNo">634</span> || TsvParser.ATTRIBUTES_COLUMN_SPEC.equals(aColumn))<a name="line.634"></a>
-<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
-<span class="sourceLineNo">636</span> // we are only concerned with the first one (in case this is a cf:cq)<a name="line.636"></a>
-<span class="sourceLineNo">637</span> cfSet.add(aColumn.split(":", 2)[0]);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> }<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return cfSet;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> /*<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param errorMsg Error message. Can be null.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> */<a name="line.644"></a>
-<span class="sourceLineNo">645</span> private static void usage(final String errorMsg) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> System.err.println("ERROR: " + errorMsg);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> String usage =<a name="line.649"></a>
-<span class="sourceLineNo">650</span> "Usage: " + NAME + " -D"+ COLUMNS_CONF_KEY + "=a,b,c <tablename> <inputdir>\n" +<a name="line.650"></a>
-<span class="sourceLineNo">651</span> "\n" +<a name="line.651"></a>
-<span class="sourceLineNo">652</span> "Imports the given input directory of TSV data into the specified table.\n" +<a name="line.652"></a>
-<span class="sourceLineNo">653</span> "\n" +<a name="line.653"></a>
-<span class="sourceLineNo">654</span> "The column names of the TSV data must be specified using the -D" + COLUMNS_CONF_KEY + "\n" +<a name="line.654"></a>
-<span class="sourceLineNo">655</span> "option. This option takes the form of comma-separated column names, where each\n" +<a name="line.655"></a>
-<span class="sourceLineNo">656</span> "column name is either a simple column family, or a columnfamily:qualifier. The special\n" +<a name="line.656"></a>
-<span class="sourceLineNo">657</span> "column name " + TsvParser.ROWKEY_COLUMN_SPEC + " is used to designate that this column should be used\n" +<a name="line.657"></a>
-<span class="sourceLineNo">658</span> "as the row key for each imported record. You must specify exactly one column\n" +<a name="line.658"></a>
-<span class="sourceLineNo">659</span> "to be the row key, and you must specify a column name for every column that exists in the\n" +<a name="line.659"></a>
-<span class="sourceLineNo">660</span> "input data. Another special column" + TsvParser.TIMESTAMPKEY_COLUMN_SPEC +<a name="line.660"></a>
-<span class="sourceLineNo">661</span> " designates that this column should be\n" +<a name="line.661"></a>
-<span class="sourceLineNo">662</span> "used as timestamp for each record. Unlike " + TsvParser.ROWKEY_COLUMN_SPEC + ", " +<a name="line.662"></a>
-<span class="sourceLineNo">663</span> TsvParser.TIMESTAMPKEY_COLUMN_SPEC + " is optional." + "\n" +<a name="line.663"></a>
-<span class="sourceLineNo">664</span> "You must specify at most one column as timestamp key for each imported record.\n" +<a name="line.664"></a>
-<span class="sourceLineNo">665</span> "Record with invalid timestamps (blank, non-numeric) will be treated as bad record.\n" +<a name="line.665"></a>
-<span class="sourceLineNo">666</span> "Note: if you use this option, then '" + TIMESTAMP_CONF_KEY + "' option will be ignored.\n" +<a name="line.666"></a>
-<span class="sourceLineNo">667</span> "\n" +<a name="line.667"></a>
-<span class="sourceLineNo">668</span> "Other special columns that can be specified are " + TsvParser.CELL_TTL_COLUMN_SPEC +<a name="line.668"></a>
-<span class="sourceLineNo">669</span> " and " + TsvParser.CELL_VISIBILITY_COLUMN_SPEC + ".\n" +<a name="line.669"></a>
-<span class="sourceLineNo">670</span> TsvParser.CELL_TTL_COLUMN_SPEC + " designates that this column will be used " +<a name="line.670"></a>
-<span class="sourceLineNo">671</span> "as a Cell's Time To Live (TTL) attribute.\n" +<a name="line.671"></a>
-<span class="sourceLineNo">672</span> TsvParser.CELL_VISIBILITY_COLUMN_SPEC + " designates that this column contains the " +<a name="line.672"></a>
-<span class="sourceLineNo">673</span> "visibility label expression.\n" +<a name="line.673"></a>
-<span class="sourceLineNo">674</span> "\n" +<a name="line.674"></a>
-<span class="sourceLineNo">675</span> TsvParser.ATTRIBUTES_COLUMN_SPEC+" can be used to specify Operation Attributes per record.\n"+<a name="line.675"></a>
-<span class="sourceLineNo">676</span> " Should be specified as key=>value where "+TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX+ " is used \n"+<a name="line.676"></a>
-<span class="sourceLineNo">677</span> " as the seperator. Note that more than one OperationAttributes can be specified.\n"+<a name="line.677"></a>
-<span class="sourceLineNo">678</span> "By default importtsv will load data directly into HBase. To instead generate\n" +<a name="line.678"></a>
-<span class="sourceLineNo">679</span> "HFiles of data to prepare for a bulk data load, pass the option:\n" +<a name="line.679"></a>
-<span class="sourceLineNo">680</span> " -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output\n" +<a name="line.680"></a>
-<span class="sourceLineNo">681</span> " Note: if you do not use this option, then the target table must already exist in HBase\n" +<a name="line.681"></a>
-<span class="sourceLineNo">682</span> "\n" +<a name="line.682"></a>
-<span class="sourceLineNo">683</span> "Other options that may be specified with -D include:\n" +<a name="line.683"></a>
-<span class="sourceLineNo">684</span> " -D" + DRY_RUN_CONF_KEY + "=true - Dry run mode. Data is not actually populated into" +<a name="line.684"></a>
-<span class="sourceLineNo">685</span> " table. If table does not exist, it is created but deleted in the end.\n" +<a name="line.685"></a>
-<span class="sourceLineNo">686</span> " -D" + SKIP_LINES_CONF_KEY + "=false - fail if encountering an invalid line\n" +<a name="line.686"></a>
-<span class="sourceLineNo">687</span> " -D" + LOG_BAD_LINES_CONF_KEY + "=true - logs invalid lines to stderr\n" +<a name="line.687"></a>
-<span class="sourceLineNo">688</span> " '-D" + SEPARATOR_CONF_KEY + "=|' - eg separate on pipes instead of tabs\n" +<a name="line.688"></a>
-<span class="sourceLineNo">689</span> " -D" + TIMESTAMP_CONF_KEY + "=currentTimeAsLong - use the specified timestamp for the import\n" +<a name="line.689"></a>
-<span class="sourceLineNo">690</span> " -D" + MAPPER_CONF_KEY + "=my.Mapper - A user-defined Mapper to use instead of " +<a name="line.690"></a>
-<span class="sourceLineNo">691</span> DEFAULT_MAPPER.getName() + "\n" +<a name="line.691"></a>
-<span class="sourceLineNo">692</span> " -D" + JOB_NAME_CONF_KEY + "=jobName - use the specified mapreduce job name for the import\n" +<a name="line.692"></a>
-<span class="sourceLineNo">693</span> " -D" + CREATE_TABLE_CONF_KEY + "=no - can be used to avoid creation of table by this tool\n" +<a name="line.693"></a>
-<span class="sourceLineNo">694</span> " Note: if you set this to 'no', then the target table must already exist in HBase\n" +<a name="line.694"></a>
-<span class="sourceLineNo">695</span> " -D" + NO_STRICT_COL_FAMILY + "=true - ignore column family check in hbase table. " +<a name="line.695"></a>
-<span class="sourceLineNo">696</span> "Default is false\n\n" +<a name="line.696"></a>
-<span class="sourceLineNo">697</span> "For performance consider the following options:\n" +<a name="line.697"></a>
-<span class="sourceLineNo">698</span> " -Dmapreduce.map.speculative=false\n" +<a name="line.698"></a>
-<span class="sourceLineNo">699</span> " -Dmapreduce.reduce.speculative=false";<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> System.err.println(usage);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> @Override<a name="line.704"></a>
-<span class="sourceLineNo">705</span> public int run(String[] args) throws Exception {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> if (args.length < 2) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> usage("Wrong number of arguments: " + args.length);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> return -1;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span> // When MAPPER_CONF_KEY is null, the user wants to use the provided TsvImporterMapper, so<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // perform validation on these additional args. When it's not null, user has provided their<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // own mapper, thus these validation are not relevant.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> // TODO: validation for TsvImporterMapper, not this tool. Move elsewhere.<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (null == getConf().get(MAPPER_CONF_KEY)) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> // Make sure columns are specified<a name="line.716"></a>
-<span class="sourceLineNo">717</span> String[] columns = getConf().getStrings(COLUMNS_CONF_KEY);<a name="line.717"></a>
-<span class="sourceLineNo">718</span> if (columns == null) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> usage("No columns specified. Please specify with -D" +<a name="line.719"></a>
-<span class="sourceLineNo">720</span> COLUMNS_CONF_KEY+"=...");<a name="line.720"></a>
-<span class="sourceLineNo">721</span> return -1;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Make sure they specify exactly one column as the row key<a name="line.724"></a>
-<span class="sourceLineNo">725</span> int rowkeysFound = 0;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> for (String col : columns) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span> if (col.equals(TsvParser.ROWKEY_COLUMN_SPEC)) rowkeysFound++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span> }<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (rowkeysFound != 1) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> usage("Must specify exactly one column as " + TsvParser.ROWKEY_COLUMN_SPEC);<a name="line.730"></a>
-<span class="sourceLineNo">731</span> return -1;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> }<a name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span> // Make sure we have at most one column as the timestamp key<a name="line.734"></a>
-<span class="sourceLineNo">735</span> int tskeysFound = 0;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> for (String col : columns) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (col.equals(TsvParser.TIMESTAMPKEY_COLUMN_SPEC))<a name="line.737"></a>
-<span class="sourceLineNo">738</span> tskeysFound++;<a name="line.738"></a>
-<span class="sourceLineNo">739</span> }<a name="line.739"></a>
-<span class="sourceLineNo">740</span> if (tskeysFound > 1) {<a name="line.740"></a>
-<span class="sourceLineNo">741</span> usage("Must specify at most one column as "<a name="line.741"></a>
-<span class="sourceLineNo">742</span> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return -1;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> int attrKeysFound = 0;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> for (String col : columns) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (col.equals(TsvParser.ATTRIBUTES_COLUMN_SPEC))<a name="line.748"></a>
-<span class="sourceLineNo">749</span> attrKeysFound++;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> if (attrKeysFound > 1) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> usage("Must specify at most one column as "<a name="line.752"></a>
-<span class="sourceLineNo">753</span> + TsvParser.ATTRIBUTES_COLUMN_SPEC);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> return -1;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> }<a name="line.755"></a>
-<span class="sourceLineNo">756</span><a name="line.756"></a>
-<span class="sourceLineNo">757</span> // Make sure one or more columns are specified excluding rowkey and<a name="line.757"></a>
-<span class="sourceLineNo">758</span> // timestamp key<a name="line.758"></a>
-<span class="sourceLineNo">759</span> if (columns.length - (rowkeysFound + tskeysFound + attrKeysFound) < 1) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> usage("One or more columns in addition to the row key and timestamp(optional) are required");<a name="line.760"></a>
-<span class="sourceLineNo">761</span> return -1;<a name="line.761"></a>
-<span class="sourceLineNo">762</span> }<a name="line.762"></a>
-<span class="sourceLineNo">763</span> }<a name="line.763"></a>
-<span class="sourceLineNo">764</span><a name="line.764"></a>
-<span class="sourceLineNo">765</span> // If timestamp option is not specified, use current system time.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> long timstamp = getConf().getLong(TIMESTAMP_CONF_KEY, System.currentTimeMillis());<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span> // Set it back to replace invalid timestamp (non-numeric) with current<a name="line.768"></a>
-<span class="sourceLineNo">769</span> // system time<a name="line.769"></a>
-<span class="sourceLineNo">770</span> getConf().setLong(TIMESTAMP_CONF_KEY, timstamp);<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> synchronized (ImportTsv.class) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span> DRY_RUN_TABLE_CREATED = false;<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span> Job job = createSubmittableJob(getConf(), args);<a name="line.775"></a>
-<span class="sourceLineNo">776</span> boolean success = job.waitForCompletion(true);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> boolean delete = false;<a name="line.777"></a>
-<span class="sourceLineNo">778</span> synchronized (ImportTsv.class) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> delete = DRY_RUN_TABLE_CREATED;<a name="line.779"></a>
-<span class="sourceLineNo">780</span> }<a name="line.780"></a>
-<span class="sourceLineNo">781</span> if (delete) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span> deleteTable(getConf(), args);<a name="line.782"></a>
-<span class="sourceLineNo">783</span> }<a name="line.783"></a>
-<span class="sourceLineNo">784</span> return success ? 0 : 1;<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span> public static void main(String[] args) throws Exception {<a name="line.787"></a>
-<span class="sourceLineNo">788</span> int status = ToolRunner.run(HBaseConfiguration.create(), new ImportTsv(), args);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> System.exit(status);<a name="line.789"></a>
-<span class="sourceLineNo">790</span> }<a name="line.790"></a>
-<span class="sourceLineNo">791</span>}<a name="line.791"></a>
+<span class="sourceLineNo">094</span> public final static String SKIP_EMPTY_COLUMNS = "importtsv.skip.empty.columns";<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.97"></a>
+<span class="sourceLineNo">098</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.98"></a>
+<span class="sourceLineNo">099</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.102"></a>
+<span class="sourceLineNo">103</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * flipped to delete it when MR ends.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> public static class TsvParser {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Column families and qualifiers mapped to the TSV columns<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private final byte[][] families;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private final byte[][] qualifiers;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> private final byte separatorByte;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> private int rowKeyColumnIndex;<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> private int maxColumnCount;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Default value must be negative<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @param separatorStr<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // Configure separator<a name="line.159"></a>
+<span class="sourceLineNo">160</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Preconditions.checkArgument(separator.length == 1,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> "TsvParser only supports single-byte separators");<a name="line.162"></a>
+<span class="sourceLineNo">163</span> separatorByte = separator[0];<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Configure columns<a name="line.165"></a>
+<span class="sourceLineNo">166</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.166"></a>
+<span class="sourceLineNo">167</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> maxColumnCount = columnStrings.size();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> families = new byte[maxColumnCount][];<a name="line.170"></a>
+<span class="sourceLineNo">171</span> qualifiers = new byte[maxColumnCount][];<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String str = columnStrings.get(i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> rowKeyColumnIndex = i;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> continue;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> timestampKeyColumnIndex = i;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> continue;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> attrKeyColumnIndex = i;<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> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> cellVisibilityColumnIndex = i;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> continue;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cellTTLColumnIndex = i;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> continue;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> String[] parts = str.split(":", 2);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (parts.length == 1) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> families[i] = str.getBytes();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } else {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> families[i] = parts[0].getBytes();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> qualifiers[i] = parts[1].getBytes();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> public int getTimestampKeyColumnIndex() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return timestampKeyColumnIndex;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> public boolean hasAttributes() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> public boolean hasCellVisibility() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public boolean hasCellTTL() {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> public int getAttributesKeyColumnIndex() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return attrKeyColumnIndex;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> public int getCellVisibilityColumnIndex() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return cellVisibilityColumnIndex;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> public int getCellTTLColumnIndex() {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return cellTTLColumnIndex;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> public int getRowKeyColumnIndex() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return rowKeyColumnIndex;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> public byte[] getFamily(int idx) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return families[idx];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public byte[] getQualifier(int idx) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return qualifiers[idx];<a name="line.246"></a>
+<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> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> throws BadTsvLineException {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // Enumerate separator offsets<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (int i = 0; i < length; i++) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (lineBytes[i] == separatorByte) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> tabOffsets.add(i);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (tabOffsets.isEmpty()) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> throw new BadTsvLineException("No delimiter");<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> tabOffsets.add(length);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new BadTsvLineException("Excessive columns");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throw new BadTsvLineException("No row key");<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else if (hasTimestamp()<a name="line.268"></a>
+<span class="sourceLineNo">269</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> throw new BadTsvLineException("No timestamp");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new BadTsvLineException("No attributes specified");<a name="line.272"></a>
+<span class="sourceLineNo">273</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> class ParsedLine {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private final ArrayList<Integer> tabOffsets;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private byte[] lineBytes;<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="
<TRUNCATED>
[15/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/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 de127b0..3cc021f 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -66,175 +66,180 @@
<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> 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">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<Tag> 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> * <code>doSetup</code>. Hence a subclass may choose to override this method<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * and call <code>doSetup</code> 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<Tag>();<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.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> skipBadLines = context.getConfiguration().getBoolean(<a name="line.136"></a>
-<span class="sourceLineNo">137</span> ImportTsv.SKIP_LINES_CONF_KEY, true);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> badLineCount = context.getCounter("ImportTsv", "Bad Lines");<a name="line.138"></a>
-<span class="sourceLineNo">139</span> logBadLines = context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, false);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> hfileOutPath = conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * Convert a line of TSV text into an HBase table row.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public void map(LongWritable offset, Text value,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> Context context)<a name="line.148"></a>
-<span class="sourceLineNo">149</span> throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> byte[] lineBytes = value.getBytes();<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> ImportTsv.TsvParser.ParsedLine parsed = parser.parse(<a name="line.153"></a>
-<span class="sourceLineNo">154</span> lineBytes, value.getLength());<a name="line.154"></a>
-<span class="sourceLineNo">155</span> ImmutableBytesWritable rowKey =<a name="line.155"></a>
-<span class="sourceLineNo">156</span> new ImmutableBytesWritable(lineBytes,<a name="line.156"></a>
-<span class="sourceLineNo">157</span> parsed.getRowKeyOffset(),<a name="line.157"></a>
-<span class="sourceLineNo">158</span> parsed.getRowKeyLength());<a name="line.158"></a>
-<span class="sourceLineNo">159</span> // Retrieve timestamp if exists<a name="line.159"></a>
-<span class="sourceLineNo">160</span> ts = parsed.getTimestamp(ts);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> cellVisibilityExpr = parsed.getCellVisibility();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> ttl = parsed.getCellTTL();<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // create tags for the parsed line<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (hfileOutPath != null) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> tags.clear();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (cellVisibilityExpr != null) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> tags.addAll(kvCreator.getVisibilityExpressionResolver().createVisibilityExpTags(<a name="line.168"></a>
-<span class="sourceLineNo">169</span> cellVisibilityExpr));<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // Add TTL directly to the KV so we can vary them when packing more than one KV<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // into puts<a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (ttl > 0) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> tags.add(new ArrayBackedTag(TagType.TTL_TAG_TYPE, Bytes.toBytes(ttl)));<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Put put = new Put(rowKey.copyBytes());<a name="line.177"></a>
-<span class="sourceLineNo">178</span> for (int i = 0; i < parsed.getColumnCount(); i++) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> if (i == parser.getRowKeyColumnIndex() || i == parser.getTimestampKeyColumnIndex()<a name="line.179"></a>
-<span class="sourceLineNo">180</span> || i == parser.getAttributesKeyColumnIndex() || i == parser.getCellVisibilityColumnIndex()<a name="line.180"></a>
-<span class="sourceLineNo">181</span> || i == parser.getCellTTLColumnIndex()) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> continue;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> populatePut(lineBytes, parsed, put, i);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> context.write(rowKey, put);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> } catch (ImportTsv.TsvParser.BadTsvLineException | IllegalArgumentException<a name="line.187"></a>
-<span class="sourceLineNo">188</span> | InvalidLabelException badLine) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (logBadLines) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> System.err.println(value);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> System.err.println("Bad line at offset: " + offset.get() + ":\n" + badLine.getMessage());<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (skipBadLines) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> incrementBadLineCount(1);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return;<a name="line.195"></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<Tag> 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> * <code>doSetup</code>. Hence a subclass may choose to override this method<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * and call <code>doSetup</code> 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<Tag>();<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.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 > 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 < 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> && 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> throw new IOException(badLine);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } catch (InterruptedException e) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> e.printStackTrace();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> protected void populatePut(byte[] lineBytes, ImportTsv.TsvParser.ParsedLine parsed, Put put,<a name="line.203"></a>
-<span class="sourceLineNo">204</span> int i) throws BadTsvLineException, IOException {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Cell cell = null;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> if (hfileOutPath == null) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> cell = new KeyValue(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.207"></a>
-<span class="sourceLineNo">208</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.208"></a>
-<span class="sourceLineNo">209</span> parser.getQualifier(i).length, ts, KeyValue.Type.Put, lineBytes,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> parsed.getColumnOffset(i), parsed.getColumnLength(i));<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (cellVisibilityExpr != null) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> // We won't be validating the expression here. The Visibility CP will do<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // the validation<a name="line.213"></a>
-<span class="sourceLineNo">214</span> put.setCellVisibility(new CellVisibility(cellVisibilityExpr));<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (ttl > 0) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> put.setTTL(ttl);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> } else {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // Creating the KV which needs to be directly written to HFiles. Using the Facade<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // KVCreator for creation of kvs.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> cell = this.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.222"></a>
-<span class="sourceLineNo">223</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> parser.getQualifier(i).length, ts, lineBytes, parsed.getColumnOffset(i),<a name="line.224"></a>
-<span class="sourceLineNo">225</span> parsed.getColumnLength(i), tags);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> put.add(cell);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>}<a name="line.229"></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> e.printStackTrace();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<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> protected void populatePut(byte[] lineBytes, ImportTsv.TsvParser.ParsedLine parsed, Put put,<a name="line.208"></a>
+<span class="sourceLineNo">209</span> int i) throws BadTsvLineException, IOException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> Cell cell = null;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> if (hfileOutPath == null) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> cell = new KeyValue(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.212"></a>
+<span class="sourceLineNo">213</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.213"></a>
+<span class="sourceLineNo">214</span> parser.getQualifier(i).length, ts, KeyValue.Type.Put, lineBytes,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> parsed.getColumnOffset(i), parsed.getColumnLength(i));<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (cellVisibilityExpr != null) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> // We won't be validating the expression here. The Visibility CP will do<a name="line.217"></a>
+<span class="sourceLineNo">218</span> // the validation<a name="line.218"></a>
+<span class="sourceLineNo">219</span> put.setCellVisibility(new CellVisibility(cellVisibilityExpr));<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> if (ttl > 0) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> put.setTTL(ttl);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> } else {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Creating the KV which needs to be directly written to HFiles. Using the Facade<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // KVCreator for creation of kvs.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> cell = this.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),<a name="line.227"></a>
+<span class="sourceLineNo">228</span> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,<a name="line.228"></a>
+<span class="sourceLineNo">229</span> parser.getQualifier(i).length, ts, lineBytes, parsed.getColumnOffset(i),<a name="line.229"></a>
+<span class="sourceLineNo">230</span> parsed.getColumnLength(i), tags);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span> put.add(cell);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>}<a name="line.234"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 89166d4..e9a07a6 100644
--- a/book.html
+++ b/book.html
@@ -33059,7 +33059,7 @@ The server will return cellblocks compressed using this same compressor as long
<div id="footer">
<div id="footer-text">
Version 2.0.0-SNAPSHOT<br>
-Last updated 2016-02-05 14:47:28 UTC
+Last updated 2016-02-05 17:28:16 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index e11aee8..7a05354 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -6124,12 +6124,12 @@
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
<ul>
<li>offset: <tt>"2"</tt></li></ul></td>
-<td>759</td>
+<td>760</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3423</td>
+<td>3422</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td>misc</td>
@@ -14553,7 +14553,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 64 has parse error. Missed HTML close tag 'code'. Sometimes it means that close tag missed for one of previous tags.</td>
<td><a href="./xref/org/apache/hadoop/hbase/client/HBaseAdmin.html#L1767">1767</a></td></tr>
<tr class="a">
@@ -34655,109 +34655,109 @@
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L154">154</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L155">155</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L155">155</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L156">156</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L398">398</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L399">399</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'else' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L400">400</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L401">401</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L423">423</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L424">424</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L424">424</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L425">425</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L426">426</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L427">427</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L630">630</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L631">631</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 113).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L657">657</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L658">658</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 101).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L659">659</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L660">660</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 107).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L676">676</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L677">677</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 105).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L689">689</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L691">691</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 103).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L692">692</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L694">694</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 102).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L693">693</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L695">695</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L727">727</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L729">729</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L737">737</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L739">739</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L748">748</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L750">750</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 101).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L760">760</a></td></tr></table></div>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#L762">762</a></td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.mapreduce.IndexBuilder.java">org/apache/hadoop/hbase/mapreduce/IndexBuilder.java</h3>
<table border="0" class="table table-striped">
@@ -36251,19 +36251,19 @@
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#L101">101</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#L103">103</a></td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#L119">119</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#L121">121</a></td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 102).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#L180">180</a></td></tr></table></div>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#L184">184</a></td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.mapreduce.TsvImporterTextMapper.java">org/apache/hadoop/hbase/mapreduce/TsvImporterTextMapper.java</h3>
<table border="0" class="table table-striped">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 281a669..b1f9145 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -9036,13 +9036,20 @@
<td class="colLast"><code>"importtsv.separator"</code></td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_EMPTY_COLUMNS">
+<!-- -->
+</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_EMPTY_COLUMNS">SKIP_EMPTY_COLUMNS</a></code></td>
+<td class="colLast"><code>"importtsv.skip.empty.columns"</code></td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_LINES_CONF_KEY">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></code></td>
<td class="colLast"><code>"importtsv.skip.bad.lines"</code></td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.mapreduce.ImportTsv.TIMESTAMP_CONF_KEY">
<!-- -->
</a><code>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index c2ccf66..dba358f 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -80105,6 +80105,8 @@ service.</div>
</dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/filter/ParseConstants.html#SKIP_BUFFER">SKIP_BUFFER</a></span> - Static variable in class org.apache.hadoop.hbase.filter.<a href="./org/apache/hadoop/hbase/filter/ParseConstants.html" title="class in org.apache.hadoop.hbase.filter">ParseConstants</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_EMPTY_COLUMNS">SKIP_EMPTY_COLUMNS</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/ImportTsv.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/StoreFile.html#SKIP_RESET_SEQ_ID">SKIP_RESET_SEQ_ID</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a></dt>
@@ -80133,6 +80135,10 @@ service.</div>
<dd>
<div class="block">Check whether to skip control given delta size and control size</div>
</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#skipEmptyColumns">skipEmptyColumns</a></span> - Variable in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html" title="class in org.apache.hadoop.hbase.mapreduce">TsvImporterMapper</a></dt>
+<dd>
+<div class="block">Should skip empty columns</div>
+</dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.html#skipErrors">skipErrors</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.wal.<a href="./org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.html" title="class in org.apache.hadoop.hbase.regionserver.wal">WALEditsReplaySink</a></dt>
<dd> </dd>
<dt><a href="./org/apache/hadoop/hbase/filter/SkipFilter.html" title="class in org.apache.hadoop.hbase.filter"><span class="strong">SkipFilter</span></a> - Class in <a href="./org/apache/hadoop/hbase/filter/package-summary.html">org.apache.hadoop.hbase.filter</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
index 0338890..dabe248 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
@@ -113,7 +113,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.414">ImportTsv.TsvParser.BadTsvLineException</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.415">ImportTsv.TsvParser.BadTsvLineException</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../serialized-form.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.BadTsvLineException">Serialized Form</a></dd></dl>
</li>
@@ -198,7 +198,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.ht
<ul class="blockListLast">
<li class="blockList">
<h4>serialVersionUID</h4>
-<pre>private static final long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html#line.418">serialVersionUID</a></pre>
+<pre>private static final long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html#line.419">serialVersionUID</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.BadTsvLineException.serialVersionUID">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -216,7 +216,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.ht
<ul class="blockListLast">
<li class="blockList">
<h4>ImportTsv.TsvParser.BadTsvLineException</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html#line.415">ImportTsv.TsvParser.BadTsvLineException</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> err)</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html#line.416">ImportTsv.TsvParser.BadTsvLineException</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> err)</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
index 6480f29..718d480 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
@@ -99,7 +99,7 @@
</dl>
<hr>
<br>
-<pre> class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.280">ImportTsv.TsvParser.ParsedLine</a>
+<pre> class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.281">ImportTsv.TsvParser.ParsedLine</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -256,7 +256,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>tabOffsets</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.281">tabOffsets</a></pre>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.282">tabOffsets</a></pre>
</li>
</ul>
<a name="lineBytes">
@@ -265,7 +265,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>lineBytes</h4>
-<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.282">lineBytes</a></pre>
+<pre>private byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.283">lineBytes</a></pre>
</li>
</ul>
</li>
@@ -282,7 +282,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>ImportTsv.TsvParser.ParsedLine</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.284">ImportTsv.TsvParser.ParsedLine</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> tabOffsets,
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.285">ImportTsv.TsvParser.ParsedLine</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> tabOffsets,
byte[] lineBytes)</pre>
</li>
</ul>
@@ -300,7 +300,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getRowKeyOffset</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.289">getRowKeyOffset</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.290">getRowKeyOffset</a>()</pre>
</li>
</ul>
<a name="getRowKeyLength()">
@@ -309,7 +309,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getRowKeyLength</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.292">getRowKeyLength</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.293">getRowKeyLength</a>()</pre>
</li>
</ul>
<a name="getTimestamp(long)">
@@ -318,7 +318,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getTimestamp</h4>
-<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.296">getTimestamp</a>(long ts)
+<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.297">getTimestamp</a>(long ts)
throws <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.BadTsvLineException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.BadTsvLineException</a></code></dd></dl>
@@ -330,7 +330,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getAttributes</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.313">getAttributes</a>()</pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.314">getAttributes</a>()</pre>
</li>
</ul>
<a name="getIndividualAttributes()">
@@ -339,7 +339,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getIndividualAttributes</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.322">getIndividualAttributes</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.323">getIndividualAttributes</a>()</pre>
</li>
</ul>
<a name="getAttributeKeyOffset()">
@@ -348,7 +348,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getAttributeKeyOffset</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.331">getAttributeKeyOffset</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.332">getAttributeKeyOffset</a>()</pre>
</li>
</ul>
<a name="getAttributeKeyLength()">
@@ -357,7 +357,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getAttributeKeyLength</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.339">getAttributeKeyLength</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.340">getAttributeKeyLength</a>()</pre>
</li>
</ul>
<a name="getCellVisibilityColumnOffset()">
@@ -366,7 +366,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellVisibilityColumnOffset</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.347">getCellVisibilityColumnOffset</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.348">getCellVisibilityColumnOffset</a>()</pre>
</li>
</ul>
<a name="getCellVisibilityColumnLength()">
@@ -375,7 +375,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellVisibilityColumnLength</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.355">getCellVisibilityColumnLength</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.356">getCellVisibilityColumnLength</a>()</pre>
</li>
</ul>
<a name="getCellVisibility()">
@@ -384,7 +384,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellVisibility</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.363">getCellVisibility</a>()</pre>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.364">getCellVisibility</a>()</pre>
</li>
</ul>
<a name="getCellTTLColumnOffset()">
@@ -393,7 +393,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellTTLColumnOffset</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.372">getCellTTLColumnOffset</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.373">getCellTTLColumnOffset</a>()</pre>
</li>
</ul>
<a name="getCellTTLColumnLength()">
@@ -402,7 +402,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellTTLColumnLength</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.380">getCellTTLColumnLength</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.381">getCellTTLColumnLength</a>()</pre>
</li>
</ul>
<a name="getCellTTL()">
@@ -411,7 +411,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellTTL</h4>
-<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.388">getCellTTL</a>()</pre>
+<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.389">getCellTTL</a>()</pre>
</li>
</ul>
<a name="getColumnOffset(int)">
@@ -420,7 +420,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getColumnOffset</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.397">getColumnOffset</a>(int idx)</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.398">getColumnOffset</a>(int idx)</pre>
</li>
</ul>
<a name="getColumnLength(int)">
@@ -429,7 +429,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getColumnLength</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.403">getColumnLength</a>(int idx)</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.404">getColumnLength</a>(int idx)</pre>
</li>
</ul>
<a name="getColumnCount()">
@@ -438,7 +438,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getColumnCount</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.406">getColumnCount</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.407">getColumnCount</a>()</pre>
</li>
</ul>
<a name="getLineBytes()">
@@ -447,7 +447,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>getLineBytes</h4>
-<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.409">getLineBytes</a>()</pre>
+<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html#line.410">getLineBytes</a>()</pre>
</li>
</ul>
</li>
[06/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
index 278aefb..da81736 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
@@ -34,9 +34,9 @@
<span class="sourceLineNo">026</span> @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
<span class="sourceLineNo">027</span> optionalArguments = {<a name="line.27"></a>
<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.28"></a>
-<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.29"></a>
+<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "filter", type = "String")})<a name="line.31"></a>
<span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
<span class="sourceLineNo">033</span> extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
<span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -94,57 +94,57 @@
<span class="sourceLineNo">086</span> return m_bcn__IsNotDefault;<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
<span class="sourceLineNo">088</span> private boolean m_bcn__IsNotDefault;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // 24, 1<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void setBcv(String bcv)<a name="line.90"></a>
+<span class="sourceLineNo">089</span> // 22, 1<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void setFormat(String format)<a name="line.90"></a>
<span class="sourceLineNo">091</span> {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // 24, 1<a name="line.92"></a>
-<span class="sourceLineNo">093</span> m_bcv = bcv;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> m_bcv__IsNotDefault = true;<a name="line.94"></a>
+<span class="sourceLineNo">092</span> // 22, 1<a name="line.92"></a>
+<span class="sourceLineNo">093</span> m_format = format;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> m_format__IsNotDefault = true;<a name="line.94"></a>
<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public String getBcv()<a name="line.96"></a>
+<span class="sourceLineNo">096</span> public String getFormat()<a name="line.96"></a>
<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return m_bcv;<a name="line.98"></a>
+<span class="sourceLineNo">098</span> return m_format;<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private String m_bcv;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean getBcv__IsNotDefault()<a name="line.101"></a>
+<span class="sourceLineNo">100</span> private String m_format;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public boolean getFormat__IsNotDefault()<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return m_bcv__IsNotDefault;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> return m_format__IsNotDefault;<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private boolean m_bcv__IsNotDefault;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // 21, 1<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public void setFilter(String filter)<a name="line.107"></a>
+<span class="sourceLineNo">105</span> private boolean m_format__IsNotDefault;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // 24, 1<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setBcv(String bcv)<a name="line.107"></a>
<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // 21, 1<a name="line.109"></a>
-<span class="sourceLineNo">110</span> m_filter = filter;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> m_filter__IsNotDefault = true;<a name="line.111"></a>
+<span class="sourceLineNo">109</span> // 24, 1<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m_bcv = bcv;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> m_bcv__IsNotDefault = true;<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public String getFilter()<a name="line.113"></a>
+<span class="sourceLineNo">113</span> public String getBcv()<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m_filter;<a name="line.115"></a>
+<span class="sourceLineNo">115</span> return m_bcv;<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String m_filter;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean getFilter__IsNotDefault()<a name="line.118"></a>
+<span class="sourceLineNo">117</span> private String m_bcv;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean getBcv__IsNotDefault()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_filter__IsNotDefault;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_bcv__IsNotDefault;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private boolean m_filter__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // 22, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setFormat(String format)<a name="line.124"></a>
+<span class="sourceLineNo">122</span> private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // 21, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setFilter(String filter)<a name="line.124"></a>
<span class="sourceLineNo">125</span> {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // 22, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span> m_format = format;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> m_format__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span> // 21, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span> m_filter = filter;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> m_filter__IsNotDefault = true;<a name="line.128"></a>
<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public String getFormat()<a name="line.130"></a>
+<span class="sourceLineNo">130</span> public String getFilter()<a name="line.130"></a>
<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return m_format;<a name="line.132"></a>
+<span class="sourceLineNo">132</span> return m_filter;<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> private String m_format;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getFormat__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span> private String m_filter;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean getFilter__IsNotDefault()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_format__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_filter__IsNotDefault;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_format__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span> private boolean m_filter__IsNotDefault;<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> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -163,24 +163,24 @@
<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
<span class="sourceLineNo">156</span> }<a name="line.156"></a>
<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> protected String bcv;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.159"></a>
+<span class="sourceLineNo">158</span> protected String format;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.159"></a>
<span class="sourceLineNo">160</span> {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> (getImplData()).setBcv(p_bcv);<a name="line.161"></a>
+<span class="sourceLineNo">161</span> (getImplData()).setFormat(p_format);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
<span class="sourceLineNo">164</span> <a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected String filter;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.166"></a>
+<span class="sourceLineNo">165</span> protected String bcv;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.166"></a>
<span class="sourceLineNo">167</span> {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> (getImplData()).setFilter(p_filter);<a name="line.168"></a>
+<span class="sourceLineNo">168</span> (getImplData()).setBcv(p_bcv);<a name="line.168"></a>
<span class="sourceLineNo">169</span> return this;<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> protected String format;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
+<span class="sourceLineNo">172</span> protected String filter;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.173"></a>
<span class="sourceLineNo">174</span> {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> (getImplData()).setFormat(p_format);<a name="line.175"></a>
+<span class="sourceLineNo">175</span> (getImplData()).setFilter(p_filter);<a name="line.175"></a>
<span class="sourceLineNo">176</span> return this;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index 278aefb..da81736 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -34,9 +34,9 @@
<span class="sourceLineNo">026</span> @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
<span class="sourceLineNo">027</span> optionalArguments = {<a name="line.27"></a>
<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.28"></a>
-<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.29"></a>
+<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "filter", type = "String")})<a name="line.31"></a>
<span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
<span class="sourceLineNo">033</span> extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
<span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -94,57 +94,57 @@
<span class="sourceLineNo">086</span> return m_bcn__IsNotDefault;<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
<span class="sourceLineNo">088</span> private boolean m_bcn__IsNotDefault;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // 24, 1<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void setBcv(String bcv)<a name="line.90"></a>
+<span class="sourceLineNo">089</span> // 22, 1<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void setFormat(String format)<a name="line.90"></a>
<span class="sourceLineNo">091</span> {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // 24, 1<a name="line.92"></a>
-<span class="sourceLineNo">093</span> m_bcv = bcv;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> m_bcv__IsNotDefault = true;<a name="line.94"></a>
+<span class="sourceLineNo">092</span> // 22, 1<a name="line.92"></a>
+<span class="sourceLineNo">093</span> m_format = format;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> m_format__IsNotDefault = true;<a name="line.94"></a>
<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public String getBcv()<a name="line.96"></a>
+<span class="sourceLineNo">096</span> public String getFormat()<a name="line.96"></a>
<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return m_bcv;<a name="line.98"></a>
+<span class="sourceLineNo">098</span> return m_format;<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private String m_bcv;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean getBcv__IsNotDefault()<a name="line.101"></a>
+<span class="sourceLineNo">100</span> private String m_format;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public boolean getFormat__IsNotDefault()<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return m_bcv__IsNotDefault;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> return m_format__IsNotDefault;<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private boolean m_bcv__IsNotDefault;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // 21, 1<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public void setFilter(String filter)<a name="line.107"></a>
+<span class="sourceLineNo">105</span> private boolean m_format__IsNotDefault;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // 24, 1<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setBcv(String bcv)<a name="line.107"></a>
<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // 21, 1<a name="line.109"></a>
-<span class="sourceLineNo">110</span> m_filter = filter;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> m_filter__IsNotDefault = true;<a name="line.111"></a>
+<span class="sourceLineNo">109</span> // 24, 1<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m_bcv = bcv;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> m_bcv__IsNotDefault = true;<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public String getFilter()<a name="line.113"></a>
+<span class="sourceLineNo">113</span> public String getBcv()<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m_filter;<a name="line.115"></a>
+<span class="sourceLineNo">115</span> return m_bcv;<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String m_filter;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean getFilter__IsNotDefault()<a name="line.118"></a>
+<span class="sourceLineNo">117</span> private String m_bcv;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean getBcv__IsNotDefault()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_filter__IsNotDefault;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_bcv__IsNotDefault;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private boolean m_filter__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // 22, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setFormat(String format)<a name="line.124"></a>
+<span class="sourceLineNo">122</span> private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // 21, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setFilter(String filter)<a name="line.124"></a>
<span class="sourceLineNo">125</span> {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // 22, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span> m_format = format;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> m_format__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span> // 21, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span> m_filter = filter;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> m_filter__IsNotDefault = true;<a name="line.128"></a>
<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public String getFormat()<a name="line.130"></a>
+<span class="sourceLineNo">130</span> public String getFilter()<a name="line.130"></a>
<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return m_format;<a name="line.132"></a>
+<span class="sourceLineNo">132</span> return m_filter;<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> private String m_format;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getFormat__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span> private String m_filter;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean getFilter__IsNotDefault()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_format__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_filter__IsNotDefault;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_format__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span> private boolean m_filter__IsNotDefault;<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> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -163,24 +163,24 @@
<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
<span class="sourceLineNo">156</span> }<a name="line.156"></a>
<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> protected String bcv;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.159"></a>
+<span class="sourceLineNo">158</span> protected String format;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.159"></a>
<span class="sourceLineNo">160</span> {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> (getImplData()).setBcv(p_bcv);<a name="line.161"></a>
+<span class="sourceLineNo">161</span> (getImplData()).setFormat(p_format);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
<span class="sourceLineNo">164</span> <a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected String filter;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.166"></a>
+<span class="sourceLineNo">165</span> protected String bcv;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.166"></a>
<span class="sourceLineNo">167</span> {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> (getImplData()).setFilter(p_filter);<a name="line.168"></a>
+<span class="sourceLineNo">168</span> (getImplData()).setBcv(p_bcv);<a name="line.168"></a>
<span class="sourceLineNo">169</span> return this;<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> protected String format;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
+<span class="sourceLineNo">172</span> protected String filter;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.173"></a>
<span class="sourceLineNo">174</span> {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> (getImplData()).setFormat(p_format);<a name="line.175"></a>
+<span class="sourceLineNo">175</span> (getImplData()).setFilter(p_filter);<a name="line.175"></a>
<span class="sourceLineNo">176</span> return this;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index 6aa41b6..88f163f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -35,26 +35,26 @@
<span class="sourceLineNo">027</span>{<a name="line.27"></a>
<span class="sourceLineNo">028</span> private final HRegionServer regionServer;<a name="line.28"></a>
<span class="sourceLineNo">029</span> private final String bcn;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> private final String bcv;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> private final String filter;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> private final String format;<a name="line.32"></a>
+<span class="sourceLineNo">030</span> private final String format;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> private final String bcv;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> private final String filter;<a name="line.32"></a>
<span class="sourceLineNo">033</span> protected static org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData p_implData)<a name="line.33"></a>
<span class="sourceLineNo">034</span> {<a name="line.34"></a>
<span class="sourceLineNo">035</span> if(! p_implData.getBcn__IsNotDefault())<a name="line.35"></a>
<span class="sourceLineNo">036</span> {<a name="line.36"></a>
<span class="sourceLineNo">037</span> p_implData.setBcn("");<a name="line.37"></a>
<span class="sourceLineNo">038</span> }<a name="line.38"></a>
-<span class="sourceLineNo">039</span> if(! p_implData.getBcv__IsNotDefault())<a name="line.39"></a>
+<span class="sourceLineNo">039</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.39"></a>
<span class="sourceLineNo">040</span> {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> p_implData.setBcv("");<a name="line.41"></a>
+<span class="sourceLineNo">041</span> p_implData.setFormat("html");<a name="line.41"></a>
<span class="sourceLineNo">042</span> }<a name="line.42"></a>
-<span class="sourceLineNo">043</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.43"></a>
+<span class="sourceLineNo">043</span> if(! p_implData.getBcv__IsNotDefault())<a name="line.43"></a>
<span class="sourceLineNo">044</span> {<a name="line.44"></a>
-<span class="sourceLineNo">045</span> p_implData.setFilter("general");<a name="line.45"></a>
+<span class="sourceLineNo">045</span> p_implData.setBcv("");<a name="line.45"></a>
<span class="sourceLineNo">046</span> }<a name="line.46"></a>
-<span class="sourceLineNo">047</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.47"></a>
+<span class="sourceLineNo">047</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.47"></a>
<span class="sourceLineNo">048</span> {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> p_implData.setFormat("html");<a name="line.49"></a>
+<span class="sourceLineNo">049</span> p_implData.setFilter("general");<a name="line.49"></a>
<span class="sourceLineNo">050</span> }<a name="line.50"></a>
<span class="sourceLineNo">051</span> return p_implData;<a name="line.51"></a>
<span class="sourceLineNo">052</span> }<a name="line.52"></a>
@@ -63,9 +63,9 @@
<span class="sourceLineNo">055</span> super(p_templateManager, __jamon_setOptionalArguments(p_implData));<a name="line.55"></a>
<span class="sourceLineNo">056</span> regionServer = p_implData.getRegionServer();<a name="line.56"></a>
<span class="sourceLineNo">057</span> bcn = p_implData.getBcn();<a name="line.57"></a>
-<span class="sourceLineNo">058</span> bcv = p_implData.getBcv();<a name="line.58"></a>
-<span class="sourceLineNo">059</span> filter = p_implData.getFilter();<a name="line.59"></a>
-<span class="sourceLineNo">060</span> format = p_implData.getFormat();<a name="line.60"></a>
+<span class="sourceLineNo">058</span> format = p_implData.getFormat();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> bcv = p_implData.getBcv();<a name="line.59"></a>
+<span class="sourceLineNo">060</span> filter = p_implData.getFilter();<a name="line.60"></a>
<span class="sourceLineNo">061</span> }<a name="line.61"></a>
<span class="sourceLineNo">062</span> <a name="line.62"></a>
<span class="sourceLineNo">063</span> @Override public void renderNoFlush(final java.io.Writer jamonWriter)<a name="line.63"></a>
@@ -94,8 +94,8 @@
<span class="sourceLineNo">086</span> // 41, 3<a name="line.86"></a>
<span class="sourceLineNo">087</span> {<a name="line.87"></a>
<span class="sourceLineNo">088</span> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__var_1 = new org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(this.getTemplateManager());<a name="line.88"></a>
-<span class="sourceLineNo">089</span> __jamon__var_1.setFormat("json" );<a name="line.89"></a>
-<span class="sourceLineNo">090</span> __jamon__var_1.setFilter(filter);<a name="line.90"></a>
+<span class="sourceLineNo">089</span> __jamon__var_1.setFilter(filter);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> __jamon__var_1.setFormat("json" );<a name="line.90"></a>
<span class="sourceLineNo">091</span> __jamon__var_1.renderNoFlush(jamonWriter);<a name="line.91"></a>
<span class="sourceLineNo">092</span> }<a name="line.92"></a>
<span class="sourceLineNo">093</span> // 41, 68<a name="line.93"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/images/hbasecon2016-stacked.png
----------------------------------------------------------------------
diff --git a/images/hbasecon2016-stacked.png b/images/hbasecon2016-stacked.png
new file mode 100644
index 0000000..4ff181e
Binary files /dev/null and b/images/hbasecon2016-stacked.png differ
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index eb42f7b..8961cbd 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -43794,6 +43794,8 @@
</dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestStoreScanner.html#testSkipColumn()">testSkipColumn()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestStoreScanner.html" title="class in org.apache.hadoop.hbase.regionserver">TestStoreScanner</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#testSkipEmptyColumns()">testSkipEmptyColumns()</a></span> - Method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/TestImportTsv.html" title="class in org.apache.hadoop.hbase.mapreduce">TestImportTsv</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/filter/TestFilter.html#testSkipFilter()">testSkipFilter()</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="./org/apache/hadoop/hbase/filter/TestFilter.html" title="class in org.apache.hadoop.hbase.filter">TestFilter</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/filter/TestFilterSerialization.html#testSkipFilter()">testSkipFilter()</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="./org/apache/hadoop/hbase/filter/TestFilterSerialization.html" title="class in org.apache.hadoop.hbase.filter">TestFilterSerialization</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 270ccc4..149878b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -156,8 +156,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestHFileBlockCompatibility.Writer.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TagUsage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestHFileBlockCompatibility.Writer.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestCacheOnWrite.CacheOnWriteType</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html b/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
index 3e6172b..e903f6e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html
@@ -310,15 +310,19 @@ implements org.apache.hadoop.conf.Configurable</pre>
</tr>
<tr class="altColor">
<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#testSkipEmptyColumns()">testSkipEmptyColumns</a></strong>()</code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#testTsvImporterTextMapperWithInvalidData()">testTsvImporterTextMapperWithInvalidData</a></strong>()</code>
<div class="block">If there are invalid data rows as inputs, then only those rows should be ignored.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#testWithoutAnExistingTableAndCreateTableSetToNo()">testWithoutAnExistingTableAndCreateTableSetToNo</a></strong>()</code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#validateHFiles(org.apache.hadoop.fs.FileSystem,%20java.lang.String,%20java.lang.String,%20int)">validateHFiles</a></strong>(org.apache.hadoop.fs.FileSystem fs,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> outputPath,
@@ -327,7 +331,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
<div class="block">Confirm ImportTsv via HFiles on fs.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static void</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#validateTable(org.apache.hadoop.conf.Configuration,%20org.apache.hadoop.hbase.TableName,%20java.lang.String,%20int,%20boolean)">validateTable</a></strong>(org.apache.hadoop.conf.Configuration conf,
org.apache.hadoop.hbase.TableName tableName,
@@ -738,13 +742,25 @@ implements org.apache.hadoop.conf.Configurable</pre>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
</li>
</ul>
+<a name="testSkipEmptyColumns()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSkipEmptyColumns</h4>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.368">testSkipEmptyColumns</a>()
+ throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl><dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
+</li>
+</ul>
<a name="doMROnTableTest(java.lang.String, int)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>doMROnTableTest</h4>
-<pre>private org.apache.hadoop.util.Tool <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.367">doMROnTableTest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> data,
+<pre>private org.apache.hadoop.util.Tool <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.380">doMROnTableTest</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> data,
int valueMultiplier)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -757,7 +773,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
<ul class="blockList">
<li class="blockList">
<h4>doMROnTableTest</h4>
-<pre>protected static org.apache.hadoop.util.Tool <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.371">doMROnTableTest</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> util,
+<pre>protected static org.apache.hadoop.util.Tool <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.384">doMROnTableTest</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> util,
org.apache.hadoop.hbase.TableName table,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> family,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> data,
@@ -773,7 +789,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
<ul class="blockList">
<li class="blockList">
<h4>doMROnTableTest</h4>
-<pre>protected static org.apache.hadoop.util.Tool <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.384">doMROnTableTest</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> util,
+<pre>protected static org.apache.hadoop.util.Tool <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.397">doMROnTableTest</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> util,
org.apache.hadoop.hbase.TableName table,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> family,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> data,
@@ -797,7 +813,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
<ul class="blockList">
<li class="blockList">
<h4>validateTable</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.450">validateTable</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.463">validateTable</a>(org.apache.hadoop.conf.Configuration conf,
org.apache.hadoop.hbase.TableName tableName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> family,
int valueMultiplier,
@@ -814,7 +830,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
<ul class="blockList">
<li class="blockList">
<h4>validateHFiles</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.501">validateHFiles</a>(org.apache.hadoop.fs.FileSystem fs,
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.514">validateHFiles</a>(org.apache.hadoop.fs.FileSystem fs,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> outputPath,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> family,
int expectedKVCount)
@@ -830,7 +846,7 @@ implements org.apache.hadoop.conf.Configurable</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>getKVCountFromHfile</h4>
-<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.544">getKVCountFromHfile</a>(org.apache.hadoop.fs.FileSystem fs,
+<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TestImportTsv.html#line.557">getKVCountFromHfile</a>(org.apache.hadoop.fs.FileSystem fs,
org.apache.hadoop.fs.Path p)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Method returns the total KVs in given hfile</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 0680047..4a03125 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -508,15 +508,15 @@
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestRegionServerMetrics.Metric.html" title="enum in org.apache.hadoop.hbase"><span class="strong">TestRegionServerMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestRegionServerMetrics.Metric.html" title="enum in org.apache.hadoop.hbase"><span class="strong">TestRegionServerMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index f45510d..b6de721 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -145,8 +145,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index d424d9d..d71494c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -544,8 +544,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DataBlockEncodingTool.Manipulation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DataBlockEncodingTool.Manipulation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">TestAtomicOperation.TestStep</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index cd0e6c5..9714a69 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -234,9 +234,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestLoadAndVerify.Counters</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index ba18d57..8dd84e9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -120,8 +120,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">FaultyFSLog.FailureType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">IOTestProvider.AllowedOperations</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">FaultyFSLog.FailureType</span></a></li>
</ul>
</li>
</ul>
[11/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
index 4b7d070..f29d477 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html
@@ -99,704 +99,706 @@
<span class="sourceLineNo">091</span> // If true, bad lines are logged to stderr. Default: false.<a name="line.91"></a>
<span class="sourceLineNo">092</span> public final static String LOG_BAD_LINES_CONF_KEY = "importtsv.log.bad.lines";<a name="line.92"></a>
<span class="sourceLineNo">093</span> public final static String SKIP_LINES_CONF_KEY = "importtsv.skip.bad.lines";<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.96"></a>
-<span class="sourceLineNo">097</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.97"></a>
-<span class="sourceLineNo">098</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.99"></a>
-<span class="sourceLineNo">100</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.102"></a>
-<span class="sourceLineNo">103</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.105"></a>
-<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * flipped to delete it when MR ends.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static class TsvParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Column families and qualifiers mapped to the TSV columns<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private final byte[][] families;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private final byte[][] qualifiers;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> private final byte separatorByte;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> private int rowKeyColumnIndex;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> private int maxColumnCount;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Default value must be negative<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @param separatorStr<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // Configure separator<a name="line.158"></a>
-<span class="sourceLineNo">159</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> Preconditions.checkArgument(separator.length == 1,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> "TsvParser only supports single-byte separators");<a name="line.161"></a>
-<span class="sourceLineNo">162</span> separatorByte = separator[0];<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Configure columns<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> maxColumnCount = columnStrings.size();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> families = new byte[maxColumnCount][];<a name="line.169"></a>
-<span class="sourceLineNo">170</span> qualifiers = new byte[maxColumnCount][];<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> String str = columnStrings.get(i);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rowKeyColumnIndex = i;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> continue;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> timestampKeyColumnIndex = i;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> continue;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> attrKeyColumnIndex = i;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> continue;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> cellVisibilityColumnIndex = i;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> continue;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> cellTTLColumnIndex = i;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> continue;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> String[] parts = str.split(":", 2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (parts.length == 1) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> families[i] = str.getBytes();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } else {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> families[i] = parts[0].getBytes();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> qualifiers[i] = parts[1].getBytes();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<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> public int getTimestampKeyColumnIndex() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return timestampKeyColumnIndex;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> public boolean hasAttributes() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> public boolean hasCellVisibility() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasCellTTL() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> public int getAttributesKeyColumnIndex() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return attrKeyColumnIndex;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public int getCellVisibilityColumnIndex() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return cellVisibilityColumnIndex;<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">233</span> public int getCellTTLColumnIndex() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return cellTTLColumnIndex;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> public int getRowKeyColumnIndex() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return rowKeyColumnIndex;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> public byte[] getFamily(int idx) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return families[idx];<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public byte[] getQualifier(int idx) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return qualifiers[idx];<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> throws BadTsvLineException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // Enumerate separator offsets<a name="line.250"></a>
-<span class="sourceLineNo">251</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < length; i++) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (lineBytes[i] == separatorByte) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> tabOffsets.add(i);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (tabOffsets.isEmpty()) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> throw new BadTsvLineException("No delimiter");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> tabOffsets.add(length);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> throw new BadTsvLineException("Excessive columns");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throw new BadTsvLineException("No row key");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> } else if (hasTimestamp()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new BadTsvLineException("No timestamp");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new BadTsvLineException("No attributes specified");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.273"></a>
-<span class="sourceLineNo">274</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> class ParsedLine {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> private final ArrayList<Integer> tabOffsets;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private byte[] lineBytes;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ParsedLine(ArrayList<Integer> tabOffsets, byte[] lineBytes) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.tabOffsets = tabOffsets;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.lineBytes = lineBytes;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> public int getRowKeyOffset() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return getColumnOffset(rowKeyColumnIndex);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public int getRowKeyLength() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return getColumnLength(rowKeyColumnIndex);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> public long getTimestamp(long ts) throws BadTsvLineException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // Return ts if HBASE_TS_KEY is not configured in column spec<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (!hasTimestamp()) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return ts;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> String timeStampStr = Bytes.toString(lineBytes,<a name="line.302"></a>
-<span class="sourceLineNo">303</span> getColumnOffset(timestampKeyColumnIndex),<a name="line.303"></a>
-<span class="sourceLineNo">304</span> getColumnLength(timestampKeyColumnIndex));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return Long.parseLong(timeStampStr);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> } catch (NumberFormatException nfe) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // treat this record as bad record<a name="line.308"></a>
-<span class="sourceLineNo">309</span> throw new BadTsvLineException("Invalid timestamp " + timeStampStr);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> private String getAttributes() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (!hasAttributes()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return Bytes.toString(lineBytes, getColumnOffset(attrKeyColumnIndex),<a name="line.317"></a>
-<span class="sourceLineNo">318</span> getColumnLength(attrKeyColumnIndex));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public String[] getIndividualAttributes() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> String attributes = getAttributes();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (attributes != null) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return attributes.split(DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return null;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> public int getAttributeKeyOffset() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (hasAttributes()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return getColumnOffset(attrKeyColumnIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> public int getAttributeKeyLength() {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (hasAttributes()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return getColumnLength(attrKeyColumnIndex);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> public int getCellVisibilityColumnOffset() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (hasCellVisibility()) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return getColumnOffset(cellVisibilityColumnIndex);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> public int getCellVisibilityColumnLength() {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> if (hasCellVisibility()) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return getColumnLength(cellVisibilityColumnIndex);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> } else {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> public String getCellVisibility() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (!hasCellVisibility()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return null;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return Bytes.toString(lineBytes, getColumnOffset(cellVisibilityColumnIndex),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> getColumnLength(cellVisibilityColumnIndex));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> public int getCellTTLColumnOffset() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (hasCellTTL()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return getColumnOffset(cellTTLColumnIndex);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } else {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> public int getCellTTLColumnLength() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (hasCellTTL()) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return getColumnLength(cellTTLColumnIndex);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> public long getCellTTL() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (!hasCellTTL()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return 0;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } else {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return Bytes.toLong(lineBytes, getColumnOffset(cellTTLColumnIndex),<a name="line.392"></a>
-<span class="sourceLineNo">393</span> getColumnLength(cellTTLColumnIndex));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> public int getColumnOffset(int idx) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (idx > 0)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return tabOffsets.get(idx - 1) + 1;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> else<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return 0;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public int getColumnLength(int idx) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return tabOffsets.get(idx) - getColumnOffset(idx);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> public int getColumnCount() {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return tabOffsets.size();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public byte[] getLineBytes() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return lineBytes;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> public static class BadTsvLineException extends Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public BadTsvLineException(String err) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super(err);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> private static final long serialVersionUID = 1L;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Return starting position and length of row key from the specified line bytes.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * @param lineBytes<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * @param length<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * @return Pair of row key offset and length.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * @throws BadTsvLineException<a name="line.426"></a>
-<span class="sourceLineNo">427</span> */<a name="line.427"></a>
-<span class="sourceLineNo">428</span> public Pair<Integer, Integer> parseRowKey(byte[] lineBytes, int length)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> throws BadTsvLineException {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> int rkColumnIndex = 0;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> int startPos = 0, endPos = 0;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (int i = 0; i <= length; i++) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (i == length || lineBytes[i] == separatorByte) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> endPos = i - 1;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (rkColumnIndex++ == getRowKeyColumnIndex()) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if ((endPos + 1) == startPos) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throw new BadTsvLineException("Empty value for ROW KEY.");<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> startPos = endPos + 2;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (i == length) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> throw new BadTsvLineException(<a name="line.445"></a>
-<span class="sourceLineNo">446</span> "Row key does not exist as number of columns in the line"<a name="line.446"></a>
-<span class="sourceLineNo">447</span> + " are less than row key position.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return new Pair<Integer, Integer>(startPos, endPos - startPos + 1);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Sets up the actual job.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param conf The current configuration.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param args The command line parameters.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @return The newly created job.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @throws IOException When setting up the job fails.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> throws IOException, ClassNotFoundException {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Job job = null;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> boolean isDryRun = conf.getBoolean(DRY_RUN_CONF_KEY, false);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try (Connection connection = ConnectionFactory.createConnection(conf)) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> try (Admin admin = connection.getAdmin()) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> // Support non-XML supported characters<a name="line.468"></a>
-<span class="sourceLineNo">469</span> // by re-encoding the passed separator as a Base64 string.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (actualSeparator != null) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> // See if a non-default Mapper was set<a name="line.476"></a>
-<span class="sourceLineNo">477</span> String mapperClassName = conf.get(MAPPER_CONF_KEY);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Class mapperClass = mapperClassName != null? Class.forName(mapperClassName): DEFAULT_MAPPER;<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> Path inputDir = new Path(args[1]);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + "_" + tableName.getNameAsString());<a name="line.482"></a>
-<span class="sourceLineNo">483</span> job = Job.getInstance(conf, jobName);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> job.setJarByClass(mapperClass);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> FileInputFormat.setInputPaths(job, inputDir);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> job.setInputFormatClass(TextInputFormat.class);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> job.setMapperClass(mapperClass);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> String[] columns = conf.getStrings(COLUMNS_CONF_KEY);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> String fileLoc = conf.get(CREDENTIALS_LOCATION);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> job.getCredentials().addAll(cred);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (hfileOutPath != null) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (!admin.tableExists(tableName)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> LOG.warn(format("Table '%s' does not exist.", tableName));<a name="line.499"></a>
-<span class="sourceLineNo">500</span> if ("yes".equalsIgnoreCase(conf.get(CREATE_TABLE_CONF_KEY, "yes"))) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> // TODO: this is backwards. Instead of depending on the existence of a table,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // create a sane splits file for HFileOutputFormat based on data sampling.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> createTable(admin, tableName, columns);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (isDryRun) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> LOG.warn("Dry run: Table will be deleted at end of dry run.");<a name="line.505"></a>
-<span class="sourceLineNo">506</span> synchronized (ImportTsv.class) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> DRY_RUN_TABLE_CREATED = true;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String errorMsg =<a name="line.511"></a>
-<span class="sourceLineNo">512</span> format("Table '%s' does not exist and '%s' is set to no.", tableName,<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CREATE_TABLE_CONF_KEY);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> LOG.error(errorMsg);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> throw new TableNotFoundException(errorMsg);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> try (Table table = connection.getTable(tableName);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> RegionLocator regionLocator = connection.getRegionLocator(tableName)) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> boolean noStrict = conf.getBoolean(NO_STRICT_COL_FAMILY, false);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> // if no.strict is false then check column family<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if(!noStrict) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> ArrayList<String> unmatchedFamilies = new ArrayList<String>();<a name="line.523"></a>
-<span class="sourceLineNo">524</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> HTableDescriptor tDesc = table.getTableDescriptor();<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (String cf : cfSet) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> if(tDesc.getFamily(Bytes.toBytes(cf)) == null) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> unmatchedFamilies.add(cf);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> if(unmatchedFamilies.size() > 0) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> ArrayList<String> familyNames = new ArrayList<String>();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> for (HColumnDescriptor family : table.getTableDescriptor().getFamilies()) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> familyNames.add(family.getNameAsString());<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> String msg =<a name="line.536"></a>
-<span class="sourceLineNo">537</span> "Column Families " + unmatchedFamilies + " specified in " + COLUMNS_CONF_KEY<a name="line.537"></a>
-<span class="sourceLineNo">538</span> + " does not match with any of the table " + tableName<a name="line.538"></a>
-<span class="sourceLineNo">539</span> + " column families " + familyNames + ".\n"<a name="line.539"></a>
-<span class="sourceLineNo">540</span> + "To disable column family check, use -D" + NO_STRICT_COL_FAMILY<a name="line.540"></a>
-<span class="sourceLineNo">541</span> + "=true.\n";<a name="line.541"></a>
-<span class="sourceLineNo">542</span> usage(msg);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> System.exit(-1);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> }<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> job.setMapOutputValueClass(Text.class);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> job.setReducerClass(TextSortReducer.class);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> job.setMapOutputValueClass(Put.class);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> job.setCombinerClass(PutCombiner.class);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> job.setReducerClass(PutSortReducer.class);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (!isDryRun) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> Path outputDir = new Path(hfileOutPath);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> FileOutputFormat.setOutputPath(job, outputDir);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> HFileOutputFormat2.configureIncrementalLoad(job, table.getTableDescriptor(),<a name="line.557"></a>
-<span class="sourceLineNo">558</span> regionLocator);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> } else {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> if (!admin.tableExists(tableName)) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> String errorMsg = format("Table '%s' does not exist.", tableName);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> LOG.error(errorMsg);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> throw new TableNotFoundException(errorMsg);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> usage(TsvImporterTextMapper.class.toString()<a name="line.568"></a>
-<span class="sourceLineNo">569</span> + " should not be used for non bulkloading case. use "<a name="line.569"></a>
-<span class="sourceLineNo">570</span> + TsvImporterMapper.class.toString()<a name="line.570"></a>
-<span class="sourceLineNo">571</span> + " or custom mapper whose value type is Put.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> System.exit(-1);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (!isDryRun) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // No reducers. Just write straight to table. Call initTableReducerJob<a name="line.575"></a>
-<span class="sourceLineNo">576</span> // to set up the TableOutputFormat.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> job.setNumReduceTasks(0);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> if (isDryRun) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> job.setOutputFormatClass(NullOutputFormat.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> job.getConfiguration().setStrings("io.serializations",<a name="line.583"></a>
-<span class="sourceLineNo">584</span> job.getConfiguration().get("io.serializations"),<a name="line.584"></a>
-<span class="sourceLineNo">585</span> MutationSerialization.class.getName(), ResultSerialization.class.getName(),<a name="line.585"></a>
-<span class="sourceLineNo">586</span> KeyValueSerialization.class.getName());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> TableMapReduceUtil.addDependencyJars(job);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a name="line.589"></a>
-<span class="sourceLineNo">590</span> com.google.common.base.Function.class /* Guava used by TsvParser */);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> return job;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span> private static void createTable(Admin admin, TableName tableName, String[] columns)<a name="line.596"></a>
-<span class="sourceLineNo">597</span> throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> for (String cf : cfSet) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> HColumnDescriptor hcd = new HColumnDescriptor(Bytes.toBytes(cf));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> htd.addFamily(hcd);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> LOG.warn(format("Creating table '%s' with '%s' columns and default descriptors.",<a name="line.604"></a>
-<span class="sourceLineNo">605</span> tableName, cfSet));<a name="line.605"></a>
-<span class="sourceLineNo">606</span> admin.createTable(htd);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> private static void deleteTable(Configuration conf, String[] args) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> try (Connection connection = ConnectionFactory.createConnection(conf);<a name="line.611"></a>
-<span class="sourceLineNo">612</span> Admin admin = connection.getAdmin()) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> admin.disableTable(tableName);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (TableNotEnabledException e) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> LOG.debug("Dry mode: Table: " + tableName + " already disabled, so just deleting it.");<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> admin.deleteTable(tableName);<a name="line.618"></a>
-<span class="sourceLineNo">619</span> } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> LOG.error(format("***Dry run: Failed to delete table '%s'.***%n%s", tableName,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> e.toString()));<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> LOG.info(format("Dry run: Deleted table '%s'.", tableName));<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> private static Set<String> getColumnFamilies(String[] columns) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> Set<String> cfSet = new HashSet<String>();<a name="line.628"></a>
-<span class="sourceLineNo">629</span> for (String aColumn : columns) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span> if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)<a name="line.630"></a>
-<span class="sourceLineNo">631</span> || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)<a name="line.631"></a>
-<span class="sourceLineNo">632</span> || TsvParser.CELL_VISIBILITY_COLUMN_SPEC.equals(aColumn)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> || TsvParser.CELL_TTL_COLUMN_SPEC.equals(aColumn)<a name="line.633"></a>
-<span class="sourceLineNo">634</span> || TsvParser.ATTRIBUTES_COLUMN_SPEC.equals(aColumn))<a name="line.634"></a>
-<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
-<span class="sourceLineNo">636</span> // we are only concerned with the first one (in case this is a cf:cq)<a name="line.636"></a>
-<span class="sourceLineNo">637</span> cfSet.add(aColumn.split(":", 2)[0]);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> }<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return cfSet;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> /*<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param errorMsg Error message. Can be null.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> */<a name="line.644"></a>
-<span class="sourceLineNo">645</span> private static void usage(final String errorMsg) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> System.err.println("ERROR: " + errorMsg);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> String usage =<a name="line.649"></a>
-<span class="sourceLineNo">650</span> "Usage: " + NAME + " -D"+ COLUMNS_CONF_KEY + "=a,b,c <tablename> <inputdir>\n" +<a name="line.650"></a>
-<span class="sourceLineNo">651</span> "\n" +<a name="line.651"></a>
-<span class="sourceLineNo">652</span> "Imports the given input directory of TSV data into the specified table.\n" +<a name="line.652"></a>
-<span class="sourceLineNo">653</span> "\n" +<a name="line.653"></a>
-<span class="sourceLineNo">654</span> "The column names of the TSV data must be specified using the -D" + COLUMNS_CONF_KEY + "\n" +<a name="line.654"></a>
-<span class="sourceLineNo">655</span> "option. This option takes the form of comma-separated column names, where each\n" +<a name="line.655"></a>
-<span class="sourceLineNo">656</span> "column name is either a simple column family, or a columnfamily:qualifier. The special\n" +<a name="line.656"></a>
-<span class="sourceLineNo">657</span> "column name " + TsvParser.ROWKEY_COLUMN_SPEC + " is used to designate that this column should be used\n" +<a name="line.657"></a>
-<span class="sourceLineNo">658</span> "as the row key for each imported record. You must specify exactly one column\n" +<a name="line.658"></a>
-<span class="sourceLineNo">659</span> "to be the row key, and you must specify a column name for every column that exists in the\n" +<a name="line.659"></a>
-<span class="sourceLineNo">660</span> "input data. Another special column" + TsvParser.TIMESTAMPKEY_COLUMN_SPEC +<a name="line.660"></a>
-<span class="sourceLineNo">661</span> " designates that this column should be\n" +<a name="line.661"></a>
-<span class="sourceLineNo">662</span> "used as timestamp for each record. Unlike " + TsvParser.ROWKEY_COLUMN_SPEC + ", " +<a name="line.662"></a>
-<span class="sourceLineNo">663</span> TsvParser.TIMESTAMPKEY_COLUMN_SPEC + " is optional." + "\n" +<a name="line.663"></a>
-<span class="sourceLineNo">664</span> "You must specify at most one column as timestamp key for each imported record.\n" +<a name="line.664"></a>
-<span class="sourceLineNo">665</span> "Record with invalid timestamps (blank, non-numeric) will be treated as bad record.\n" +<a name="line.665"></a>
-<span class="sourceLineNo">666</span> "Note: if you use this option, then '" + TIMESTAMP_CONF_KEY + "' option will be ignored.\n" +<a name="line.666"></a>
-<span class="sourceLineNo">667</span> "\n" +<a name="line.667"></a>
-<span class="sourceLineNo">668</span> "Other special columns that can be specified are " + TsvParser.CELL_TTL_COLUMN_SPEC +<a name="line.668"></a>
-<span class="sourceLineNo">669</span> " and " + TsvParser.CELL_VISIBILITY_COLUMN_SPEC + ".\n" +<a name="line.669"></a>
-<span class="sourceLineNo">670</span> TsvParser.CELL_TTL_COLUMN_SPEC + " designates that this column will be used " +<a name="line.670"></a>
-<span class="sourceLineNo">671</span> "as a Cell's Time To Live (TTL) attribute.\n" +<a name="line.671"></a>
-<span class="sourceLineNo">672</span> TsvParser.CELL_VISIBILITY_COLUMN_SPEC + " designates that this column contains the " +<a name="line.672"></a>
-<span class="sourceLineNo">673</span> "visibility label expression.\n" +<a name="line.673"></a>
-<span class="sourceLineNo">674</span> "\n" +<a name="line.674"></a>
-<span class="sourceLineNo">675</span> TsvParser.ATTRIBUTES_COLUMN_SPEC+" can be used to specify Operation Attributes per record.\n"+<a name="line.675"></a>
-<span class="sourceLineNo">676</span> " Should be specified as key=>value where "+TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX+ " is used \n"+<a name="line.676"></a>
-<span class="sourceLineNo">677</span> " as the seperator. Note that more than one OperationAttributes can be specified.\n"+<a name="line.677"></a>
-<span class="sourceLineNo">678</span> "By default importtsv will load data directly into HBase. To instead generate\n" +<a name="line.678"></a>
-<span class="sourceLineNo">679</span> "HFiles of data to prepare for a bulk data load, pass the option:\n" +<a name="line.679"></a>
-<span class="sourceLineNo">680</span> " -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output\n" +<a name="line.680"></a>
-<span class="sourceLineNo">681</span> " Note: if you do not use this option, then the target table must already exist in HBase\n" +<a name="line.681"></a>
-<span class="sourceLineNo">682</span> "\n" +<a name="line.682"></a>
-<span class="sourceLineNo">683</span> "Other options that may be specified with -D include:\n" +<a name="line.683"></a>
-<span class="sourceLineNo">684</span> " -D" + DRY_RUN_CONF_KEY + "=true - Dry run mode. Data is not actually populated into" +<a name="line.684"></a>
-<span class="sourceLineNo">685</span> " table. If table does not exist, it is created but deleted in the end.\n" +<a name="line.685"></a>
-<span class="sourceLineNo">686</span> " -D" + SKIP_LINES_CONF_KEY + "=false - fail if encountering an invalid line\n" +<a name="line.686"></a>
-<span class="sourceLineNo">687</span> " -D" + LOG_BAD_LINES_CONF_KEY + "=true - logs invalid lines to stderr\n" +<a name="line.687"></a>
-<span class="sourceLineNo">688</span> " '-D" + SEPARATOR_CONF_KEY + "=|' - eg separate on pipes instead of tabs\n" +<a name="line.688"></a>
-<span class="sourceLineNo">689</span> " -D" + TIMESTAMP_CONF_KEY + "=currentTimeAsLong - use the specified timestamp for the import\n" +<a name="line.689"></a>
-<span class="sourceLineNo">690</span> " -D" + MAPPER_CONF_KEY + "=my.Mapper - A user-defined Mapper to use instead of " +<a name="line.690"></a>
-<span class="sourceLineNo">691</span> DEFAULT_MAPPER.getName() + "\n" +<a name="line.691"></a>
-<span class="sourceLineNo">692</span> " -D" + JOB_NAME_CONF_KEY + "=jobName - use the specified mapreduce job name for the import\n" +<a name="line.692"></a>
-<span class="sourceLineNo">693</span> " -D" + CREATE_TABLE_CONF_KEY + "=no - can be used to avoid creation of table by this tool\n" +<a name="line.693"></a>
-<span class="sourceLineNo">694</span> " Note: if you set this to 'no', then the target table must already exist in HBase\n" +<a name="line.694"></a>
-<span class="sourceLineNo">695</span> " -D" + NO_STRICT_COL_FAMILY + "=true - ignore column family check in hbase table. " +<a name="line.695"></a>
-<span class="sourceLineNo">696</span> "Default is false\n\n" +<a name="line.696"></a>
-<span class="sourceLineNo">697</span> "For performance consider the following options:\n" +<a name="line.697"></a>
-<span class="sourceLineNo">698</span> " -Dmapreduce.map.speculative=false\n" +<a name="line.698"></a>
-<span class="sourceLineNo">699</span> " -Dmapreduce.reduce.speculative=false";<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> System.err.println(usage);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> @Override<a name="line.704"></a>
-<span class="sourceLineNo">705</span> public int run(String[] args) throws Exception {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> if (args.length < 2) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> usage("Wrong number of arguments: " + args.length);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> return -1;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span> // When MAPPER_CONF_KEY is null, the user wants to use the provided TsvImporterMapper, so<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // perform validation on these additional args. When it's not null, user has provided their<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // own mapper, thus these validation are not relevant.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> // TODO: validation for TsvImporterMapper, not this tool. Move elsewhere.<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (null == getConf().get(MAPPER_CONF_KEY)) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> // Make sure columns are specified<a name="line.716"></a>
-<span class="sourceLineNo">717</span> String[] columns = getConf().getStrings(COLUMNS_CONF_KEY);<a name="line.717"></a>
-<span class="sourceLineNo">718</span> if (columns == null) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> usage("No columns specified. Please specify with -D" +<a name="line.719"></a>
-<span class="sourceLineNo">720</span> COLUMNS_CONF_KEY+"=...");<a name="line.720"></a>
-<span class="sourceLineNo">721</span> return -1;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Make sure they specify exactly one column as the row key<a name="line.724"></a>
-<span class="sourceLineNo">725</span> int rowkeysFound = 0;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> for (String col : columns) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span> if (col.equals(TsvParser.ROWKEY_COLUMN_SPEC)) rowkeysFound++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span> }<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (rowkeysFound != 1) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> usage("Must specify exactly one column as " + TsvParser.ROWKEY_COLUMN_SPEC);<a name="line.730"></a>
-<span class="sourceLineNo">731</span> return -1;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> }<a name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span> // Make sure we have at most one column as the timestamp key<a name="line.734"></a>
-<span class="sourceLineNo">735</span> int tskeysFound = 0;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> for (String col : columns) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (col.equals(TsvParser.TIMESTAMPKEY_COLUMN_SPEC))<a name="line.737"></a>
-<span class="sourceLineNo">738</span> tskeysFound++;<a name="line.738"></a>
-<span class="sourceLineNo">739</span> }<a name="line.739"></a>
-<span class="sourceLineNo">740</span> if (tskeysFound > 1) {<a name="line.740"></a>
-<span class="sourceLineNo">741</span> usage("Must specify at most one column as "<a name="line.741"></a>
-<span class="sourceLineNo">742</span> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return -1;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> int attrKeysFound = 0;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> for (String col : columns) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (col.equals(TsvParser.ATTRIBUTES_COLUMN_SPEC))<a name="line.748"></a>
-<span class="sourceLineNo">749</span> attrKeysFound++;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> if (attrKeysFound > 1) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> usage("Must specify at most one column as "<a name="line.752"></a>
-<span class="sourceLineNo">753</span> + TsvParser.ATTRIBUTES_COLUMN_SPEC);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> return -1;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> }<a name="line.755"></a>
-<span class="sourceLineNo">756</span><a name="line.756"></a>
-<span class="sourceLineNo">757</span> // Make sure one or more columns are specified excluding rowkey and<a name="line.757"></a>
-<span class="sourceLineNo">758</span> // timestamp key<a name="line.758"></a>
-<span class="sourceLineNo">759</span> if (columns.length - (rowkeysFound + tskeysFound + attrKeysFound) < 1) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> usage("One or more columns in addition to the row key and timestamp(optional) are required");<a name="line.760"></a>
-<span class="sourceLineNo">761</span> return -1;<a name="line.761"></a>
-<span class="sourceLineNo">762</span> }<a name="line.762"></a>
-<span class="sourceLineNo">763</span> }<a name="line.763"></a>
-<span class="sourceLineNo">764</span><a name="line.764"></a>
-<span class="sourceLineNo">765</span> // If timestamp option is not specified, use current system time.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> long timstamp = getConf().getLong(TIMESTAMP_CONF_KEY, System.currentTimeMillis());<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span> // Set it back to replace invalid timestamp (non-numeric) with current<a name="line.768"></a>
-<span class="sourceLineNo">769</span> // system time<a name="line.769"></a>
-<span class="sourceLineNo">770</span> getConf().setLong(TIMESTAMP_CONF_KEY, timstamp);<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> synchronized (ImportTsv.class) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span> DRY_RUN_TABLE_CREATED = false;<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span> Job job = createSubmittableJob(getConf(), args);<a name="line.775"></a>
-<span class="sourceLineNo">776</span> boolean success = job.waitForCompletion(true);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> boolean delete = false;<a name="line.777"></a>
-<span class="sourceLineNo">778</span> synchronized (ImportTsv.class) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> delete = DRY_RUN_TABLE_CREATED;<a name="line.779"></a>
-<span class="sourceLineNo">780</span> }<a name="line.780"></a>
-<span class="sourceLineNo">781</span> if (delete) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span> deleteTable(getConf(), args);<a name="line.782"></a>
-<span class="sourceLineNo">783</span> }<a name="line.783"></a>
-<span class="sourceLineNo">784</span> return success ? 0 : 1;<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span> public static void main(String[] args) throws Exception {<a name="line.787"></a>
-<span class="sourceLineNo">788</span> int status = ToolRunner.run(HBaseConfiguration.create(), new ImportTsv(), args);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> System.exit(status);<a name="line.789"></a>
-<span class="sourceLineNo">790</span> }<a name="line.790"></a>
-<span class="sourceLineNo">791</span>}<a name="line.791"></a>
+<span class="sourceLineNo">094</span> public final static String SKIP_EMPTY_COLUMNS = "importtsv.skip.empty.columns";<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.97"></a>
+<span class="sourceLineNo">098</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.98"></a>
+<span class="sourceLineNo">099</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.102"></a>
+<span class="sourceLineNo">103</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * flipped to delete it when MR ends.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> public static class TsvParser {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Column families and qualifiers mapped to the TSV columns<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private final byte[][] families;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private final byte[][] qualifiers;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> private final byte separatorByte;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> private int rowKeyColumnIndex;<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> private int maxColumnCount;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Default value must be negative<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @param separatorStr<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // Configure separator<a name="line.159"></a>
+<span class="sourceLineNo">160</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Preconditions.checkArgument(separator.length == 1,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> "TsvParser only supports single-byte separators");<a name="line.162"></a>
+<span class="sourceLineNo">163</span> separatorByte = separator[0];<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Configure columns<a name="line.165"></a>
+<span class="sourceLineNo">166</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.166"></a>
+<span class="sourceLineNo">167</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> maxColumnCount = columnStrings.size();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> families = new byte[maxColumnCount][];<a name="line.170"></a>
+<span class="sourceLineNo">171</span> qualifiers = new byte[maxColumnCount][];<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String str = columnStrings.get(i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> rowKeyColumnIndex = i;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> continue;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> timestampKeyColumnIndex = i;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> continue;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> attrKeyColumnIndex = i;<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> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> cellVisibilityColumnIndex = i;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> continue;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cellTTLColumnIndex = i;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> continue;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> String[] parts = str.split(":", 2);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (parts.length == 1) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> families[i] = str.getBytes();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } else {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> families[i] = parts[0].getBytes();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> qualifiers[i] = parts[1].getBytes();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> public int getTimestampKeyColumnIndex() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return timestampKeyColumnIndex;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> public boolean hasAttributes() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> public boolean hasCellVisibility() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public boolean hasCellTTL() {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> public int getAttributesKeyColumnIndex() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return attrKeyColumnIndex;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> public int getCellVisibilityColumnIndex() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return cellVisibilityColumnIndex;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> public int getCellTTLColumnIndex() {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return cellTTLColumnIndex;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> public int getRowKeyColumnIndex() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return rowKeyColumnIndex;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> public byte[] getFamily(int idx) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return families[idx];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public byte[] getQualifier(int idx) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return qualifiers[idx];<a name="line.246"></a>
+<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> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> throws BadTsvLineException {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // Enumerate separator offsets<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (int i = 0; i < length; i++) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (lineBytes[i] == separatorByte) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> tabOffsets.add(i);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (tabOffsets.isEmpty()) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> throw new BadTsvLineException("No delimiter");<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> tabOffsets.add(length);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new BadTsvLineException("Excessive columns");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throw new BadTsvLineException("No row key");<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else if (hasTimestamp()<a name="line.268"></a>
+<span class="sourceLineNo">269</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> throw new BadTsvLineException("No timestamp");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new BadTsvLineException("No attributes specified");<a name="line.272"></a>
+<span class="sourceLineNo">273</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> class ParsedLine {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private final ArrayList<Integer> tabOffsets;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private byte[] lineB
<TRUNCATED>
[14/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
index a8dffde..cdb5bd9 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
@@ -99,7 +99,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.112">ImportTsv.TsvParser</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.113">ImportTsv.TsvParser</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -333,7 +333,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>families</h4>
-<pre>private final byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.116">families</a></pre>
+<pre>private final byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.117">families</a></pre>
<div class="block">Column families and qualifiers mapped to the TSV columns</div>
</li>
</ul>
@@ -343,7 +343,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>qualifiers</h4>
-<pre>private final byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.117">qualifiers</a></pre>
+<pre>private final byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.118">qualifiers</a></pre>
</li>
</ul>
<a name="separatorByte">
@@ -352,7 +352,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>separatorByte</h4>
-<pre>private final byte <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.119">separatorByte</a></pre>
+<pre>private final byte <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.120">separatorByte</a></pre>
</li>
</ul>
<a name="rowKeyColumnIndex">
@@ -361,7 +361,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>rowKeyColumnIndex</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.121">rowKeyColumnIndex</a></pre>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.122">rowKeyColumnIndex</a></pre>
</li>
</ul>
<a name="maxColumnCount">
@@ -370,7 +370,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>maxColumnCount</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.123">maxColumnCount</a></pre>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.124">maxColumnCount</a></pre>
</li>
</ul>
<a name="DEFAULT_TIMESTAMP_COLUMN_INDEX">
@@ -379,7 +379,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_TIMESTAMP_COLUMN_INDEX</h4>
-<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.126">DEFAULT_TIMESTAMP_COLUMN_INDEX</a></pre>
+<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.127">DEFAULT_TIMESTAMP_COLUMN_INDEX</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.DEFAULT_TIMESTAMP_COLUMN_INDEX">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -389,7 +389,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>timestampKeyColumnIndex</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.128">timestampKeyColumnIndex</a></pre>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.129">timestampKeyColumnIndex</a></pre>
</li>
</ul>
<a name="ROWKEY_COLUMN_SPEC">
@@ -398,7 +398,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROWKEY_COLUMN_SPEC</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.130">ROWKEY_COLUMN_SPEC</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.131">ROWKEY_COLUMN_SPEC</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.ROWKEY_COLUMN_SPEC">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -408,7 +408,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>TIMESTAMPKEY_COLUMN_SPEC</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.132">TIMESTAMPKEY_COLUMN_SPEC</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.133">TIMESTAMPKEY_COLUMN_SPEC</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.TIMESTAMPKEY_COLUMN_SPEC">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -418,7 +418,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ATTRIBUTES_COLUMN_SPEC</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.134">ATTRIBUTES_COLUMN_SPEC</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.135">ATTRIBUTES_COLUMN_SPEC</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.ATTRIBUTES_COLUMN_SPEC">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -428,7 +428,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>CELL_VISIBILITY_COLUMN_SPEC</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.136">CELL_VISIBILITY_COLUMN_SPEC</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.137">CELL_VISIBILITY_COLUMN_SPEC</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.CELL_VISIBILITY_COLUMN_SPEC">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -438,7 +438,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>CELL_TTL_COLUMN_SPEC</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.138">CELL_TTL_COLUMN_SPEC</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.139">CELL_TTL_COLUMN_SPEC</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.CELL_TTL_COLUMN_SPEC">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -448,7 +448,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>attrKeyColumnIndex</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.140">attrKeyColumnIndex</a></pre>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.141">attrKeyColumnIndex</a></pre>
</li>
</ul>
<a name="DEFAULT_ATTRIBUTES_COLUMN_INDEX">
@@ -457,7 +457,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_ATTRIBUTES_COLUMN_INDEX</h4>
-<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.142">DEFAULT_ATTRIBUTES_COLUMN_INDEX</a></pre>
+<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.143">DEFAULT_ATTRIBUTES_COLUMN_INDEX</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -467,7 +467,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_CELL_VISIBILITY_COLUMN_INDEX</h4>
-<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.144">DEFAULT_CELL_VISIBILITY_COLUMN_INDEX</a></pre>
+<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.145">DEFAULT_CELL_VISIBILITY_COLUMN_INDEX</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.DEFAULT_CELL_VISIBILITY_COLUMN_INDEX">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -477,7 +477,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_CELL_TTL_COLUMN_INDEX</h4>
-<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.146">DEFAULT_CELL_TTL_COLUMN_INDEX</a></pre>
+<pre>public static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.147">DEFAULT_CELL_TTL_COLUMN_INDEX</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.DEFAULT_CELL_TTL_COLUMN_INDEX">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -487,7 +487,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>cellVisibilityColumnIndex</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.148">cellVisibilityColumnIndex</a></pre>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.149">cellVisibilityColumnIndex</a></pre>
</li>
</ul>
<a name="cellTTLColumnIndex">
@@ -496,7 +496,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>cellTTLColumnIndex</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.150">cellTTLColumnIndex</a></pre>
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.151">cellTTLColumnIndex</a></pre>
</li>
</ul>
</li>
@@ -513,7 +513,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>ImportTsv.TsvParser</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.157">ImportTsv.TsvParser</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> columnsSpecification,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.158">ImportTsv.TsvParser</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> columnsSpecification,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> separatorStr)</pre>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>columnsSpecification</code> - the list of columns to parser out, comma separated.
The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC</dd><dd><code>separatorStr</code> - </dd></dl>
@@ -533,7 +533,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>hasTimestamp</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.205">hasTimestamp</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.206">hasTimestamp</a>()</pre>
</li>
</ul>
<a name="getTimestampKeyColumnIndex()">
@@ -542,7 +542,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getTimestampKeyColumnIndex</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.209">getTimestampKeyColumnIndex</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.210">getTimestampKeyColumnIndex</a>()</pre>
</li>
</ul>
<a name="hasAttributes()">
@@ -551,7 +551,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>hasAttributes</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.213">hasAttributes</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.214">hasAttributes</a>()</pre>
</li>
</ul>
<a name="hasCellVisibility()">
@@ -560,7 +560,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>hasCellVisibility</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.217">hasCellVisibility</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.218">hasCellVisibility</a>()</pre>
</li>
</ul>
<a name="hasCellTTL()">
@@ -569,7 +569,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>hasCellTTL</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.221">hasCellTTL</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.222">hasCellTTL</a>()</pre>
</li>
</ul>
<a name="getAttributesKeyColumnIndex()">
@@ -578,7 +578,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getAttributesKeyColumnIndex</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.225">getAttributesKeyColumnIndex</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.226">getAttributesKeyColumnIndex</a>()</pre>
</li>
</ul>
<a name="getCellVisibilityColumnIndex()">
@@ -587,7 +587,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellVisibilityColumnIndex</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.229">getCellVisibilityColumnIndex</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.230">getCellVisibilityColumnIndex</a>()</pre>
</li>
</ul>
<a name="getCellTTLColumnIndex()">
@@ -596,7 +596,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getCellTTLColumnIndex</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.233">getCellTTLColumnIndex</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.234">getCellTTLColumnIndex</a>()</pre>
</li>
</ul>
<a name="getRowKeyColumnIndex()">
@@ -605,7 +605,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getRowKeyColumnIndex</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.237">getRowKeyColumnIndex</a>()</pre>
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.238">getRowKeyColumnIndex</a>()</pre>
</li>
</ul>
<a name="getFamily(int)">
@@ -614,7 +614,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getFamily</h4>
-<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.241">getFamily</a>(int idx)</pre>
+<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.242">getFamily</a>(int idx)</pre>
</li>
</ul>
<a name="getQualifier(int)">
@@ -623,7 +623,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>getQualifier</h4>
-<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.244">getQualifier</a>(int idx)</pre>
+<pre>public byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.245">getQualifier</a>(int idx)</pre>
</li>
</ul>
<a name="parse(byte[], int)">
@@ -632,7 +632,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>parse</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.ParsedLine</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.248">parse</a>(byte[] lineBytes,
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.ParsedLine</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.249">parse</a>(byte[] lineBytes,
int length)
throws <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.BadTsvLineException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -645,7 +645,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>parseRowKey</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.428">parseRowKey</a>(byte[] lineBytes,
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html#line.429">parseRowKey</a>(byte[] lineBytes,
int length)
throws <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.BadTsvLineException</a></pre>
<div class="block">Return starting position and length of row key from the specified line bytes.</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
index 30f5ff8..905bb3d 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
@@ -228,10 +228,14 @@ implements org.apache.hadoop.util.Tool</pre>
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></strong></code> </td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_EMPTY_COLUMNS">SKIP_EMPTY_COLUMNS</a></strong></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#SKIP_LINES_CONF_KEY">SKIP_LINES_CONF_KEY</a></strong></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html#TIMESTAMP_CONF_KEY">TIMESTAMP_CONF_KEY</a></strong></code> </td>
</tr>
</table>
@@ -425,13 +429,23 @@ implements org.apache.hadoop.util.Tool</pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_LINES_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
+<a name="SKIP_EMPTY_COLUMNS">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>SKIP_EMPTY_COLUMNS</h4>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.94">SKIP_EMPTY_COLUMNS</a></pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.SKIP_EMPTY_COLUMNS">Constant Field Values</a></dd></dl>
+</li>
+</ul>
<a name="COLUMNS_CONF_KEY">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>COLUMNS_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.94">COLUMNS_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.95">COLUMNS_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.COLUMNS_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -441,7 +455,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>SEPARATOR_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.95">SEPARATOR_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.96">SEPARATOR_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.SEPARATOR_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -451,7 +465,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>ATTRIBUTE_SEPERATOR_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.96">ATTRIBUTE_SEPERATOR_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.97">ATTRIBUTE_SEPERATOR_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.ATTRIBUTE_SEPERATOR_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -461,7 +475,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>CREDENTIALS_LOCATION</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.99">CREDENTIALS_LOCATION</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.100">CREDENTIALS_LOCATION</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.CREDENTIALS_LOCATION">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -471,7 +485,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_SEPARATOR</h4>
-<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.100">DEFAULT_SEPARATOR</a></pre>
+<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.101">DEFAULT_SEPARATOR</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.DEFAULT_SEPARATOR">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -481,7 +495,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_ATTRIBUTES_SEPERATOR</h4>
-<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.101">DEFAULT_ATTRIBUTES_SEPERATOR</a></pre>
+<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.102">DEFAULT_ATTRIBUTES_SEPERATOR</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.DEFAULT_ATTRIBUTES_SEPERATOR">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -491,7 +505,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR</h4>
-<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.102">DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR</a></pre>
+<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.103">DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -501,7 +515,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_MAPPER</h4>
-<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.103">DEFAULT_MAPPER</a></pre>
+<pre>static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.104">DEFAULT_MAPPER</a></pre>
</li>
</ul>
<a name="CREATE_TABLE_CONF_KEY">
@@ -510,7 +524,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>CREATE_TABLE_CONF_KEY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.104">CREATE_TABLE_CONF_KEY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.105">CREATE_TABLE_CONF_KEY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.CREATE_TABLE_CONF_KEY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -520,7 +534,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>NO_STRICT_COL_FAMILY</h4>
-<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.105">NO_STRICT_COL_FAMILY</a></pre>
+<pre>public static final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.106">NO_STRICT_COL_FAMILY</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.mapreduce.ImportTsv.NO_STRICT_COL_FAMILY">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -530,7 +544,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>DRY_RUN_TABLE_CREATED</h4>
-<pre>private static boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.110">DRY_RUN_TABLE_CREATED</a></pre>
+<pre>private static boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.111">DRY_RUN_TABLE_CREATED</a></pre>
<div class="block">If table didn't exist and was created in dry-run mode, this flag is
flipped to delete it when MR ends.</div>
</li>
@@ -566,7 +580,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>createSubmittableJob</h4>
-<pre>protected static org.apache.hadoop.mapreduce.Job <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.462">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>protected static org.apache.hadoop.mapreduce.Job <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.463">createSubmittableJob</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassNotFoundException.html?is-external=true" title="class or interface in java.lang">ClassNotFoundException</a></pre>
@@ -584,7 +598,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.596">createTable</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a> admin,
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.597">createTable</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a> admin,
<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> tableName,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] columns)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -598,7 +612,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>deleteTable</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.609">deleteTable</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.610">deleteTable</a>(org.apache.hadoop.conf.Configuration conf,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)</pre>
</li>
</ul>
@@ -608,7 +622,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>getColumnFamilies</h4>
-<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.627">getColumnFamilies</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] columns)</pre>
+<pre>private static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.628">getColumnFamilies</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] columns)</pre>
</li>
</ul>
<a name="usage(java.lang.String)">
@@ -617,7 +631,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>usage</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.645">usage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> errorMsg)</pre>
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.646">usage</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> errorMsg)</pre>
</li>
</ul>
<a name="run(java.lang.String[])">
@@ -626,7 +640,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockList">
<li class="blockList">
<h4>run</h4>
-<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.705">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.707">run</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><strong>Specified by:</strong></dt>
@@ -641,7 +655,7 @@ implements org.apache.hadoop.util.Tool</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.787">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.html#line.789">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
index b1a7508..7c010c3 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -179,18 +179,24 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>private boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#skipEmptyColumns">skipEmptyColumns</a></strong></code>
+<div class="block">Should skip empty columns</div>
+</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#tags">tags</a></strong></code>
<div class="block">List of cell tags</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>protected long</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#ts">ts</a></strong></code>
<div class="block">Timestamp for all inserted rows</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected long</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#ttl">ttl</a></strong></code> </td>
</tr>
@@ -328,13 +334,23 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<div class="block">Should skip bad lines</div>
</li>
</ul>
+<a name="skipEmptyColumns">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>skipEmptyColumns</h4>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.62">skipEmptyColumns</a></pre>
+<div class="block">Should skip empty columns</div>
+</li>
+</ul>
<a name="badLineCount">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>badLineCount</h4>
-<pre>private org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.61">badLineCount</a></pre>
+<pre>private org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.63">badLineCount</a></pre>
</li>
</ul>
<a name="logBadLines">
@@ -343,7 +359,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>logBadLines</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.62">logBadLines</a></pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.64">logBadLines</a></pre>
</li>
</ul>
<a name="parser">
@@ -352,7 +368,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>parser</h4>
-<pre>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.64">parser</a></pre>
+<pre>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.66">parser</a></pre>
</li>
</ul>
<a name="conf">
@@ -361,7 +377,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>conf</h4>
-<pre>protected org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.66">conf</a></pre>
+<pre>protected org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.68">conf</a></pre>
</li>
</ul>
<a name="cellVisibilityExpr">
@@ -370,7 +386,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>cellVisibilityExpr</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.68">cellVisibilityExpr</a></pre>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.70">cellVisibilityExpr</a></pre>
</li>
</ul>
<a name="ttl">
@@ -379,7 +395,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>ttl</h4>
-<pre>protected long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.70">ttl</a></pre>
+<pre>protected long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.72">ttl</a></pre>
</li>
</ul>
<a name="kvCreator">
@@ -388,7 +404,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>kvCreator</h4>
-<pre>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.72">kvCreator</a></pre>
+<pre>protected <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html" title="class in org.apache.hadoop.hbase.mapreduce">CellCreator</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.74">kvCreator</a></pre>
</li>
</ul>
<a name="hfileOutPath">
@@ -397,7 +413,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>hfileOutPath</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.74">hfileOutPath</a></pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.76">hfileOutPath</a></pre>
</li>
</ul>
<a name="tags">
@@ -406,7 +422,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockListLast">
<li class="blockList">
<h4>tags</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.77">tags</a></pre>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/Tag.html" title="interface in org.apache.hadoop.hbase">Tag</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.79">tags</a></pre>
<div class="block">List of cell tags</div>
</li>
</ul>
@@ -441,7 +457,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>getTs</h4>
-<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.79">getTs</a>()</pre>
+<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.81">getTs</a>()</pre>
</li>
</ul>
<a name="getSkipBadLines()">
@@ -450,7 +466,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>getSkipBadLines</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.83">getSkipBadLines</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.85">getSkipBadLines</a>()</pre>
</li>
</ul>
<a name="getBadLineCount()">
@@ -459,7 +475,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>getBadLineCount</h4>
-<pre>public org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.87">getBadLineCount</a>()</pre>
+<pre>public org.apache.hadoop.mapreduce.Counter <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.89">getBadLineCount</a>()</pre>
</li>
</ul>
<a name="incrementBadLineCount(int)">
@@ -468,7 +484,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>incrementBadLineCount</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.91">incrementBadLineCount</a>(int count)</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.93">incrementBadLineCount</a>(int count)</pre>
</li>
</ul>
<a name="setup(org.apache.hadoop.mapreduce.Mapper.Context)">
@@ -477,7 +493,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>setup</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.104">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.106">setup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
<div class="block">Handles initializing this class with objects specific to it (i.e., the parser).
Common initialization that might be leveraged by a subsclass is done in
<code>doSetup</code>. Hence a subclass may choose to override this method
@@ -494,7 +510,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>doSetup</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.121">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.123">doSetup</a>(org.apache.hadoop.mapreduce.Mapper.Context context)</pre>
<div class="block">Handles common parameter initialization that a subclass might want to leverage.</div>
<dl><dt><span class="strong">Parameters:</span></dt><dd><code>context</code> - </dd></dl>
</li>
@@ -505,7 +521,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockList">
<li class="blockList">
<h4>map</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.147">map</a>(org.apache.hadoop.io.LongWritable offset,
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.151">map</a>(org.apache.hadoop.io.LongWritable offset,
org.apache.hadoop.io.Text value,
org.apache.hadoop.mapreduce.Mapper.Context context)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -523,7 +539,7 @@ extends org.apache.hadoop.mapreduce.Mapper<org.apache.hadoop.io.LongWritable,
<ul class="blockListLast">
<li class="blockList">
<h4>populatePut</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.203">populatePut</a>(byte[] lineBytes,
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html#line.208">populatePut</a>(byte[] lineBytes,
<a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.ParsedLine.html" title="class in org.apache.hadoop.hbase.mapreduce">ImportTsv.TsvParser.ParsedLine</a> parsed,
<a href="../../../../../org/apache/hadoop/hbase/client/Put.html" title="class in org.apache.hadoop.hbase.client">Put</a> put,
int i)
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index d9e6127..269d48f 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -379,40 +379,40 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.110">m_master</a></pre>
</li>
</ul>
-<a name="m_metaLocation">
+<a name="m_format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_metaLocation</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_metaLocation</a></pre>
+<h4>m_format</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_format</a></pre>
</li>
</ul>
-<a name="m_metaLocation__IsNotDefault">
+<a name="m_format__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_metaLocation__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_metaLocation__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_format__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_assignmentManager">
+<a name="m_serverManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_assignmentManager</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_assignmentManager</a></pre>
+<h4>m_serverManager</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_serverManager</a></pre>
</li>
</ul>
-<a name="m_assignmentManager__IsNotDefault">
+<a name="m_serverManager__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_assignmentManager__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_assignmentManager__IsNotDefault</a></pre>
+<h4>m_serverManager__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_serverManager__IsNotDefault</a></pre>
</li>
</ul>
<a name="m_frags">
@@ -433,22 +433,22 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.161">m_frags__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_format">
+<a name="m_deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_format</a></pre>
+<h4>m_deadServers</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_deadServers</a></pre>
</li>
</ul>
-<a name="m_format__IsNotDefault">
+<a name="m_deadServers__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_format__IsNotDefault</a></pre>
+<h4>m_deadServers__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_deadServers__IsNotDefault</a></pre>
</li>
</ul>
<a name="m_catalogJanitorEnabled">
@@ -469,76 +469,76 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_catalogJanitorEnabled__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_servers">
+<a name="m_metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_servers</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_servers</a></pre>
+<h4>m_metaLocation</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_metaLocation</a></pre>
</li>
</ul>
-<a name="m_servers__IsNotDefault">
+<a name="m_metaLocation__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_servers__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_servers__IsNotDefault</a></pre>
+<h4>m_metaLocation__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_metaLocation__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_filter">
+<a name="m_assignmentManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_filter</a></pre>
+<h4>m_assignmentManager</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_assignmentManager</a></pre>
</li>
</ul>
-<a name="m_filter__IsNotDefault">
+<a name="m_assignmentManager__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_filter__IsNotDefault</a></pre>
+<h4>m_assignmentManager__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_assignmentManager__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_deadServers">
+<a name="m_filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_deadServers</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_deadServers</a></pre>
+<h4>m_filter</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_filter</a></pre>
</li>
</ul>
-<a name="m_deadServers__IsNotDefault">
+<a name="m_filter__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_deadServers__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_deadServers__IsNotDefault</a></pre>
+<h4>m_filter__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_filter__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_serverManager">
+<a name="m_servers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_serverManager</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_serverManager</a></pre>
+<h4>m_servers</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_servers</a></pre>
</li>
</ul>
-<a name="m_serverManager__IsNotDefault">
+<a name="m_servers__IsNotDefault">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>m_serverManager__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_serverManager__IsNotDefault</a></pre>
+<h4>m_servers__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_servers__IsNotDefault</a></pre>
</li>
</ul>
</li>
@@ -584,58 +584,58 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.106">getMaster</a>()</pre>
</li>
</ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> metaLocation)</pre>
+<h4>setFormat</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
</li>
</ul>
-<a name="getMetaLocation()">
+<a name="getFormat()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getMetaLocation</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getMetaLocation</a>()</pre>
+<h4>getFormat</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getFormat</a>()</pre>
</li>
</ul>
-<a name="getMetaLocation__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getMetaLocation__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getMetaLocation__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getFormat__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
+<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setAssignmentManager</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> assignmentManager)</pre>
+<h4>setServerManager</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> serverManager)</pre>
</li>
</ul>
-<a name="getAssignmentManager()">
+<a name="getServerManager()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getAssignmentManager</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getAssignmentManager</a>()</pre>
+<h4>getServerManager</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getServerManager</a>()</pre>
</li>
</ul>
-<a name="getAssignmentManager__IsNotDefault()">
+<a name="getServerManager__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getAssignmentManager__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getAssignmentManager__IsNotDefault</a>()</pre>
+<h4>getServerManager__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getServerManager__IsNotDefault</a>()</pre>
</li>
</ul>
<a name="setFrags(java.util.Map)">
@@ -665,31 +665,31 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.157">getFrags__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setDeadServers(java.util.Set)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
+<h4>setDeadServers</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers)</pre>
</li>
</ul>
-<a name="getFormat()">
+<a name="getDeadServers()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getFormat</a>()</pre>
+<h4>getDeadServers</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getDeadServers</a>()</pre>
</li>
</ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getDeadServers__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getFormat__IsNotDefault</a>()</pre>
+<h4>getDeadServers__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getDeadServers__IsNotDefault</a>()</pre>
</li>
</ul>
<a name="setCatalogJanitorEnabled(boolean)">
@@ -719,112 +719,112 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setServers(java.util.List)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServers</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
+<h4>setMetaLocation</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> metaLocation)</pre>
</li>
</ul>
-<a name="getServers()">
+<a name="getMetaLocation()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getServers</a>()</pre>
+<h4>getMetaLocation</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getMetaLocation</a>()</pre>
</li>
</ul>
-<a name="getServers__IsNotDefault()">
+<a name="getMetaLocation__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServers__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getServers__IsNotDefault</a>()</pre>
+<h4>getMetaLocation__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getMetaLocation__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
+<h4>setAssignmentManager</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> assignmentManager)</pre>
</li>
</ul>
-<a name="getFilter()">
+<a name="getAssignmentManager()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getFilter</a>()</pre>
+<h4>getAssignmentManager</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getAssignmentManager</a>()</pre>
</li>
</ul>
-<a name="getFilter__IsNotDefault()">
+<a name="getAssignmentManager__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getFilter__IsNotDefault</a>()</pre>
+<h4>getAssignmentManager__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getAssignmentManager__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setDeadServers(java.util.Set)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setDeadServers</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers)</pre>
+<h4>setFilter</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
</li>
</ul>
-<a name="getDeadServers()">
+<a name="getFilter()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getDeadServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getDeadServers</a>()</pre>
+<h4>getFilter</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getFilter</a>()</pre>
</li>
</ul>
-<a name="getDeadServers__IsNotDefault()">
+<a name="getFilter__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getDeadServers__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getDeadServers__IsNotDefault</a>()</pre>
+<h4>getFilter__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getFilter__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
+<a name="setServers(java.util.List)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServerManager</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> serverManager)</pre>
+<h4>setServers</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
</li>
</ul>
-<a name="getServerManager()">
+<a name="getServers()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServerManager</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getServerManager</a>()</pre>
+<h4>getServers</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getServers</a>()</pre>
</li>
</ul>
-<a name="getServerManager__IsNotDefault()">
+<a name="getServers__IsNotDefault()">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getServerManager__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getServerManager__IsNotDefault</a>()</pre>
+<h4>getServers__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getServers__IsNotDefault</a>()</pre>
</li>
</ul>
</li>
[12/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
index 4b7d070..f29d477 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.BadTsvLineException.html
@@ -99,704 +99,706 @@
<span class="sourceLineNo">091</span> // If true, bad lines are logged to stderr. Default: false.<a name="line.91"></a>
<span class="sourceLineNo">092</span> public final static String LOG_BAD_LINES_CONF_KEY = "importtsv.log.bad.lines";<a name="line.92"></a>
<span class="sourceLineNo">093</span> public final static String SKIP_LINES_CONF_KEY = "importtsv.skip.bad.lines";<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.96"></a>
-<span class="sourceLineNo">097</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.97"></a>
-<span class="sourceLineNo">098</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.99"></a>
-<span class="sourceLineNo">100</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.102"></a>
-<span class="sourceLineNo">103</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.105"></a>
-<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * flipped to delete it when MR ends.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static class TsvParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Column families and qualifiers mapped to the TSV columns<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private final byte[][] families;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private final byte[][] qualifiers;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> private final byte separatorByte;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> private int rowKeyColumnIndex;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> private int maxColumnCount;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Default value must be negative<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @param separatorStr<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // Configure separator<a name="line.158"></a>
-<span class="sourceLineNo">159</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> Preconditions.checkArgument(separator.length == 1,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> "TsvParser only supports single-byte separators");<a name="line.161"></a>
-<span class="sourceLineNo">162</span> separatorByte = separator[0];<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Configure columns<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> maxColumnCount = columnStrings.size();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> families = new byte[maxColumnCount][];<a name="line.169"></a>
-<span class="sourceLineNo">170</span> qualifiers = new byte[maxColumnCount][];<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> String str = columnStrings.get(i);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rowKeyColumnIndex = i;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> continue;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> timestampKeyColumnIndex = i;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> continue;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> attrKeyColumnIndex = i;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> continue;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> cellVisibilityColumnIndex = i;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> continue;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> cellTTLColumnIndex = i;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> continue;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> String[] parts = str.split(":", 2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (parts.length == 1) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> families[i] = str.getBytes();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } else {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> families[i] = parts[0].getBytes();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> qualifiers[i] = parts[1].getBytes();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<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> public int getTimestampKeyColumnIndex() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return timestampKeyColumnIndex;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> public boolean hasAttributes() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> public boolean hasCellVisibility() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasCellTTL() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> public int getAttributesKeyColumnIndex() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return attrKeyColumnIndex;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public int getCellVisibilityColumnIndex() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return cellVisibilityColumnIndex;<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">233</span> public int getCellTTLColumnIndex() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return cellTTLColumnIndex;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> public int getRowKeyColumnIndex() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return rowKeyColumnIndex;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> public byte[] getFamily(int idx) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return families[idx];<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public byte[] getQualifier(int idx) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return qualifiers[idx];<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> throws BadTsvLineException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // Enumerate separator offsets<a name="line.250"></a>
-<span class="sourceLineNo">251</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < length; i++) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (lineBytes[i] == separatorByte) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> tabOffsets.add(i);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (tabOffsets.isEmpty()) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> throw new BadTsvLineException("No delimiter");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> tabOffsets.add(length);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> throw new BadTsvLineException("Excessive columns");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throw new BadTsvLineException("No row key");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> } else if (hasTimestamp()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new BadTsvLineException("No timestamp");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new BadTsvLineException("No attributes specified");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.273"></a>
-<span class="sourceLineNo">274</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> class ParsedLine {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> private final ArrayList<Integer> tabOffsets;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private byte[] lineBytes;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ParsedLine(ArrayList<Integer> tabOffsets, byte[] lineBytes) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.tabOffsets = tabOffsets;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.lineBytes = lineBytes;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> public int getRowKeyOffset() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return getColumnOffset(rowKeyColumnIndex);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public int getRowKeyLength() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return getColumnLength(rowKeyColumnIndex);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> public long getTimestamp(long ts) throws BadTsvLineException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // Return ts if HBASE_TS_KEY is not configured in column spec<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (!hasTimestamp()) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return ts;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> String timeStampStr = Bytes.toString(lineBytes,<a name="line.302"></a>
-<span class="sourceLineNo">303</span> getColumnOffset(timestampKeyColumnIndex),<a name="line.303"></a>
-<span class="sourceLineNo">304</span> getColumnLength(timestampKeyColumnIndex));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return Long.parseLong(timeStampStr);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> } catch (NumberFormatException nfe) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // treat this record as bad record<a name="line.308"></a>
-<span class="sourceLineNo">309</span> throw new BadTsvLineException("Invalid timestamp " + timeStampStr);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> private String getAttributes() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (!hasAttributes()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return Bytes.toString(lineBytes, getColumnOffset(attrKeyColumnIndex),<a name="line.317"></a>
-<span class="sourceLineNo">318</span> getColumnLength(attrKeyColumnIndex));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public String[] getIndividualAttributes() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> String attributes = getAttributes();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (attributes != null) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return attributes.split(DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return null;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> public int getAttributeKeyOffset() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (hasAttributes()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return getColumnOffset(attrKeyColumnIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> public int getAttributeKeyLength() {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (hasAttributes()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return getColumnLength(attrKeyColumnIndex);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> public int getCellVisibilityColumnOffset() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (hasCellVisibility()) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return getColumnOffset(cellVisibilityColumnIndex);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> public int getCellVisibilityColumnLength() {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> if (hasCellVisibility()) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return getColumnLength(cellVisibilityColumnIndex);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> } else {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> public String getCellVisibility() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (!hasCellVisibility()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return null;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return Bytes.toString(lineBytes, getColumnOffset(cellVisibilityColumnIndex),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> getColumnLength(cellVisibilityColumnIndex));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> public int getCellTTLColumnOffset() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (hasCellTTL()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return getColumnOffset(cellTTLColumnIndex);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } else {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> public int getCellTTLColumnLength() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (hasCellTTL()) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return getColumnLength(cellTTLColumnIndex);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> public long getCellTTL() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (!hasCellTTL()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return 0;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } else {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return Bytes.toLong(lineBytes, getColumnOffset(cellTTLColumnIndex),<a name="line.392"></a>
-<span class="sourceLineNo">393</span> getColumnLength(cellTTLColumnIndex));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> public int getColumnOffset(int idx) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (idx > 0)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return tabOffsets.get(idx - 1) + 1;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> else<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return 0;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public int getColumnLength(int idx) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return tabOffsets.get(idx) - getColumnOffset(idx);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> public int getColumnCount() {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return tabOffsets.size();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public byte[] getLineBytes() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return lineBytes;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> public static class BadTsvLineException extends Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public BadTsvLineException(String err) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super(err);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> private static final long serialVersionUID = 1L;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Return starting position and length of row key from the specified line bytes.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * @param lineBytes<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * @param length<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * @return Pair of row key offset and length.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * @throws BadTsvLineException<a name="line.426"></a>
-<span class="sourceLineNo">427</span> */<a name="line.427"></a>
-<span class="sourceLineNo">428</span> public Pair<Integer, Integer> parseRowKey(byte[] lineBytes, int length)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> throws BadTsvLineException {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> int rkColumnIndex = 0;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> int startPos = 0, endPos = 0;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (int i = 0; i <= length; i++) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (i == length || lineBytes[i] == separatorByte) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> endPos = i - 1;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (rkColumnIndex++ == getRowKeyColumnIndex()) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if ((endPos + 1) == startPos) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throw new BadTsvLineException("Empty value for ROW KEY.");<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> startPos = endPos + 2;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (i == length) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> throw new BadTsvLineException(<a name="line.445"></a>
-<span class="sourceLineNo">446</span> "Row key does not exist as number of columns in the line"<a name="line.446"></a>
-<span class="sourceLineNo">447</span> + " are less than row key position.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return new Pair<Integer, Integer>(startPos, endPos - startPos + 1);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Sets up the actual job.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param conf The current configuration.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param args The command line parameters.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @return The newly created job.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @throws IOException When setting up the job fails.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> throws IOException, ClassNotFoundException {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Job job = null;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> boolean isDryRun = conf.getBoolean(DRY_RUN_CONF_KEY, false);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try (Connection connection = ConnectionFactory.createConnection(conf)) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> try (Admin admin = connection.getAdmin()) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> // Support non-XML supported characters<a name="line.468"></a>
-<span class="sourceLineNo">469</span> // by re-encoding the passed separator as a Base64 string.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (actualSeparator != null) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> // See if a non-default Mapper was set<a name="line.476"></a>
-<span class="sourceLineNo">477</span> String mapperClassName = conf.get(MAPPER_CONF_KEY);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Class mapperClass = mapperClassName != null? Class.forName(mapperClassName): DEFAULT_MAPPER;<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> Path inputDir = new Path(args[1]);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + "_" + tableName.getNameAsString());<a name="line.482"></a>
-<span class="sourceLineNo">483</span> job = Job.getInstance(conf, jobName);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> job.setJarByClass(mapperClass);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> FileInputFormat.setInputPaths(job, inputDir);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> job.setInputFormatClass(TextInputFormat.class);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> job.setMapperClass(mapperClass);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> String[] columns = conf.getStrings(COLUMNS_CONF_KEY);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> String fileLoc = conf.get(CREDENTIALS_LOCATION);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> job.getCredentials().addAll(cred);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (hfileOutPath != null) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (!admin.tableExists(tableName)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> LOG.warn(format("Table '%s' does not exist.", tableName));<a name="line.499"></a>
-<span class="sourceLineNo">500</span> if ("yes".equalsIgnoreCase(conf.get(CREATE_TABLE_CONF_KEY, "yes"))) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> // TODO: this is backwards. Instead of depending on the existence of a table,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // create a sane splits file for HFileOutputFormat based on data sampling.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> createTable(admin, tableName, columns);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (isDryRun) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> LOG.warn("Dry run: Table will be deleted at end of dry run.");<a name="line.505"></a>
-<span class="sourceLineNo">506</span> synchronized (ImportTsv.class) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> DRY_RUN_TABLE_CREATED = true;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String errorMsg =<a name="line.511"></a>
-<span class="sourceLineNo">512</span> format("Table '%s' does not exist and '%s' is set to no.", tableName,<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CREATE_TABLE_CONF_KEY);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> LOG.error(errorMsg);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> throw new TableNotFoundException(errorMsg);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> try (Table table = connection.getTable(tableName);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> RegionLocator regionLocator = connection.getRegionLocator(tableName)) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> boolean noStrict = conf.getBoolean(NO_STRICT_COL_FAMILY, false);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> // if no.strict is false then check column family<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if(!noStrict) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> ArrayList<String> unmatchedFamilies = new ArrayList<String>();<a name="line.523"></a>
-<span class="sourceLineNo">524</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> HTableDescriptor tDesc = table.getTableDescriptor();<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (String cf : cfSet) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> if(tDesc.getFamily(Bytes.toBytes(cf)) == null) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> unmatchedFamilies.add(cf);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> if(unmatchedFamilies.size() > 0) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> ArrayList<String> familyNames = new ArrayList<String>();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> for (HColumnDescriptor family : table.getTableDescriptor().getFamilies()) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> familyNames.add(family.getNameAsString());<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> String msg =<a name="line.536"></a>
-<span class="sourceLineNo">537</span> "Column Families " + unmatchedFamilies + " specified in " + COLUMNS_CONF_KEY<a name="line.537"></a>
-<span class="sourceLineNo">538</span> + " does not match with any of the table " + tableName<a name="line.538"></a>
-<span class="sourceLineNo">539</span> + " column families " + familyNames + ".\n"<a name="line.539"></a>
-<span class="sourceLineNo">540</span> + "To disable column family check, use -D" + NO_STRICT_COL_FAMILY<a name="line.540"></a>
-<span class="sourceLineNo">541</span> + "=true.\n";<a name="line.541"></a>
-<span class="sourceLineNo">542</span> usage(msg);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> System.exit(-1);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> }<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> job.setMapOutputValueClass(Text.class);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> job.setReducerClass(TextSortReducer.class);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> job.setMapOutputValueClass(Put.class);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> job.setCombinerClass(PutCombiner.class);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> job.setReducerClass(PutSortReducer.class);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (!isDryRun) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> Path outputDir = new Path(hfileOutPath);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> FileOutputFormat.setOutputPath(job, outputDir);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> HFileOutputFormat2.configureIncrementalLoad(job, table.getTableDescriptor(),<a name="line.557"></a>
-<span class="sourceLineNo">558</span> regionLocator);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> } else {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> if (!admin.tableExists(tableName)) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> String errorMsg = format("Table '%s' does not exist.", tableName);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> LOG.error(errorMsg);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> throw new TableNotFoundException(errorMsg);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> usage(TsvImporterTextMapper.class.toString()<a name="line.568"></a>
-<span class="sourceLineNo">569</span> + " should not be used for non bulkloading case. use "<a name="line.569"></a>
-<span class="sourceLineNo">570</span> + TsvImporterMapper.class.toString()<a name="line.570"></a>
-<span class="sourceLineNo">571</span> + " or custom mapper whose value type is Put.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> System.exit(-1);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (!isDryRun) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // No reducers. Just write straight to table. Call initTableReducerJob<a name="line.575"></a>
-<span class="sourceLineNo">576</span> // to set up the TableOutputFormat.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> job.setNumReduceTasks(0);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> if (isDryRun) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> job.setOutputFormatClass(NullOutputFormat.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> job.getConfiguration().setStrings("io.serializations",<a name="line.583"></a>
-<span class="sourceLineNo">584</span> job.getConfiguration().get("io.serializations"),<a name="line.584"></a>
-<span class="sourceLineNo">585</span> MutationSerialization.class.getName(), ResultSerialization.class.getName(),<a name="line.585"></a>
-<span class="sourceLineNo">586</span> KeyValueSerialization.class.getName());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> TableMapReduceUtil.addDependencyJars(job);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a name="line.589"></a>
-<span class="sourceLineNo">590</span> com.google.common.base.Function.class /* Guava used by TsvParser */);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> return job;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span> private static void createTable(Admin admin, TableName tableName, String[] columns)<a name="line.596"></a>
-<span class="sourceLineNo">597</span> throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> for (String cf : cfSet) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> HColumnDescriptor hcd = new HColumnDescriptor(Bytes.toBytes(cf));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> htd.addFamily(hcd);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> LOG.warn(format("Creating table '%s' with '%s' columns and default descriptors.",<a name="line.604"></a>
-<span class="sourceLineNo">605</span> tableName, cfSet));<a name="line.605"></a>
-<span class="sourceLineNo">606</span> admin.createTable(htd);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> private static void deleteTable(Configuration conf, String[] args) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> try (Connection connection = ConnectionFactory.createConnection(conf);<a name="line.611"></a>
-<span class="sourceLineNo">612</span> Admin admin = connection.getAdmin()) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> admin.disableTable(tableName);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (TableNotEnabledException e) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> LOG.debug("Dry mode: Table: " + tableName + " already disabled, so just deleting it.");<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> admin.deleteTable(tableName);<a name="line.618"></a>
-<span class="sourceLineNo">619</span> } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> LOG.error(format("***Dry run: Failed to delete table '%s'.***%n%s", tableName,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> e.toString()));<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> LOG.info(format("Dry run: Deleted table '%s'.", tableName));<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> private static Set<String> getColumnFamilies(String[] columns) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> Set<String> cfSet = new HashSet<String>();<a name="line.628"></a>
-<span class="sourceLineNo">629</span> for (String aColumn : columns) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span> if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)<a name="line.630"></a>
-<span class="sourceLineNo">631</span> || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)<a name="line.631"></a>
-<span class="sourceLineNo">632</span> || TsvParser.CELL_VISIBILITY_COLUMN_SPEC.equals(aColumn)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> || TsvParser.CELL_TTL_COLUMN_SPEC.equals(aColumn)<a name="line.633"></a>
-<span class="sourceLineNo">634</span> || TsvParser.ATTRIBUTES_COLUMN_SPEC.equals(aColumn))<a name="line.634"></a>
-<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
-<span class="sourceLineNo">636</span> // we are only concerned with the first one (in case this is a cf:cq)<a name="line.636"></a>
-<span class="sourceLineNo">637</span> cfSet.add(aColumn.split(":", 2)[0]);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> }<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return cfSet;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> /*<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param errorMsg Error message. Can be null.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> */<a name="line.644"></a>
-<span class="sourceLineNo">645</span> private static void usage(final String errorMsg) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> System.err.println("ERROR: " + errorMsg);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> String usage =<a name="line.649"></a>
-<span class="sourceLineNo">650</span> "Usage: " + NAME + " -D"+ COLUMNS_CONF_KEY + "=a,b,c <tablename> <inputdir>\n" +<a name="line.650"></a>
-<span class="sourceLineNo">651</span> "\n" +<a name="line.651"></a>
-<span class="sourceLineNo">652</span> "Imports the given input directory of TSV data into the specified table.\n" +<a name="line.652"></a>
-<span class="sourceLineNo">653</span> "\n" +<a name="line.653"></a>
-<span class="sourceLineNo">654</span> "The column names of the TSV data must be specified using the -D" + COLUMNS_CONF_KEY + "\n" +<a name="line.654"></a>
-<span class="sourceLineNo">655</span> "option. This option takes the form of comma-separated column names, where each\n" +<a name="line.655"></a>
-<span class="sourceLineNo">656</span> "column name is either a simple column family, or a columnfamily:qualifier. The special\n" +<a name="line.656"></a>
-<span class="sourceLineNo">657</span> "column name " + TsvParser.ROWKEY_COLUMN_SPEC + " is used to designate that this column should be used\n" +<a name="line.657"></a>
-<span class="sourceLineNo">658</span> "as the row key for each imported record. You must specify exactly one column\n" +<a name="line.658"></a>
-<span class="sourceLineNo">659</span> "to be the row key, and you must specify a column name for every column that exists in the\n" +<a name="line.659"></a>
-<span class="sourceLineNo">660</span> "input data. Another special column" + TsvParser.TIMESTAMPKEY_COLUMN_SPEC +<a name="line.660"></a>
-<span class="sourceLineNo">661</span> " designates that this column should be\n" +<a name="line.661"></a>
-<span class="sourceLineNo">662</span> "used as timestamp for each record. Unlike " + TsvParser.ROWKEY_COLUMN_SPEC + ", " +<a name="line.662"></a>
-<span class="sourceLineNo">663</span> TsvParser.TIMESTAMPKEY_COLUMN_SPEC + " is optional." + "\n" +<a name="line.663"></a>
-<span class="sourceLineNo">664</span> "You must specify at most one column as timestamp key for each imported record.\n" +<a name="line.664"></a>
-<span class="sourceLineNo">665</span> "Record with invalid timestamps (blank, non-numeric) will be treated as bad record.\n" +<a name="line.665"></a>
-<span class="sourceLineNo">666</span> "Note: if you use this option, then '" + TIMESTAMP_CONF_KEY + "' option will be ignored.\n" +<a name="line.666"></a>
-<span class="sourceLineNo">667</span> "\n" +<a name="line.667"></a>
-<span class="sourceLineNo">668</span> "Other special columns that can be specified are " + TsvParser.CELL_TTL_COLUMN_SPEC +<a name="line.668"></a>
-<span class="sourceLineNo">669</span> " and " + TsvParser.CELL_VISIBILITY_COLUMN_SPEC + ".\n" +<a name="line.669"></a>
-<span class="sourceLineNo">670</span> TsvParser.CELL_TTL_COLUMN_SPEC + " designates that this column will be used " +<a name="line.670"></a>
-<span class="sourceLineNo">671</span> "as a Cell's Time To Live (TTL) attribute.\n" +<a name="line.671"></a>
-<span class="sourceLineNo">672</span> TsvParser.CELL_VISIBILITY_COLUMN_SPEC + " designates that this column contains the " +<a name="line.672"></a>
-<span class="sourceLineNo">673</span> "visibility label expression.\n" +<a name="line.673"></a>
-<span class="sourceLineNo">674</span> "\n" +<a name="line.674"></a>
-<span class="sourceLineNo">675</span> TsvParser.ATTRIBUTES_COLUMN_SPEC+" can be used to specify Operation Attributes per record.\n"+<a name="line.675"></a>
-<span class="sourceLineNo">676</span> " Should be specified as key=>value where "+TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX+ " is used \n"+<a name="line.676"></a>
-<span class="sourceLineNo">677</span> " as the seperator. Note that more than one OperationAttributes can be specified.\n"+<a name="line.677"></a>
-<span class="sourceLineNo">678</span> "By default importtsv will load data directly into HBase. To instead generate\n" +<a name="line.678"></a>
-<span class="sourceLineNo">679</span> "HFiles of data to prepare for a bulk data load, pass the option:\n" +<a name="line.679"></a>
-<span class="sourceLineNo">680</span> " -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output\n" +<a name="line.680"></a>
-<span class="sourceLineNo">681</span> " Note: if you do not use this option, then the target table must already exist in HBase\n" +<a name="line.681"></a>
-<span class="sourceLineNo">682</span> "\n" +<a name="line.682"></a>
-<span class="sourceLineNo">683</span> "Other options that may be specified with -D include:\n" +<a name="line.683"></a>
-<span class="sourceLineNo">684</span> " -D" + DRY_RUN_CONF_KEY + "=true - Dry run mode. Data is not actually populated into" +<a name="line.684"></a>
-<span class="sourceLineNo">685</span> " table. If table does not exist, it is created but deleted in the end.\n" +<a name="line.685"></a>
-<span class="sourceLineNo">686</span> " -D" + SKIP_LINES_CONF_KEY + "=false - fail if encountering an invalid line\n" +<a name="line.686"></a>
-<span class="sourceLineNo">687</span> " -D" + LOG_BAD_LINES_CONF_KEY + "=true - logs invalid lines to stderr\n" +<a name="line.687"></a>
-<span class="sourceLineNo">688</span> " '-D" + SEPARATOR_CONF_KEY + "=|' - eg separate on pipes instead of tabs\n" +<a name="line.688"></a>
-<span class="sourceLineNo">689</span> " -D" + TIMESTAMP_CONF_KEY + "=currentTimeAsLong - use the specified timestamp for the import\n" +<a name="line.689"></a>
-<span class="sourceLineNo">690</span> " -D" + MAPPER_CONF_KEY + "=my.Mapper - A user-defined Mapper to use instead of " +<a name="line.690"></a>
-<span class="sourceLineNo">691</span> DEFAULT_MAPPER.getName() + "\n" +<a name="line.691"></a>
-<span class="sourceLineNo">692</span> " -D" + JOB_NAME_CONF_KEY + "=jobName - use the specified mapreduce job name for the import\n" +<a name="line.692"></a>
-<span class="sourceLineNo">693</span> " -D" + CREATE_TABLE_CONF_KEY + "=no - can be used to avoid creation of table by this tool\n" +<a name="line.693"></a>
-<span class="sourceLineNo">694</span> " Note: if you set this to 'no', then the target table must already exist in HBase\n" +<a name="line.694"></a>
-<span class="sourceLineNo">695</span> " -D" + NO_STRICT_COL_FAMILY + "=true - ignore column family check in hbase table. " +<a name="line.695"></a>
-<span class="sourceLineNo">696</span> "Default is false\n\n" +<a name="line.696"></a>
-<span class="sourceLineNo">697</span> "For performance consider the following options:\n" +<a name="line.697"></a>
-<span class="sourceLineNo">698</span> " -Dmapreduce.map.speculative=false\n" +<a name="line.698"></a>
-<span class="sourceLineNo">699</span> " -Dmapreduce.reduce.speculative=false";<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> System.err.println(usage);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> @Override<a name="line.704"></a>
-<span class="sourceLineNo">705</span> public int run(String[] args) throws Exception {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> if (args.length < 2) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> usage("Wrong number of arguments: " + args.length);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> return -1;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span> // When MAPPER_CONF_KEY is null, the user wants to use the provided TsvImporterMapper, so<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // perform validation on these additional args. When it's not null, user has provided their<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // own mapper, thus these validation are not relevant.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> // TODO: validation for TsvImporterMapper, not this tool. Move elsewhere.<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (null == getConf().get(MAPPER_CONF_KEY)) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> // Make sure columns are specified<a name="line.716"></a>
-<span class="sourceLineNo">717</span> String[] columns = getConf().getStrings(COLUMNS_CONF_KEY);<a name="line.717"></a>
-<span class="sourceLineNo">718</span> if (columns == null) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> usage("No columns specified. Please specify with -D" +<a name="line.719"></a>
-<span class="sourceLineNo">720</span> COLUMNS_CONF_KEY+"=...");<a name="line.720"></a>
-<span class="sourceLineNo">721</span> return -1;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Make sure they specify exactly one column as the row key<a name="line.724"></a>
-<span class="sourceLineNo">725</span> int rowkeysFound = 0;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> for (String col : columns) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span> if (col.equals(TsvParser.ROWKEY_COLUMN_SPEC)) rowkeysFound++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span> }<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (rowkeysFound != 1) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> usage("Must specify exactly one column as " + TsvParser.ROWKEY_COLUMN_SPEC);<a name="line.730"></a>
-<span class="sourceLineNo">731</span> return -1;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> }<a name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span> // Make sure we have at most one column as the timestamp key<a name="line.734"></a>
-<span class="sourceLineNo">735</span> int tskeysFound = 0;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> for (String col : columns) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (col.equals(TsvParser.TIMESTAMPKEY_COLUMN_SPEC))<a name="line.737"></a>
-<span class="sourceLineNo">738</span> tskeysFound++;<a name="line.738"></a>
-<span class="sourceLineNo">739</span> }<a name="line.739"></a>
-<span class="sourceLineNo">740</span> if (tskeysFound > 1) {<a name="line.740"></a>
-<span class="sourceLineNo">741</span> usage("Must specify at most one column as "<a name="line.741"></a>
-<span class="sourceLineNo">742</span> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return -1;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> int attrKeysFound = 0;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> for (String col : columns) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (col.equals(TsvParser.ATTRIBUTES_COLUMN_SPEC))<a name="line.748"></a>
-<span class="sourceLineNo">749</span> attrKeysFound++;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> if (attrKeysFound > 1) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> usage("Must specify at most one column as "<a name="line.752"></a>
-<span class="sourceLineNo">753</span> + TsvParser.ATTRIBUTES_COLUMN_SPEC);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> return -1;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> }<a name="line.755"></a>
-<span class="sourceLineNo">756</span><a name="line.756"></a>
-<span class="sourceLineNo">757</span> // Make sure one or more columns are specified excluding rowkey and<a name="line.757"></a>
-<span class="sourceLineNo">758</span> // timestamp key<a name="line.758"></a>
-<span class="sourceLineNo">759</span> if (columns.length - (rowkeysFound + tskeysFound + attrKeysFound) < 1) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> usage("One or more columns in addition to the row key and timestamp(optional) are required");<a name="line.760"></a>
-<span class="sourceLineNo">761</span> return -1;<a name="line.761"></a>
-<span class="sourceLineNo">762</span> }<a name="line.762"></a>
-<span class="sourceLineNo">763</span> }<a name="line.763"></a>
-<span class="sourceLineNo">764</span><a name="line.764"></a>
-<span class="sourceLineNo">765</span> // If timestamp option is not specified, use current system time.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> long timstamp = getConf().getLong(TIMESTAMP_CONF_KEY, System.currentTimeMillis());<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span> // Set it back to replace invalid timestamp (non-numeric) with current<a name="line.768"></a>
-<span class="sourceLineNo">769</span> // system time<a name="line.769"></a>
-<span class="sourceLineNo">770</span> getConf().setLong(TIMESTAMP_CONF_KEY, timstamp);<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> synchronized (ImportTsv.class) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span> DRY_RUN_TABLE_CREATED = false;<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span> Job job = createSubmittableJob(getConf(), args);<a name="line.775"></a>
-<span class="sourceLineNo">776</span> boolean success = job.waitForCompletion(true);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> boolean delete = false;<a name="line.777"></a>
-<span class="sourceLineNo">778</span> synchronized (ImportTsv.class) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> delete = DRY_RUN_TABLE_CREATED;<a name="line.779"></a>
-<span class="sourceLineNo">780</span> }<a name="line.780"></a>
-<span class="sourceLineNo">781</span> if (delete) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span> deleteTable(getConf(), args);<a name="line.782"></a>
-<span class="sourceLineNo">783</span> }<a name="line.783"></a>
-<span class="sourceLineNo">784</span> return success ? 0 : 1;<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span> public static void main(String[] args) throws Exception {<a name="line.787"></a>
-<span class="sourceLineNo">788</span> int status = ToolRunner.run(HBaseConfiguration.create(), new ImportTsv(), args);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> System.exit(status);<a name="line.789"></a>
-<span class="sourceLineNo">790</span> }<a name="line.790"></a>
-<span class="sourceLineNo">791</span>}<a name="line.791"></a>
+<span class="sourceLineNo">094</span> public final static String SKIP_EMPTY_COLUMNS = "importtsv.skip.empty.columns";<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.97"></a>
+<span class="sourceLineNo">098</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.98"></a>
+<span class="sourceLineNo">099</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.102"></a>
+<span class="sourceLineNo">103</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * flipped to delete it when MR ends.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> public static class TsvParser {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Column families and qualifiers mapped to the TSV columns<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private final byte[][] families;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private final byte[][] qualifiers;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> private final byte separatorByte;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> private int rowKeyColumnIndex;<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> private int maxColumnCount;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Default value must be negative<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @param separatorStr<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // Configure separator<a name="line.159"></a>
+<span class="sourceLineNo">160</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Preconditions.checkArgument(separator.length == 1,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> "TsvParser only supports single-byte separators");<a name="line.162"></a>
+<span class="sourceLineNo">163</span> separatorByte = separator[0];<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Configure columns<a name="line.165"></a>
+<span class="sourceLineNo">166</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.166"></a>
+<span class="sourceLineNo">167</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> maxColumnCount = columnStrings.size();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> families = new byte[maxColumnCount][];<a name="line.170"></a>
+<span class="sourceLineNo">171</span> qualifiers = new byte[maxColumnCount][];<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String str = columnStrings.get(i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> rowKeyColumnIndex = i;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> continue;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> timestampKeyColumnIndex = i;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> continue;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> attrKeyColumnIndex = i;<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> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> cellVisibilityColumnIndex = i;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> continue;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cellTTLColumnIndex = i;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> continue;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> String[] parts = str.split(":", 2);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (parts.length == 1) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> families[i] = str.getBytes();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } else {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> families[i] = parts[0].getBytes();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> qualifiers[i] = parts[1].getBytes();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> public int getTimestampKeyColumnIndex() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return timestampKeyColumnIndex;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> public boolean hasAttributes() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> public boolean hasCellVisibility() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public boolean hasCellTTL() {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> public int getAttributesKeyColumnIndex() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return attrKeyColumnIndex;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> public int getCellVisibilityColumnIndex() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return cellVisibilityColumnIndex;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> public int getCellTTLColumnIndex() {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return cellTTLColumnIndex;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> public int getRowKeyColumnIndex() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return rowKeyColumnIndex;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> public byte[] getFamily(int idx) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return families[idx];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public byte[] getQualifier(int idx) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return qualifiers[idx];<a name="line.246"></a>
+<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> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> throws BadTsvLineException {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // Enumerate separator offsets<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (int i = 0; i < length; i++) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (lineBytes[i] == separatorByte) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> tabOffsets.add(i);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (tabOffsets.isEmpty()) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> throw new BadTsvLineException("No delimiter");<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> tabOffsets.add(length);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new BadTsvLineException("Excessive columns");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throw new BadTsvLineException("No row key");<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else if (hasTimestamp()<a name="line.268"></a>
+<span class="sourceLineNo">269</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> throw new BadTsvLineException("No timestamp");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new BadTsvLineException("No attributes specified");<a name="line.272"></a>
+<span class="sourceLineNo">273</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> class ParsedLine {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private final ArrayList<Integer> tabOffsets;<a name="line.282"></a>
+<span class="sourc
<TRUNCATED>
[10/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
index 4b7d070..f29d477 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/ImportTsv.TsvParser.html
@@ -99,704 +99,706 @@
<span class="sourceLineNo">091</span> // If true, bad lines are logged to stderr. Default: false.<a name="line.91"></a>
<span class="sourceLineNo">092</span> public final static String LOG_BAD_LINES_CONF_KEY = "importtsv.log.bad.lines";<a name="line.92"></a>
<span class="sourceLineNo">093</span> public final static String SKIP_LINES_CONF_KEY = "importtsv.skip.bad.lines";<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.96"></a>
-<span class="sourceLineNo">097</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.97"></a>
-<span class="sourceLineNo">098</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.99"></a>
-<span class="sourceLineNo">100</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.102"></a>
-<span class="sourceLineNo">103</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.105"></a>
-<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * flipped to delete it when MR ends.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static class TsvParser {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * Column families and qualifiers mapped to the TSV columns<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private final byte[][] families;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private final byte[][] qualifiers;<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> private final byte separatorByte;<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> private int rowKeyColumnIndex;<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> private int maxColumnCount;<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // Default value must be negative<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @param separatorStr<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // Configure separator<a name="line.158"></a>
-<span class="sourceLineNo">159</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> Preconditions.checkArgument(separator.length == 1,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> "TsvParser only supports single-byte separators");<a name="line.161"></a>
-<span class="sourceLineNo">162</span> separatorByte = separator[0];<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Configure columns<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> maxColumnCount = columnStrings.size();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> families = new byte[maxColumnCount][];<a name="line.169"></a>
-<span class="sourceLineNo">170</span> qualifiers = new byte[maxColumnCount][];<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> String str = columnStrings.get(i);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> rowKeyColumnIndex = i;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> continue;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> timestampKeyColumnIndex = i;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> continue;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> attrKeyColumnIndex = i;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> continue;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> cellVisibilityColumnIndex = i;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> continue;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> cellTTLColumnIndex = i;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> continue;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> String[] parts = str.split(":", 2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (parts.length == 1) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> families[i] = str.getBytes();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } else {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> families[i] = parts[0].getBytes();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> qualifiers[i] = parts[1].getBytes();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<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> public int getTimestampKeyColumnIndex() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return timestampKeyColumnIndex;<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> public boolean hasAttributes() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> public boolean hasCellVisibility() {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> public boolean hasCellTTL() {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> public int getAttributesKeyColumnIndex() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return attrKeyColumnIndex;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> public int getCellVisibilityColumnIndex() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return cellVisibilityColumnIndex;<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">233</span> public int getCellTTLColumnIndex() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> return cellTTLColumnIndex;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> public int getRowKeyColumnIndex() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return rowKeyColumnIndex;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> public byte[] getFamily(int idx) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return families[idx];<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public byte[] getQualifier(int idx) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return qualifiers[idx];<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> throws BadTsvLineException {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // Enumerate separator offsets<a name="line.250"></a>
-<span class="sourceLineNo">251</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < length; i++) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (lineBytes[i] == separatorByte) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> tabOffsets.add(i);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (tabOffsets.isEmpty()) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> throw new BadTsvLineException("No delimiter");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> tabOffsets.add(length);<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> throw new BadTsvLineException("Excessive columns");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throw new BadTsvLineException("No row key");<a name="line.266"></a>
-<span class="sourceLineNo">267</span> } else if (hasTimestamp()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new BadTsvLineException("No timestamp");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new BadTsvLineException("No attributes specified");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.273"></a>
-<span class="sourceLineNo">274</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> class ParsedLine {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> private final ArrayList<Integer> tabOffsets;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private byte[] lineBytes;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> ParsedLine(ArrayList<Integer> tabOffsets, byte[] lineBytes) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> this.tabOffsets = tabOffsets;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> this.lineBytes = lineBytes;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> public int getRowKeyOffset() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return getColumnOffset(rowKeyColumnIndex);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public int getRowKeyLength() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return getColumnLength(rowKeyColumnIndex);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> public long getTimestamp(long ts) throws BadTsvLineException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // Return ts if HBASE_TS_KEY is not configured in column spec<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (!hasTimestamp()) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return ts;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> String timeStampStr = Bytes.toString(lineBytes,<a name="line.302"></a>
-<span class="sourceLineNo">303</span> getColumnOffset(timestampKeyColumnIndex),<a name="line.303"></a>
-<span class="sourceLineNo">304</span> getColumnLength(timestampKeyColumnIndex));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> try {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return Long.parseLong(timeStampStr);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> } catch (NumberFormatException nfe) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // treat this record as bad record<a name="line.308"></a>
-<span class="sourceLineNo">309</span> throw new BadTsvLineException("Invalid timestamp " + timeStampStr);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> private String getAttributes() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (!hasAttributes()) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return null;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return Bytes.toString(lineBytes, getColumnOffset(attrKeyColumnIndex),<a name="line.317"></a>
-<span class="sourceLineNo">318</span> getColumnLength(attrKeyColumnIndex));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public String[] getIndividualAttributes() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> String attributes = getAttributes();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (attributes != null) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return attributes.split(DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return null;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> public int getAttributeKeyOffset() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (hasAttributes()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return getColumnOffset(attrKeyColumnIndex);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> public int getAttributeKeyLength() {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (hasAttributes()) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return getColumnLength(attrKeyColumnIndex);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> return DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> public int getCellVisibilityColumnOffset() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> if (hasCellVisibility()) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return getColumnOffset(cellVisibilityColumnIndex);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } else {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> public int getCellVisibilityColumnLength() {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> if (hasCellVisibility()) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return getColumnLength(cellVisibilityColumnIndex);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> } else {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> public String getCellVisibility() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (!hasCellVisibility()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return null;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return Bytes.toString(lineBytes, getColumnOffset(cellVisibilityColumnIndex),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> getColumnLength(cellVisibilityColumnIndex));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> public int getCellTTLColumnOffset() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (hasCellTTL()) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return getColumnOffset(cellTTLColumnIndex);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } else {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> public int getCellTTLColumnLength() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (hasCellTTL()) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return getColumnLength(cellTTLColumnIndex);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> } else {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return DEFAULT_CELL_TTL_COLUMN_INDEX;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> public long getCellTTL() {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (!hasCellTTL()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return 0;<a name="line.390"></a>
-<span class="sourceLineNo">391</span> } else {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return Bytes.toLong(lineBytes, getColumnOffset(cellTTLColumnIndex),<a name="line.392"></a>
-<span class="sourceLineNo">393</span> getColumnLength(cellTTLColumnIndex));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> public int getColumnOffset(int idx) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (idx > 0)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> return tabOffsets.get(idx - 1) + 1;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> else<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return 0;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> public int getColumnLength(int idx) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return tabOffsets.get(idx) - getColumnOffset(idx);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> public int getColumnCount() {<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return tabOffsets.size();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public byte[] getLineBytes() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return lineBytes;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> public static class BadTsvLineException extends Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public BadTsvLineException(String err) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> super(err);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span> private static final long serialVersionUID = 1L;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * Return starting position and length of row key from the specified line bytes.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * @param lineBytes<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * @param length<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * @return Pair of row key offset and length.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * @throws BadTsvLineException<a name="line.426"></a>
-<span class="sourceLineNo">427</span> */<a name="line.427"></a>
-<span class="sourceLineNo">428</span> public Pair<Integer, Integer> parseRowKey(byte[] lineBytes, int length)<a name="line.428"></a>
-<span class="sourceLineNo">429</span> throws BadTsvLineException {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> int rkColumnIndex = 0;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> int startPos = 0, endPos = 0;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (int i = 0; i <= length; i++) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (i == length || lineBytes[i] == separatorByte) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> endPos = i - 1;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (rkColumnIndex++ == getRowKeyColumnIndex()) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if ((endPos + 1) == startPos) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throw new BadTsvLineException("Empty value for ROW KEY.");<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> startPos = endPos + 2;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (i == length) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> throw new BadTsvLineException(<a name="line.445"></a>
-<span class="sourceLineNo">446</span> "Row key does not exist as number of columns in the line"<a name="line.446"></a>
-<span class="sourceLineNo">447</span> + " are less than row key position.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return new Pair<Integer, Integer>(startPos, endPos - startPos + 1);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Sets up the actual job.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param conf The current configuration.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param args The command line parameters.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @return The newly created job.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @throws IOException When setting up the job fails.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected static Job createSubmittableJob(Configuration conf, String[] args)<a name="line.462"></a>
-<span class="sourceLineNo">463</span> throws IOException, ClassNotFoundException {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Job job = null;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> boolean isDryRun = conf.getBoolean(DRY_RUN_CONF_KEY, false);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try (Connection connection = ConnectionFactory.createConnection(conf)) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> try (Admin admin = connection.getAdmin()) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> // Support non-XML supported characters<a name="line.468"></a>
-<span class="sourceLineNo">469</span> // by re-encoding the passed separator as a Base64 string.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (actualSeparator != null) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> conf.set(SEPARATOR_CONF_KEY,<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Base64.encodeBytes(actualSeparator.getBytes()));<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> // See if a non-default Mapper was set<a name="line.476"></a>
-<span class="sourceLineNo">477</span> String mapperClassName = conf.get(MAPPER_CONF_KEY);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Class mapperClass = mapperClassName != null? Class.forName(mapperClassName): DEFAULT_MAPPER;<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> Path inputDir = new Path(args[1]);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + "_" + tableName.getNameAsString());<a name="line.482"></a>
-<span class="sourceLineNo">483</span> job = Job.getInstance(conf, jobName);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> job.setJarByClass(mapperClass);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> FileInputFormat.setInputPaths(job, inputDir);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> job.setInputFormatClass(TextInputFormat.class);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> job.setMapperClass(mapperClass);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> job.setMapOutputKeyClass(ImmutableBytesWritable.class);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> String[] columns = conf.getStrings(COLUMNS_CONF_KEY);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> String fileLoc = conf.get(CREDENTIALS_LOCATION);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> job.getCredentials().addAll(cred);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (hfileOutPath != null) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (!admin.tableExists(tableName)) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> LOG.warn(format("Table '%s' does not exist.", tableName));<a name="line.499"></a>
-<span class="sourceLineNo">500</span> if ("yes".equalsIgnoreCase(conf.get(CREATE_TABLE_CONF_KEY, "yes"))) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> // TODO: this is backwards. Instead of depending on the existence of a table,<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // create a sane splits file for HFileOutputFormat based on data sampling.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> createTable(admin, tableName, columns);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (isDryRun) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> LOG.warn("Dry run: Table will be deleted at end of dry run.");<a name="line.505"></a>
-<span class="sourceLineNo">506</span> synchronized (ImportTsv.class) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> DRY_RUN_TABLE_CREATED = true;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } else {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> String errorMsg =<a name="line.511"></a>
-<span class="sourceLineNo">512</span> format("Table '%s' does not exist and '%s' is set to no.", tableName,<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CREATE_TABLE_CONF_KEY);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> LOG.error(errorMsg);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> throw new TableNotFoundException(errorMsg);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> try (Table table = connection.getTable(tableName);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> RegionLocator regionLocator = connection.getRegionLocator(tableName)) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> boolean noStrict = conf.getBoolean(NO_STRICT_COL_FAMILY, false);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> // if no.strict is false then check column family<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if(!noStrict) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> ArrayList<String> unmatchedFamilies = new ArrayList<String>();<a name="line.523"></a>
-<span class="sourceLineNo">524</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> HTableDescriptor tDesc = table.getTableDescriptor();<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (String cf : cfSet) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> if(tDesc.getFamily(Bytes.toBytes(cf)) == null) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> unmatchedFamilies.add(cf);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span> if(unmatchedFamilies.size() > 0) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> ArrayList<String> familyNames = new ArrayList<String>();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> for (HColumnDescriptor family : table.getTableDescriptor().getFamilies()) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> familyNames.add(family.getNameAsString());<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> String msg =<a name="line.536"></a>
-<span class="sourceLineNo">537</span> "Column Families " + unmatchedFamilies + " specified in " + COLUMNS_CONF_KEY<a name="line.537"></a>
-<span class="sourceLineNo">538</span> + " does not match with any of the table " + tableName<a name="line.538"></a>
-<span class="sourceLineNo">539</span> + " column families " + familyNames + ".\n"<a name="line.539"></a>
-<span class="sourceLineNo">540</span> + "To disable column family check, use -D" + NO_STRICT_COL_FAMILY<a name="line.540"></a>
-<span class="sourceLineNo">541</span> + "=true.\n";<a name="line.541"></a>
-<span class="sourceLineNo">542</span> usage(msg);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> System.exit(-1);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> }<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> job.setMapOutputValueClass(Text.class);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> job.setReducerClass(TextSortReducer.class);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> job.setMapOutputValueClass(Put.class);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> job.setCombinerClass(PutCombiner.class);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> job.setReducerClass(PutSortReducer.class);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (!isDryRun) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> Path outputDir = new Path(hfileOutPath);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> FileOutputFormat.setOutputPath(job, outputDir);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> HFileOutputFormat2.configureIncrementalLoad(job, table.getTableDescriptor(),<a name="line.557"></a>
-<span class="sourceLineNo">558</span> regionLocator);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> } else {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> if (!admin.tableExists(tableName)) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> String errorMsg = format("Table '%s' does not exist.", tableName);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> LOG.error(errorMsg);<a name="line.564"></a>
-<span class="sourceLineNo">565</span> throw new TableNotFoundException(errorMsg);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (mapperClass.equals(TsvImporterTextMapper.class)) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> usage(TsvImporterTextMapper.class.toString()<a name="line.568"></a>
-<span class="sourceLineNo">569</span> + " should not be used for non bulkloading case. use "<a name="line.569"></a>
-<span class="sourceLineNo">570</span> + TsvImporterMapper.class.toString()<a name="line.570"></a>
-<span class="sourceLineNo">571</span> + " or custom mapper whose value type is Put.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> System.exit(-1);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (!isDryRun) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // No reducers. Just write straight to table. Call initTableReducerJob<a name="line.575"></a>
-<span class="sourceLineNo">576</span> // to set up the TableOutputFormat.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), null, job);<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> job.setNumReduceTasks(0);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> if (isDryRun) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> job.setOutputFormatClass(NullOutputFormat.class);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> job.getConfiguration().setStrings("io.serializations",<a name="line.583"></a>
-<span class="sourceLineNo">584</span> job.getConfiguration().get("io.serializations"),<a name="line.584"></a>
-<span class="sourceLineNo">585</span> MutationSerialization.class.getName(), ResultSerialization.class.getName(),<a name="line.585"></a>
-<span class="sourceLineNo">586</span> KeyValueSerialization.class.getName());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> TableMapReduceUtil.addDependencyJars(job);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a name="line.589"></a>
-<span class="sourceLineNo">590</span> com.google.common.base.Function.class /* Guava used by TsvParser */);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> }<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> return job;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span> private static void createTable(Admin admin, TableName tableName, String[] columns)<a name="line.596"></a>
-<span class="sourceLineNo">597</span> throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> Set<String> cfSet = getColumnFamilies(columns);<a name="line.599"></a>
-<span class="sourceLineNo">600</span> for (String cf : cfSet) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> HColumnDescriptor hcd = new HColumnDescriptor(Bytes.toBytes(cf));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> htd.addFamily(hcd);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> LOG.warn(format("Creating table '%s' with '%s' columns and default descriptors.",<a name="line.604"></a>
-<span class="sourceLineNo">605</span> tableName, cfSet));<a name="line.605"></a>
-<span class="sourceLineNo">606</span> admin.createTable(htd);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> }<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> private static void deleteTable(Configuration conf, String[] args) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> TableName tableName = TableName.valueOf(args[0]);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> try (Connection connection = ConnectionFactory.createConnection(conf);<a name="line.611"></a>
-<span class="sourceLineNo">612</span> Admin admin = connection.getAdmin()) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> admin.disableTable(tableName);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch (TableNotEnabledException e) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> LOG.debug("Dry mode: Table: " + tableName + " already disabled, so just deleting it.");<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span> admin.deleteTable(tableName);<a name="line.618"></a>
-<span class="sourceLineNo">619</span> } catch (IOException e) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> LOG.error(format("***Dry run: Failed to delete table '%s'.***%n%s", tableName,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> e.toString()));<a name="line.621"></a>
-<span class="sourceLineNo">622</span> return;<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> LOG.info(format("Dry run: Deleted table '%s'.", tableName));<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> private static Set<String> getColumnFamilies(String[] columns) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> Set<String> cfSet = new HashSet<String>();<a name="line.628"></a>
-<span class="sourceLineNo">629</span> for (String aColumn : columns) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span> if (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)<a name="line.630"></a>
-<span class="sourceLineNo">631</span> || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)<a name="line.631"></a>
-<span class="sourceLineNo">632</span> || TsvParser.CELL_VISIBILITY_COLUMN_SPEC.equals(aColumn)<a name="line.632"></a>
-<span class="sourceLineNo">633</span> || TsvParser.CELL_TTL_COLUMN_SPEC.equals(aColumn)<a name="line.633"></a>
-<span class="sourceLineNo">634</span> || TsvParser.ATTRIBUTES_COLUMN_SPEC.equals(aColumn))<a name="line.634"></a>
-<span class="sourceLineNo">635</span> continue;<a name="line.635"></a>
-<span class="sourceLineNo">636</span> // we are only concerned with the first one (in case this is a cf:cq)<a name="line.636"></a>
-<span class="sourceLineNo">637</span> cfSet.add(aColumn.split(":", 2)[0]);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> }<a name="line.638"></a>
-<span class="sourceLineNo">639</span> return cfSet;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span> /*<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * @param errorMsg Error message. Can be null.<a name="line.643"></a>
-<span class="sourceLineNo">644</span> */<a name="line.644"></a>
-<span class="sourceLineNo">645</span> private static void usage(final String errorMsg) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (errorMsg != null && errorMsg.length() > 0) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> System.err.println("ERROR: " + errorMsg);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> String usage =<a name="line.649"></a>
-<span class="sourceLineNo">650</span> "Usage: " + NAME + " -D"+ COLUMNS_CONF_KEY + "=a,b,c <tablename> <inputdir>\n" +<a name="line.650"></a>
-<span class="sourceLineNo">651</span> "\n" +<a name="line.651"></a>
-<span class="sourceLineNo">652</span> "Imports the given input directory of TSV data into the specified table.\n" +<a name="line.652"></a>
-<span class="sourceLineNo">653</span> "\n" +<a name="line.653"></a>
-<span class="sourceLineNo">654</span> "The column names of the TSV data must be specified using the -D" + COLUMNS_CONF_KEY + "\n" +<a name="line.654"></a>
-<span class="sourceLineNo">655</span> "option. This option takes the form of comma-separated column names, where each\n" +<a name="line.655"></a>
-<span class="sourceLineNo">656</span> "column name is either a simple column family, or a columnfamily:qualifier. The special\n" +<a name="line.656"></a>
-<span class="sourceLineNo">657</span> "column name " + TsvParser.ROWKEY_COLUMN_SPEC + " is used to designate that this column should be used\n" +<a name="line.657"></a>
-<span class="sourceLineNo">658</span> "as the row key for each imported record. You must specify exactly one column\n" +<a name="line.658"></a>
-<span class="sourceLineNo">659</span> "to be the row key, and you must specify a column name for every column that exists in the\n" +<a name="line.659"></a>
-<span class="sourceLineNo">660</span> "input data. Another special column" + TsvParser.TIMESTAMPKEY_COLUMN_SPEC +<a name="line.660"></a>
-<span class="sourceLineNo">661</span> " designates that this column should be\n" +<a name="line.661"></a>
-<span class="sourceLineNo">662</span> "used as timestamp for each record. Unlike " + TsvParser.ROWKEY_COLUMN_SPEC + ", " +<a name="line.662"></a>
-<span class="sourceLineNo">663</span> TsvParser.TIMESTAMPKEY_COLUMN_SPEC + " is optional." + "\n" +<a name="line.663"></a>
-<span class="sourceLineNo">664</span> "You must specify at most one column as timestamp key for each imported record.\n" +<a name="line.664"></a>
-<span class="sourceLineNo">665</span> "Record with invalid timestamps (blank, non-numeric) will be treated as bad record.\n" +<a name="line.665"></a>
-<span class="sourceLineNo">666</span> "Note: if you use this option, then '" + TIMESTAMP_CONF_KEY + "' option will be ignored.\n" +<a name="line.666"></a>
-<span class="sourceLineNo">667</span> "\n" +<a name="line.667"></a>
-<span class="sourceLineNo">668</span> "Other special columns that can be specified are " + TsvParser.CELL_TTL_COLUMN_SPEC +<a name="line.668"></a>
-<span class="sourceLineNo">669</span> " and " + TsvParser.CELL_VISIBILITY_COLUMN_SPEC + ".\n" +<a name="line.669"></a>
-<span class="sourceLineNo">670</span> TsvParser.CELL_TTL_COLUMN_SPEC + " designates that this column will be used " +<a name="line.670"></a>
-<span class="sourceLineNo">671</span> "as a Cell's Time To Live (TTL) attribute.\n" +<a name="line.671"></a>
-<span class="sourceLineNo">672</span> TsvParser.CELL_VISIBILITY_COLUMN_SPEC + " designates that this column contains the " +<a name="line.672"></a>
-<span class="sourceLineNo">673</span> "visibility label expression.\n" +<a name="line.673"></a>
-<span class="sourceLineNo">674</span> "\n" +<a name="line.674"></a>
-<span class="sourceLineNo">675</span> TsvParser.ATTRIBUTES_COLUMN_SPEC+" can be used to specify Operation Attributes per record.\n"+<a name="line.675"></a>
-<span class="sourceLineNo">676</span> " Should be specified as key=>value where "+TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX+ " is used \n"+<a name="line.676"></a>
-<span class="sourceLineNo">677</span> " as the seperator. Note that more than one OperationAttributes can be specified.\n"+<a name="line.677"></a>
-<span class="sourceLineNo">678</span> "By default importtsv will load data directly into HBase. To instead generate\n" +<a name="line.678"></a>
-<span class="sourceLineNo">679</span> "HFiles of data to prepare for a bulk data load, pass the option:\n" +<a name="line.679"></a>
-<span class="sourceLineNo">680</span> " -D" + BULK_OUTPUT_CONF_KEY + "=/path/for/output\n" +<a name="line.680"></a>
-<span class="sourceLineNo">681</span> " Note: if you do not use this option, then the target table must already exist in HBase\n" +<a name="line.681"></a>
-<span class="sourceLineNo">682</span> "\n" +<a name="line.682"></a>
-<span class="sourceLineNo">683</span> "Other options that may be specified with -D include:\n" +<a name="line.683"></a>
-<span class="sourceLineNo">684</span> " -D" + DRY_RUN_CONF_KEY + "=true - Dry run mode. Data is not actually populated into" +<a name="line.684"></a>
-<span class="sourceLineNo">685</span> " table. If table does not exist, it is created but deleted in the end.\n" +<a name="line.685"></a>
-<span class="sourceLineNo">686</span> " -D" + SKIP_LINES_CONF_KEY + "=false - fail if encountering an invalid line\n" +<a name="line.686"></a>
-<span class="sourceLineNo">687</span> " -D" + LOG_BAD_LINES_CONF_KEY + "=true - logs invalid lines to stderr\n" +<a name="line.687"></a>
-<span class="sourceLineNo">688</span> " '-D" + SEPARATOR_CONF_KEY + "=|' - eg separate on pipes instead of tabs\n" +<a name="line.688"></a>
-<span class="sourceLineNo">689</span> " -D" + TIMESTAMP_CONF_KEY + "=currentTimeAsLong - use the specified timestamp for the import\n" +<a name="line.689"></a>
-<span class="sourceLineNo">690</span> " -D" + MAPPER_CONF_KEY + "=my.Mapper - A user-defined Mapper to use instead of " +<a name="line.690"></a>
-<span class="sourceLineNo">691</span> DEFAULT_MAPPER.getName() + "\n" +<a name="line.691"></a>
-<span class="sourceLineNo">692</span> " -D" + JOB_NAME_CONF_KEY + "=jobName - use the specified mapreduce job name for the import\n" +<a name="line.692"></a>
-<span class="sourceLineNo">693</span> " -D" + CREATE_TABLE_CONF_KEY + "=no - can be used to avoid creation of table by this tool\n" +<a name="line.693"></a>
-<span class="sourceLineNo">694</span> " Note: if you set this to 'no', then the target table must already exist in HBase\n" +<a name="line.694"></a>
-<span class="sourceLineNo">695</span> " -D" + NO_STRICT_COL_FAMILY + "=true - ignore column family check in hbase table. " +<a name="line.695"></a>
-<span class="sourceLineNo">696</span> "Default is false\n\n" +<a name="line.696"></a>
-<span class="sourceLineNo">697</span> "For performance consider the following options:\n" +<a name="line.697"></a>
-<span class="sourceLineNo">698</span> " -Dmapreduce.map.speculative=false\n" +<a name="line.698"></a>
-<span class="sourceLineNo">699</span> " -Dmapreduce.reduce.speculative=false";<a name="line.699"></a>
-<span class="sourceLineNo">700</span><a name="line.700"></a>
-<span class="sourceLineNo">701</span> System.err.println(usage);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> @Override<a name="line.704"></a>
-<span class="sourceLineNo">705</span> public int run(String[] args) throws Exception {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> if (args.length < 2) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> usage("Wrong number of arguments: " + args.length);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> return -1;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span> // When MAPPER_CONF_KEY is null, the user wants to use the provided TsvImporterMapper, so<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // perform validation on these additional args. When it's not null, user has provided their<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // own mapper, thus these validation are not relevant.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> // TODO: validation for TsvImporterMapper, not this tool. Move elsewhere.<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (null == getConf().get(MAPPER_CONF_KEY)) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> // Make sure columns are specified<a name="line.716"></a>
-<span class="sourceLineNo">717</span> String[] columns = getConf().getStrings(COLUMNS_CONF_KEY);<a name="line.717"></a>
-<span class="sourceLineNo">718</span> if (columns == null) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> usage("No columns specified. Please specify with -D" +<a name="line.719"></a>
-<span class="sourceLineNo">720</span> COLUMNS_CONF_KEY+"=...");<a name="line.720"></a>
-<span class="sourceLineNo">721</span> return -1;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Make sure they specify exactly one column as the row key<a name="line.724"></a>
-<span class="sourceLineNo">725</span> int rowkeysFound = 0;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> for (String col : columns) {<a name="line.726"></a>
-<span class="sourceLineNo">727</span> if (col.equals(TsvParser.ROWKEY_COLUMN_SPEC)) rowkeysFound++;<a name="line.727"></a>
-<span class="sourceLineNo">728</span> }<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (rowkeysFound != 1) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> usage("Must specify exactly one column as " + TsvParser.ROWKEY_COLUMN_SPEC);<a name="line.730"></a>
-<span class="sourceLineNo">731</span> return -1;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> }<a name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span> // Make sure we have at most one column as the timestamp key<a name="line.734"></a>
-<span class="sourceLineNo">735</span> int tskeysFound = 0;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> for (String col : columns) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (col.equals(TsvParser.TIMESTAMPKEY_COLUMN_SPEC))<a name="line.737"></a>
-<span class="sourceLineNo">738</span> tskeysFound++;<a name="line.738"></a>
-<span class="sourceLineNo">739</span> }<a name="line.739"></a>
-<span class="sourceLineNo">740</span> if (tskeysFound > 1) {<a name="line.740"></a>
-<span class="sourceLineNo">741</span> usage("Must specify at most one column as "<a name="line.741"></a>
-<span class="sourceLineNo">742</span> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return -1;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span> int attrKeysFound = 0;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> for (String col : columns) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (col.equals(TsvParser.ATTRIBUTES_COLUMN_SPEC))<a name="line.748"></a>
-<span class="sourceLineNo">749</span> attrKeysFound++;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> if (attrKeysFound > 1) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> usage("Must specify at most one column as "<a name="line.752"></a>
-<span class="sourceLineNo">753</span> + TsvParser.ATTRIBUTES_COLUMN_SPEC);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> return -1;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> }<a name="line.755"></a>
-<span class="sourceLineNo">756</span><a name="line.756"></a>
-<span class="sourceLineNo">757</span> // Make sure one or more columns are specified excluding rowkey and<a name="line.757"></a>
-<span class="sourceLineNo">758</span> // timestamp key<a name="line.758"></a>
-<span class="sourceLineNo">759</span> if (columns.length - (rowkeysFound + tskeysFound + attrKeysFound) < 1) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> usage("One or more columns in addition to the row key and timestamp(optional) are required");<a name="line.760"></a>
-<span class="sourceLineNo">761</span> return -1;<a name="line.761"></a>
-<span class="sourceLineNo">762</span> }<a name="line.762"></a>
-<span class="sourceLineNo">763</span> }<a name="line.763"></a>
-<span class="sourceLineNo">764</span><a name="line.764"></a>
-<span class="sourceLineNo">765</span> // If timestamp option is not specified, use current system time.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> long timstamp = getConf().getLong(TIMESTAMP_CONF_KEY, System.currentTimeMillis());<a name="line.766"></a>
-<span class="sourceLineNo">767</span><a name="line.767"></a>
-<span class="sourceLineNo">768</span> // Set it back to replace invalid timestamp (non-numeric) with current<a name="line.768"></a>
-<span class="sourceLineNo">769</span> // system time<a name="line.769"></a>
-<span class="sourceLineNo">770</span> getConf().setLong(TIMESTAMP_CONF_KEY, timstamp);<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> synchronized (ImportTsv.class) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span> DRY_RUN_TABLE_CREATED = false;<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span> Job job = createSubmittableJob(getConf(), args);<a name="line.775"></a>
-<span class="sourceLineNo">776</span> boolean success = job.waitForCompletion(true);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> boolean delete = false;<a name="line.777"></a>
-<span class="sourceLineNo">778</span> synchronized (ImportTsv.class) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> delete = DRY_RUN_TABLE_CREATED;<a name="line.779"></a>
-<span class="sourceLineNo">780</span> }<a name="line.780"></a>
-<span class="sourceLineNo">781</span> if (delete) {<a name="line.781"></a>
-<span class="sourceLineNo">782</span> deleteTable(getConf(), args);<a name="line.782"></a>
-<span class="sourceLineNo">783</span> }<a name="line.783"></a>
-<span class="sourceLineNo">784</span> return success ? 0 : 1;<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span> public static void main(String[] args) throws Exception {<a name="line.787"></a>
-<span class="sourceLineNo">788</span> int status = ToolRunner.run(HBaseConfiguration.create(), new ImportTsv(), args);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> System.exit(status);<a name="line.789"></a>
-<span class="sourceLineNo">790</span> }<a name="line.790"></a>
-<span class="sourceLineNo">791</span>}<a name="line.791"></a>
+<span class="sourceLineNo">094</span> public final static String SKIP_EMPTY_COLUMNS = "importtsv.skip.empty.columns";<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public final static String COLUMNS_CONF_KEY = "importtsv.columns";<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public final static String SEPARATOR_CONF_KEY = "importtsv.separator";<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public final static String ATTRIBUTE_SEPERATOR_CONF_KEY = "attributes.seperator";<a name="line.97"></a>
+<span class="sourceLineNo">098</span> //This config is used to propagate credentials from parent MR jobs which launch<a name="line.98"></a>
+<span class="sourceLineNo">099</span> //ImportTSV jobs. SEE IntegrationTestImportTsv.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public final static String CREDENTIALS_LOCATION = "credentials_location";<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final static String DEFAULT_SEPARATOR = "\t";<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final static String DEFAULT_ATTRIBUTES_SEPERATOR = "=>";<a name="line.102"></a>
+<span class="sourceLineNo">103</span> final static String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = ",";<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final static Class DEFAULT_MAPPER = TsvImporterMapper.class;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public final static String CREATE_TABLE_CONF_KEY = "create.table";<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public final static String NO_STRICT_COL_FAMILY = "no.strict";<a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * If table didn't exist and was created in dry-run mode, this flag is<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * flipped to delete it when MR ends.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private static boolean DRY_RUN_TABLE_CREATED;<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> public static class TsvParser {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * Column families and qualifiers mapped to the TSV columns<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private final byte[][] families;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> private final byte[][] qualifiers;<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> private final byte separatorByte;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> private int rowKeyColumnIndex;<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> private int maxColumnCount;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Default value must be negative<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static final int DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> private int timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> public static final String ROWKEY_COLUMN_SPEC = "HBASE_ROW_KEY";<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> public static final String TIMESTAMPKEY_COLUMN_SPEC = "HBASE_TS_KEY";<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> public static final String ATTRIBUTES_COLUMN_SPEC = "HBASE_ATTRIBUTES_KEY";<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> public static final String CELL_VISIBILITY_COLUMN_SPEC = "HBASE_CELL_VISIBILITY";<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static final String CELL_TTL_COLUMN_SPEC = "HBASE_CELL_TTL";<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> private int attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> public static final int DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> public static final int DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static final int DEFAULT_CELL_TTL_COLUMN_INDEX = -1;<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> private int cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> private int cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;<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> * @param columnsSpecification the list of columns to parser out, comma separated.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @param separatorStr<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public TsvParser(String columnsSpecification, String separatorStr) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // Configure separator<a name="line.159"></a>
+<span class="sourceLineNo">160</span> byte[] separator = Bytes.toBytes(separatorStr);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Preconditions.checkArgument(separator.length == 1,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> "TsvParser only supports single-byte separators");<a name="line.162"></a>
+<span class="sourceLineNo">163</span> separatorByte = separator[0];<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Configure columns<a name="line.165"></a>
+<span class="sourceLineNo">166</span> ArrayList<String> columnStrings = Lists.newArrayList(<a name="line.166"></a>
+<span class="sourceLineNo">167</span> Splitter.on(',').trimResults().split(columnsSpecification));<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> maxColumnCount = columnStrings.size();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> families = new byte[maxColumnCount][];<a name="line.170"></a>
+<span class="sourceLineNo">171</span> qualifiers = new byte[maxColumnCount][];<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < columnStrings.size(); i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String str = columnStrings.get(i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (ROWKEY_COLUMN_SPEC.equals(str)) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> rowKeyColumnIndex = i;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> continue;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> timestampKeyColumnIndex = i;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> continue;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (ATTRIBUTES_COLUMN_SPEC.equals(str)) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> attrKeyColumnIndex = i;<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> if (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> cellVisibilityColumnIndex = i;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> continue;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (CELL_TTL_COLUMN_SPEC.equals(str)) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cellTTLColumnIndex = i;<a name="line.192"></a>
+<span class="sourceLineNo">193</span> continue;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> String[] parts = str.split(":", 2);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (parts.length == 1) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> families[i] = str.getBytes();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } else {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> families[i] = parts[0].getBytes();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> qualifiers[i] = parts[1].getBytes();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<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> public boolean hasTimestamp() {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> return timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> public int getTimestampKeyColumnIndex() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return timestampKeyColumnIndex;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> public boolean hasAttributes() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> public boolean hasCellVisibility() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public boolean hasCellTTL() {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> public int getAttributesKeyColumnIndex() {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> return attrKeyColumnIndex;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> public int getCellVisibilityColumnIndex() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return cellVisibilityColumnIndex;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> public int getCellTTLColumnIndex() {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return cellTTLColumnIndex;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> public int getRowKeyColumnIndex() {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return rowKeyColumnIndex;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> public byte[] getFamily(int idx) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return families[idx];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> public byte[] getQualifier(int idx) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return qualifiers[idx];<a name="line.246"></a>
+<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> public ParsedLine parse(byte[] lineBytes, int length)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> throws BadTsvLineException {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // Enumerate separator offsets<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ArrayList<Integer> tabOffsets = new ArrayList<Integer>(maxColumnCount);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (int i = 0; i < length; i++) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (lineBytes[i] == separatorByte) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> tabOffsets.add(i);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (tabOffsets.isEmpty()) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> throw new BadTsvLineException("No delimiter");<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> tabOffsets.add(length);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (tabOffsets.size() > maxColumnCount) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new BadTsvLineException("Excessive columns");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } else if (tabOffsets.size() <= getRowKeyColumnIndex()) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> throw new BadTsvLineException("No row key");<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else if (hasTimestamp()<a name="line.268"></a>
+<span class="sourceLineNo">269</span> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> throw new BadTsvLineException("No timestamp");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> } else if (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new BadTsvLineException("No attributes specified");<a name="line.272"></a>
+<span class="sourceLineNo">273</span> } else if (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> throw new BadTsvLineException("No cell visibility specified");<a name="line.274"></a>
+<span class="sourceLineNo">275</span> } else if (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new BadTsvLineException("No cell TTL specified");<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return new ParsedLine(tabOffsets, lineBytes);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> class ParsedLine {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> private final ArrayList<Integer> tabOffsets;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private byte[] lineBytes;<a name="line.283"></a>
+<span class="sourceLineNo
<TRUNCATED>
[02/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html b/xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
index b450144..0039601 100644
--- a/xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
+++ b/xref/org/apache/hadoop/hbase/mapreduce/TsvImporterMapper.html
@@ -68,175 +68,180 @@
<a class="jxr_linenumber" name="58" href="#58">58</a>
<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Should skip bad lines */</em>
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> skipBadLines;
-<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/hadoop/hbase/util/Counter.html">Counter</a> badLineCount;
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> logBadLines;
-<a class="jxr_linenumber" name="63" href="#63">63</a>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">protected</strong> ImportTsv.TsvParser parser;
+<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Should skip empty columns*/</em>
+<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> skipEmptyColumns;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/hadoop/hbase/util/Counter.html">Counter</a> badLineCount;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> logBadLines;
<a class="jxr_linenumber" name="65" href="#65">65</a>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">protected</strong> Configuration conf;
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">protected</strong> ImportTsv.TsvParser parser;
<a class="jxr_linenumber" name="67" href="#67">67</a>
-<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">protected</strong> String cellVisibilityExpr;
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">protected</strong> Configuration conf;
<a class="jxr_linenumber" name="69" href="#69">69</a>
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">long</strong> ttl;
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">protected</strong> String cellVisibilityExpr;
<a class="jxr_linenumber" name="71" href="#71">71</a>
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html">CellCreator</a> kvCreator;
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">long</strong> ttl;
<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">private</strong> String hfileOutPath;
+<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html">CellCreator</a> kvCreator;
<a class="jxr_linenumber" name="75" href="#75">75</a>
-<a class="jxr_linenumber" name="76" href="#76">76</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> List of cell tags */</em>
-<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">private</strong> List<Tag> tags;
-<a class="jxr_linenumber" name="78" href="#78">78</a>
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getTs() {
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">return</strong> ts;
-<a class="jxr_linenumber" name="81" href="#81">81</a> }
-<a class="jxr_linenumber" name="82" href="#82">82</a>
-<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getSkipBadLines() {
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">return</strong> skipBadLines;
-<a class="jxr_linenumber" name="85" href="#85">85</a> }
-<a class="jxr_linenumber" name="86" href="#86">86</a>
-<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/util/Counter.html">Counter</a> getBadLineCount() {
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">return</strong> badLineCount;
-<a class="jxr_linenumber" name="89" href="#89">89</a> }
-<a class="jxr_linenumber" name="90" href="#90">90</a>
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> incrementBadLineCount(<strong class="jxr_keyword">int</strong> count) {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">this</strong>.badLineCount.increment(count);
-<a class="jxr_linenumber" name="93" href="#93">93</a> }
-<a class="jxr_linenumber" name="94" href="#94">94</a>
-<a class="jxr_linenumber" name="95" href="#95">95</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * Handles initializing this class with objects specific to it (i.e., the parser).</em>
-<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_javadoccomment"> * Common initialization that might be leveraged by a subsclass is done in</em>
-<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_javadoccomment"> * <code>doSetup</code>. Hence a subclass may choose to override this method</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_javadoccomment"> * and call <code>doSetup</code> as well before handling it's own custom params.</em>
-<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment"> * @param context</em>
-<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="103" href="#103">103</a> @Override
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setup(Context context) {
-<a class="jxr_linenumber" name="105" href="#105">105</a> doSetup(context);
-<a class="jxr_linenumber" name="106" href="#106">106</a>
-<a class="jxr_linenumber" name="107" href="#107">107</a> conf = context.getConfiguration();
-<a class="jxr_linenumber" name="108" href="#108">108</a> parser = <strong class="jxr_keyword">new</strong> ImportTsv.TsvParser(conf.get(ImportTsv.COLUMNS_CONF_KEY),
-<a class="jxr_linenumber" name="109" href="#109">109</a> separator);
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">if</strong> (parser.getRowKeyColumnIndex() == -1) {
-<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"No row key column specified"</span>);
-<a class="jxr_linenumber" name="112" href="#112">112</a> }
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">this</strong>.kvCreator = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html">CellCreator</a>(conf);
-<a class="jxr_linenumber" name="114" href="#114">114</a> tags = <strong class="jxr_keyword">new</strong> ArrayList<Tag>();
-<a class="jxr_linenumber" name="115" href="#115">115</a> }
-<a class="jxr_linenumber" name="116" href="#116">116</a>
-<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_javadoccomment"> * Handles common parameter initialization that a subclass might want to leverage.</em>
-<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_javadoccomment"> * @param context</em>
-<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> doSetup(Context context) {
-<a class="jxr_linenumber" name="122" href="#122">122</a> Configuration conf = context.getConfiguration();
-<a class="jxr_linenumber" name="123" href="#123">123</a>
-<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_comment">// If a custom separator has been used,</em>
-<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment">// decode it back from Base64 encoding.</em>
-<a class="jxr_linenumber" name="126" href="#126">126</a> separator = conf.get(ImportTsv.SEPARATOR_CONF_KEY);
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">if</strong> (separator == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="128" href="#128">128</a> separator = ImportTsv.DEFAULT_SEPARATOR;
-<a class="jxr_linenumber" name="129" href="#129">129</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="130" href="#130">130</a> separator = <strong class="jxr_keyword">new</strong> String(Base64.decode(separator));
-<a class="jxr_linenumber" name="131" href="#131">131</a> }
-<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_comment">// Should never get 0 as we are setting this to a valid value in job</em>
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// configuration.</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> ts = conf.getLong(ImportTsv.TIMESTAMP_CONF_KEY, 0);
-<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> skipBadLines = context.getConfiguration().getBoolean(
-<a class="jxr_linenumber" name="137" href="#137">137</a> ImportTsv.SKIP_LINES_CONF_KEY, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="138" href="#138">138</a> badLineCount = context.getCounter(<span class="jxr_string">"ImportTsv"</span>, <span class="jxr_string">"Bad Lines"</span>);
-<a class="jxr_linenumber" name="139" href="#139">139</a> logBadLines = context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, false);
-<a class="jxr_linenumber" name="140" href="#140">140</a> hfileOutPath = conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY);
-<a class="jxr_linenumber" name="141" href="#141">141</a> }
-<a class="jxr_linenumber" name="142" href="#142">142</a>
-<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * Convert a line of TSV text into an HBase table row.</em>
-<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a> @Override
-<a class="jxr_linenumber" name="147" href="#147">147</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> map(LongWritable offset, Text value,
-<a class="jxr_linenumber" name="148" href="#148">148</a> Context context)
-<a class="jxr_linenumber" name="149" href="#149">149</a> <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="150" href="#150">150</a> byte[] lineBytes = value.getBytes();
-<a class="jxr_linenumber" name="151" href="#151">151</a>
-<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="153" href="#153">153</a> ImportTsv.TsvParser.ParsedLine parsed = parser.parse(
-<a class="jxr_linenumber" name="154" href="#154">154</a> lineBytes, value.getLength());
-<a class="jxr_linenumber" name="155" href="#155">155</a> <a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html">ImmutableBytesWritable</a> rowKey =
-<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html">ImmutableBytesWritable</a>(lineBytes,
-<a class="jxr_linenumber" name="157" href="#157">157</a> parsed.getRowKeyOffset(),
-<a class="jxr_linenumber" name="158" href="#158">158</a> parsed.getRowKeyLength());
-<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_comment">// Retrieve timestamp if exists</em>
-<a class="jxr_linenumber" name="160" href="#160">160</a> ts = parsed.getTimestamp(ts);
-<a class="jxr_linenumber" name="161" href="#161">161</a> cellVisibilityExpr = parsed.getCellVisibility();
-<a class="jxr_linenumber" name="162" href="#162">162</a> ttl = parsed.getCellTTL();
-<a class="jxr_linenumber" name="163" href="#163">163</a>
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// create tags for the parsed line</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">if</strong> (hfileOutPath != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="166" href="#166">166</a> tags.clear();
-<a class="jxr_linenumber" name="167" href="#167">167</a> <strong class="jxr_keyword">if</strong> (cellVisibilityExpr != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="168" href="#168">168</a> tags.addAll(kvCreator.getVisibilityExpressionResolver().createVisibilityExpTags(
-<a class="jxr_linenumber" name="169" href="#169">169</a> cellVisibilityExpr));
-<a class="jxr_linenumber" name="170" href="#170">170</a> }
-<a class="jxr_linenumber" name="171" href="#171">171</a> <em class="jxr_comment">// Add TTL directly to the KV so we can vary them when packing more than one KV</em>
-<a class="jxr_linenumber" name="172" href="#172">172</a> <em class="jxr_comment">// into puts</em>
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">if</strong> (ttl > 0) {
-<a class="jxr_linenumber" name="174" href="#174">174</a> tags.add(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/ArrayBackedTag.html">ArrayBackedTag</a>(TagType.TTL_TAG_TYPE, Bytes.toBytes(ttl)));
-<a class="jxr_linenumber" name="175" href="#175">175</a> }
-<a class="jxr_linenumber" name="176" href="#176">176</a> }
-<a class="jxr_linenumber" name="177" href="#177">177</a> <a href="../../../../../org/apache/hadoop/hbase/client/Put.html">Put</a> put = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/client/Put.html">Put</a>(rowKey.copyBytes());
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < parsed.getColumnCount(); i++) {
-<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">if</strong> (i == parser.getRowKeyColumnIndex() || i == parser.getTimestampKeyColumnIndex()
-<a class="jxr_linenumber" name="180" href="#180">180</a> || i == parser.getAttributesKeyColumnIndex() || i == parser.getCellVisibilityColumnIndex()
-<a class="jxr_linenumber" name="181" href="#181">181</a> || i == parser.getCellTTLColumnIndex()) {
-<a class="jxr_linenumber" name="182" href="#182">182</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="183" href="#183">183</a> }
-<a class="jxr_linenumber" name="184" href="#184">184</a> populatePut(lineBytes, parsed, put, i);
-<a class="jxr_linenumber" name="185" href="#185">185</a> }
-<a class="jxr_linenumber" name="186" href="#186">186</a> context.write(rowKey, put);
-<a class="jxr_linenumber" name="187" href="#187">187</a> } <strong class="jxr_keyword">catch</strong> (ImportTsv.TsvParser.BadTsvLineException | IllegalArgumentException
-<a class="jxr_linenumber" name="188" href="#188">188</a> | <a href="../../../../../org/apache/hadoop/hbase/security/visibility/InvalidLabelException.html">InvalidLabelException</a> badLine) {
-<a class="jxr_linenumber" name="189" href="#189">189</a> <strong class="jxr_keyword">if</strong> (logBadLines) {
-<a class="jxr_linenumber" name="190" href="#190">190</a> System.err.println(value);
-<a class="jxr_linenumber" name="191" href="#191">191</a> }
-<a class="jxr_linenumber" name="192" href="#192">192</a> System.err.println(<span class="jxr_string">"Bad line at offset: "</span> + offset.get() + <span class="jxr_string">":\n"</span> + badLine.getMessage());
-<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">if</strong> (skipBadLines) {
-<a class="jxr_linenumber" name="194" href="#194">194</a> incrementBadLineCount(1);
-<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> String hfileOutPath;
+<a class="jxr_linenumber" name="77" href="#77">77</a>
+<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> List of cell tags */</em>
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">private</strong> List<Tag> tags;
+<a class="jxr_linenumber" name="80" href="#80">80</a>
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getTs() {
+<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">return</strong> ts;
+<a class="jxr_linenumber" name="83" href="#83">83</a> }
+<a class="jxr_linenumber" name="84" href="#84">84</a>
+<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getSkipBadLines() {
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">return</strong> skipBadLines;
+<a class="jxr_linenumber" name="87" href="#87">87</a> }
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/util/Counter.html">Counter</a> getBadLineCount() {
+<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">return</strong> badLineCount;
+<a class="jxr_linenumber" name="91" href="#91">91</a> }
+<a class="jxr_linenumber" name="92" href="#92">92</a>
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> incrementBadLineCount(<strong class="jxr_keyword">int</strong> count) {
+<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">this</strong>.badLineCount.increment(count);
+<a class="jxr_linenumber" name="95" href="#95">95</a> }
+<a class="jxr_linenumber" name="96" href="#96">96</a>
+<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_javadoccomment"> * Handles initializing this class with objects specific to it (i.e., the parser).</em>
+<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_javadoccomment"> * Common initialization that might be leveraged by a subsclass is done in</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> <em class="jxr_javadoccomment"> * <code>doSetup</code>. Hence a subclass may choose to override this method</em>
+<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_javadoccomment"> * and call <code>doSetup</code> as well before handling it's own custom params.</em>
+<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="103" href="#103">103</a> <em class="jxr_javadoccomment"> * @param context</em>
+<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="105" href="#105">105</a> @Override
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setup(Context context) {
+<a class="jxr_linenumber" name="107" href="#107">107</a> doSetup(context);
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> conf = context.getConfiguration();
+<a class="jxr_linenumber" name="110" href="#110">110</a> parser = <strong class="jxr_keyword">new</strong> ImportTsv.TsvParser(conf.get(ImportTsv.COLUMNS_CONF_KEY),
+<a class="jxr_linenumber" name="111" href="#111">111</a> separator);
+<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">if</strong> (parser.getRowKeyColumnIndex() == -1) {
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"No row key column specified"</span>);
+<a class="jxr_linenumber" name="114" href="#114">114</a> }
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">this</strong>.kvCreator = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCreator.html">CellCreator</a>(conf);
+<a class="jxr_linenumber" name="116" href="#116">116</a> tags = <strong class="jxr_keyword">new</strong> ArrayList<Tag>();
+<a class="jxr_linenumber" name="117" href="#117">117</a> }
+<a class="jxr_linenumber" name="118" href="#118">118</a>
+<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_javadoccomment"> * Handles common parameter initialization that a subclass might want to leverage.</em>
+<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_javadoccomment"> * @param context</em>
+<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> doSetup(Context context) {
+<a class="jxr_linenumber" name="124" href="#124">124</a> Configuration conf = context.getConfiguration();
+<a class="jxr_linenumber" name="125" href="#125">125</a>
+<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// If a custom separator has been used,</em>
+<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment">// decode it back from Base64 encoding.</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> separator = conf.get(ImportTsv.SEPARATOR_CONF_KEY);
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong> (separator == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="130" href="#130">130</a> separator = ImportTsv.DEFAULT_SEPARATOR;
+<a class="jxr_linenumber" name="131" href="#131">131</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="132" href="#132">132</a> separator = <strong class="jxr_keyword">new</strong> String(Base64.decode(separator));
+<a class="jxr_linenumber" name="133" href="#133">133</a> }
+<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_comment">// Should never get 0 as we are setting this to a valid value in job</em>
+<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_comment">// configuration.</em>
+<a class="jxr_linenumber" name="136" href="#136">136</a> ts = conf.getLong(ImportTsv.TIMESTAMP_CONF_KEY, 0);
+<a class="jxr_linenumber" name="137" href="#137">137</a>
+<a class="jxr_linenumber" name="138" href="#138">138</a> skipEmptyColumns = context.getConfiguration().getBoolean(
+<a class="jxr_linenumber" name="139" href="#139">139</a> ImportTsv.SKIP_EMPTY_COLUMNS, false);
+<a class="jxr_linenumber" name="140" href="#140">140</a> skipBadLines = context.getConfiguration().getBoolean(
+<a class="jxr_linenumber" name="141" href="#141">141</a> ImportTsv.SKIP_LINES_CONF_KEY, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="142" href="#142">142</a> badLineCount = context.getCounter(<span class="jxr_string">"ImportTsv"</span>, <span class="jxr_string">"Bad Lines"</span>);
+<a class="jxr_linenumber" name="143" href="#143">143</a> logBadLines = context.getConfiguration().getBoolean(ImportTsv.LOG_BAD_LINES_CONF_KEY, false);
+<a class="jxr_linenumber" name="144" href="#144">144</a> hfileOutPath = conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY);
+<a class="jxr_linenumber" name="145" href="#145">145</a> }
+<a class="jxr_linenumber" name="146" href="#146">146</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_javadoccomment"> * Convert a line of TSV text into an HBase table row.</em>
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a> @Override
+<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> map(LongWritable offset, Text value,
+<a class="jxr_linenumber" name="152" href="#152">152</a> Context context)
+<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="154" href="#154">154</a> byte[] lineBytes = value.getBytes();
+<a class="jxr_linenumber" name="155" href="#155">155</a>
+<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="157" href="#157">157</a> ImportTsv.TsvParser.ParsedLine parsed = parser.parse(
+<a class="jxr_linenumber" name="158" href="#158">158</a> lineBytes, value.getLength());
+<a class="jxr_linenumber" name="159" href="#159">159</a> <a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html">ImmutableBytesWritable</a> rowKey =
+<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/io/ImmutableBytesWritable.html">ImmutableBytesWritable</a>(lineBytes,
+<a class="jxr_linenumber" name="161" href="#161">161</a> parsed.getRowKeyOffset(),
+<a class="jxr_linenumber" name="162" href="#162">162</a> parsed.getRowKeyLength());
+<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_comment">// Retrieve timestamp if exists</em>
+<a class="jxr_linenumber" name="164" href="#164">164</a> ts = parsed.getTimestamp(ts);
+<a class="jxr_linenumber" name="165" href="#165">165</a> cellVisibilityExpr = parsed.getCellVisibility();
+<a class="jxr_linenumber" name="166" href="#166">166</a> ttl = parsed.getCellTTL();
+<a class="jxr_linenumber" name="167" href="#167">167</a>
+<a class="jxr_linenumber" name="168" href="#168">168</a> <em class="jxr_comment">// create tags for the parsed line</em>
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">if</strong> (hfileOutPath != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="170" href="#170">170</a> tags.clear();
+<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">if</strong> (cellVisibilityExpr != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="172" href="#172">172</a> tags.addAll(kvCreator.getVisibilityExpressionResolver().createVisibilityExpTags(
+<a class="jxr_linenumber" name="173" href="#173">173</a> cellVisibilityExpr));
+<a class="jxr_linenumber" name="174" href="#174">174</a> }
+<a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_comment">// Add TTL directly to the KV so we can vary them when packing more than one KV</em>
+<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_comment">// into puts</em>
+<a class="jxr_linenumber" name="177" href="#177">177</a> <strong class="jxr_keyword">if</strong> (ttl > 0) {
+<a class="jxr_linenumber" name="178" href="#178">178</a> tags.add(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/ArrayBackedTag.html">ArrayBackedTag</a>(TagType.TTL_TAG_TYPE, Bytes.toBytes(ttl)));
+<a class="jxr_linenumber" name="179" href="#179">179</a> }
+<a class="jxr_linenumber" name="180" href="#180">180</a> }
+<a class="jxr_linenumber" name="181" href="#181">181</a> <a href="../../../../../org/apache/hadoop/hbase/client/Put.html">Put</a> put = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/client/Put.html">Put</a>(rowKey.copyBytes());
+<a class="jxr_linenumber" name="182" href="#182">182</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < parsed.getColumnCount(); i++) {
+<a class="jxr_linenumber" name="183" href="#183">183</a> <strong class="jxr_keyword">if</strong> (i == parser.getRowKeyColumnIndex() || i == parser.getTimestampKeyColumnIndex()
+<a class="jxr_linenumber" name="184" href="#184">184</a> || i == parser.getAttributesKeyColumnIndex() || i == parser.getCellVisibilityColumnIndex()
+<a class="jxr_linenumber" name="185" href="#185">185</a> || i == parser.getCellTTLColumnIndex() || (skipEmptyColumns
+<a class="jxr_linenumber" name="186" href="#186">186</a> && parsed.getColumnLength(i) == 0)) {
+<a class="jxr_linenumber" name="187" href="#187">187</a> <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="188" href="#188">188</a> }
+<a class="jxr_linenumber" name="189" href="#189">189</a> populatePut(lineBytes, parsed, put, i);
+<a class="jxr_linenumber" name="190" href="#190">190</a> }
+<a class="jxr_linenumber" name="191" href="#191">191</a> context.write(rowKey, put);
+<a class="jxr_linenumber" name="192" href="#192">192</a> } <strong class="jxr_keyword">catch</strong> (ImportTsv.TsvParser.BadTsvLineException | IllegalArgumentException
+<a class="jxr_linenumber" name="193" href="#193">193</a> | <a href="../../../../../org/apache/hadoop/hbase/security/visibility/InvalidLabelException.html">InvalidLabelException</a> badLine) {
+<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">if</strong> (logBadLines) {
+<a class="jxr_linenumber" name="195" href="#195">195</a> System.err.println(value);
<a class="jxr_linenumber" name="196" href="#196">196</a> }
-<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(badLine);
-<a class="jxr_linenumber" name="198" href="#198">198</a> } <strong class="jxr_keyword">catch</strong> (InterruptedException e) {
-<a class="jxr_linenumber" name="199" href="#199">199</a> e.printStackTrace();
-<a class="jxr_linenumber" name="200" href="#200">200</a> }
-<a class="jxr_linenumber" name="201" href="#201">201</a> }
-<a class="jxr_linenumber" name="202" href="#202">202</a>
-<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> populatePut(byte[] lineBytes, ImportTsv.TsvParser.ParsedLine parsed, <a href="../../../../../org/apache/hadoop/hbase/client/Put.html">Put</a> put,
-<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">int</strong> i) <strong class="jxr_keyword">throws</strong> BadTsvLineException, IOException {
-<a class="jxr_linenumber" name="205" href="#205">205</a> <a href="../../../../../org/apache/hadoop/hbase/Cell.html">Cell</a> cell = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="206" href="#206">206</a> <strong class="jxr_keyword">if</strong> (hfileOutPath == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="207" href="#207">207</a> cell = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/KeyValue.html">KeyValue</a>(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),
-<a class="jxr_linenumber" name="208" href="#208">208</a> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,
-<a class="jxr_linenumber" name="209" href="#209">209</a> parser.getQualifier(i).length, ts, KeyValue.Type.Put, lineBytes,
-<a class="jxr_linenumber" name="210" href="#210">210</a> parsed.getColumnOffset(i), parsed.getColumnLength(i));
-<a class="jxr_linenumber" name="211" href="#211">211</a> <strong class="jxr_keyword">if</strong> (cellVisibilityExpr != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_comment">// We won't be validating the expression here. The Visibility CP will do</em>
-<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// the validation</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a> put.setCellVisibility(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/security/visibility/CellVisibility.html">CellVisibility</a>(cellVisibilityExpr));
-<a class="jxr_linenumber" name="215" href="#215">215</a> }
-<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">if</strong> (ttl > 0) {
-<a class="jxr_linenumber" name="217" href="#217">217</a> put.setTTL(ttl);
-<a class="jxr_linenumber" name="218" href="#218">218</a> }
-<a class="jxr_linenumber" name="219" href="#219">219</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="220" href="#220">220</a> <em class="jxr_comment">// Creating the KV which needs to be directly written to HFiles. Using the Facade</em>
-<a class="jxr_linenumber" name="221" href="#221">221</a> <em class="jxr_comment">// KVCreator for creation of kvs.</em>
-<a class="jxr_linenumber" name="222" href="#222">222</a> cell = <strong class="jxr_keyword">this</strong>.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),
-<a class="jxr_linenumber" name="223" href="#223">223</a> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,
-<a class="jxr_linenumber" name="224" href="#224">224</a> parser.getQualifier(i).length, ts, lineBytes, parsed.getColumnOffset(i),
-<a class="jxr_linenumber" name="225" href="#225">225</a> parsed.getColumnLength(i), tags);
-<a class="jxr_linenumber" name="226" href="#226">226</a> }
-<a class="jxr_linenumber" name="227" href="#227">227</a> put.add(cell);
-<a class="jxr_linenumber" name="228" href="#228">228</a> }
-<a class="jxr_linenumber" name="229" href="#229">229</a> }
+<a class="jxr_linenumber" name="197" href="#197">197</a> System.err.println(<span class="jxr_string">"Bad line at offset: "</span> + offset.get() + <span class="jxr_string">":\n"</span> + badLine.getMessage());
+<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">if</strong> (skipBadLines) {
+<a class="jxr_linenumber" name="199" href="#199">199</a> incrementBadLineCount(1);
+<a class="jxr_linenumber" name="200" href="#200">200</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="201" href="#201">201</a> }
+<a class="jxr_linenumber" name="202" href="#202">202</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(badLine);
+<a class="jxr_linenumber" name="203" href="#203">203</a> } <strong class="jxr_keyword">catch</strong> (InterruptedException e) {
+<a class="jxr_linenumber" name="204" href="#204">204</a> e.printStackTrace();
+<a class="jxr_linenumber" name="205" href="#205">205</a> }
+<a class="jxr_linenumber" name="206" href="#206">206</a> }
+<a class="jxr_linenumber" name="207" href="#207">207</a>
+<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> populatePut(byte[] lineBytes, ImportTsv.TsvParser.ParsedLine parsed, <a href="../../../../../org/apache/hadoop/hbase/client/Put.html">Put</a> put,
+<a class="jxr_linenumber" name="209" href="#209">209</a> <strong class="jxr_keyword">int</strong> i) <strong class="jxr_keyword">throws</strong> BadTsvLineException, IOException {
+<a class="jxr_linenumber" name="210" href="#210">210</a> <a href="../../../../../org/apache/hadoop/hbase/Cell.html">Cell</a> cell = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="211" href="#211">211</a> <strong class="jxr_keyword">if</strong> (hfileOutPath == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="212" href="#212">212</a> cell = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/KeyValue.html">KeyValue</a>(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),
+<a class="jxr_linenumber" name="213" href="#213">213</a> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,
+<a class="jxr_linenumber" name="214" href="#214">214</a> parser.getQualifier(i).length, ts, KeyValue.Type.Put, lineBytes,
+<a class="jxr_linenumber" name="215" href="#215">215</a> parsed.getColumnOffset(i), parsed.getColumnLength(i));
+<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">if</strong> (cellVisibilityExpr != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_comment">// We won't be validating the expression here. The Visibility CP will do</em>
+<a class="jxr_linenumber" name="218" href="#218">218</a> <em class="jxr_comment">// the validation</em>
+<a class="jxr_linenumber" name="219" href="#219">219</a> put.setCellVisibility(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/security/visibility/CellVisibility.html">CellVisibility</a>(cellVisibilityExpr));
+<a class="jxr_linenumber" name="220" href="#220">220</a> }
+<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">if</strong> (ttl > 0) {
+<a class="jxr_linenumber" name="222" href="#222">222</a> put.setTTL(ttl);
+<a class="jxr_linenumber" name="223" href="#223">223</a> }
+<a class="jxr_linenumber" name="224" href="#224">224</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_comment">// Creating the KV which needs to be directly written to HFiles. Using the Facade</em>
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment">// KVCreator for creation of kvs.</em>
+<a class="jxr_linenumber" name="227" href="#227">227</a> cell = <strong class="jxr_keyword">this</strong>.kvCreator.create(lineBytes, parsed.getRowKeyOffset(), parsed.getRowKeyLength(),
+<a class="jxr_linenumber" name="228" href="#228">228</a> parser.getFamily(i), 0, parser.getFamily(i).length, parser.getQualifier(i), 0,
+<a class="jxr_linenumber" name="229" href="#229">229</a> parser.getQualifier(i).length, ts, lineBytes, parsed.getColumnOffset(i),
+<a class="jxr_linenumber" name="230" href="#230">230</a> parsed.getColumnLength(i), tags);
+<a class="jxr_linenumber" name="231" href="#231">231</a> }
+<a class="jxr_linenumber" name="232" href="#232">232</a> put.add(cell);
+<a class="jxr_linenumber" name="233" href="#233">233</a> }
+<a class="jxr_linenumber" name="234" href="#234">234</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
index b8902cd..18135b4 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
@@ -24,8 +24,8 @@
<a class="jxr_linenumber" name="14" href="#14">14</a> signature = <span class="jxr_string">"E1689F04F06BAD5E628913C375AEB2C0"</span>,
<a class="jxr_linenumber" name="15" href="#15">15</a> optionalArguments = {
<a class="jxr_linenumber" name="16" href="#16">16</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"taskMonitor"</span>, type = <span class="jxr_string">"TaskMonitor"</span>),
-<a class="jxr_linenumber" name="17" href="#17">17</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="18" href="#18">18</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>)})
+<a class="jxr_linenumber" name="17" href="#17">17</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="18" href="#18">18</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>)})
<a class="jxr_linenumber" name="19" href="#19">19</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>
<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
<a class="jxr_linenumber" name="21" href="#21">21</a> {
@@ -72,40 +72,40 @@
<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">return</strong> m_taskMonitor__IsNotDefault;
<a class="jxr_linenumber" name="63" href="#63">63</a> }
<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_taskMonitor__IsNotDefault;
-<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
<a class="jxr_linenumber" name="67" href="#67">67</a> {
-<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="69" href="#69">69</a> m_filter = filter;
-<a class="jxr_linenumber" name="70" href="#70">70</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="69" href="#69">69</a> m_format = format;
+<a class="jxr_linenumber" name="70" href="#70">70</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="71" href="#71">71</a> }
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">public</strong> String getFormat()
<a class="jxr_linenumber" name="73" href="#73">73</a> {
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">return</strong> m_format;
<a class="jxr_linenumber" name="75" href="#75">75</a> }
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
<a class="jxr_linenumber" name="78" href="#78">78</a> {
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
<a class="jxr_linenumber" name="80" href="#80">80</a> }
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
<a class="jxr_linenumber" name="84" href="#84">84</a> {
-<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a> m_format = format;
-<a class="jxr_linenumber" name="87" href="#87">87</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="86" href="#86">86</a> m_filter = filter;
+<a class="jxr_linenumber" name="87" href="#87">87</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="88" href="#88">88</a> }
-<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">public</strong> String getFilter()
<a class="jxr_linenumber" name="90" href="#90">90</a> {
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">return</strong> m_filter;
<a class="jxr_linenumber" name="92" href="#92">92</a> }
-<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
<a class="jxr_linenumber" name="95" href="#95">95</a> {
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="97" href="#97">97</a> }
-<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="99" href="#99">99</a> }
<a class="jxr_linenumber" name="100" href="#100">100</a> @Override
<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -124,17 +124,17 @@
<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="115" href="#115">115</a> }
<a class="jxr_linenumber" name="116" href="#116">116</a>
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFormat(String p_format)
<a class="jxr_linenumber" name="119" href="#119">119</a> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="120" href="#120">120</a> (getImplData()).setFormat(p_format);
<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="122" href="#122">122</a> }
<a class="jxr_linenumber" name="123" href="#123">123</a>
-<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFilter(String p_filter)
<a class="jxr_linenumber" name="126" href="#126">126</a> {
-<a class="jxr_linenumber" name="127" href="#127">127</a> (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="127" href="#127">127</a> (getImplData()).setFilter(p_filter);
<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="129" href="#129">129</a> }
<a class="jxr_linenumber" name="130" href="#130">130</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
index 63a0449..ef44148 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
@@ -26,21 +26,21 @@
<a class="jxr_linenumber" name="16" href="#16">16</a>
<a class="jxr_linenumber" name="17" href="#17">17</a> {
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
-<a class="jxr_linenumber" name="19" href="#19">19</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="19" href="#19">19</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData p_implData)
<a class="jxr_linenumber" name="22" href="#22">22</a> {
<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">if</strong>(! p_implData.getTaskMonitor__IsNotDefault())
<a class="jxr_linenumber" name="24" href="#24">24</a> {
<a class="jxr_linenumber" name="25" href="#25">25</a> p_implData.setTaskMonitor(TaskMonitor.get());
<a class="jxr_linenumber" name="26" href="#26">26</a> }
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
<a class="jxr_linenumber" name="28" href="#28">28</a> {
-<a class="jxr_linenumber" name="29" href="#29">29</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="29" href="#29">29</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
<a class="jxr_linenumber" name="30" href="#30">30</a> }
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
<a class="jxr_linenumber" name="32" href="#32">32</a> {
-<a class="jxr_linenumber" name="33" href="#33">33</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="33" href="#33">33</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
<a class="jxr_linenumber" name="34" href="#34">34</a> }
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">return</strong> p_implData;
<a class="jxr_linenumber" name="36" href="#36">36</a> }
@@ -48,8 +48,8 @@
<a class="jxr_linenumber" name="38" href="#38">38</a> {
<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
<a class="jxr_linenumber" name="40" href="#40">40</a> taskMonitor = p_implData.getTaskMonitor();
-<a class="jxr_linenumber" name="41" href="#41">41</a> filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="42" href="#42">42</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="41" href="#41">41</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="42" href="#42">42</a> filter = p_implData.getFilter();
<a class="jxr_linenumber" name="43" href="#43">43</a> }
<a class="jxr_linenumber" name="44" href="#44">44</a>
<a class="jxr_linenumber" name="45" href="#45">45</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
[03/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9bc06f81/xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html b/xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
index f9f6e8a..2420caf 100644
--- a/xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
+++ b/xref/org/apache/hadoop/hbase/mapreduce/ImportTsv.html
@@ -101,704 +101,706 @@
<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_comment">// If true, bad lines are logged to stderr. Default: false.</em>
<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String LOG_BAD_LINES_CONF_KEY = <span class="jxr_string">"importtsv.log.bad.lines"</span>;
<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String SKIP_LINES_CONF_KEY = <span class="jxr_string">"importtsv.skip.bad.lines"</span>;
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String COLUMNS_CONF_KEY = <span class="jxr_string">"importtsv.columns"</span>;
-<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String SEPARATOR_CONF_KEY = <span class="jxr_string">"importtsv.separator"</span>;
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String ATTRIBUTE_SEPERATOR_CONF_KEY = <span class="jxr_string">"attributes.seperator"</span>;
-<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_comment">//This config is used to propagate credentials from parent MR jobs which launch</em>
-<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_comment">//ImportTSV jobs. SEE IntegrationTestImportTsv.</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String CREDENTIALS_LOCATION = <span class="jxr_string">"credentials_location"</span>;
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String DEFAULT_SEPARATOR = <span class="jxr_string">"\t"</span>;
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String DEFAULT_ATTRIBUTES_SEPERATOR = <span class="jxr_string">"=>"</span>;
-<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR = <span class="jxr_string">","</span>;
-<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> Class DEFAULT_MAPPER = TsvImporterMapper.<strong class="jxr_keyword">class</strong>;
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String CREATE_TABLE_CONF_KEY = <span class="jxr_string">"create.table"</span>;
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> String NO_STRICT_COL_FAMILY = <span class="jxr_string">"no.strict"</span>;
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment"> * If table didn't exist and was created in dry-run mode, this flag is</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment"> * flipped to delete it when MR ends.</em>
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> DRY_RUN_TABLE_CREATED;
-<a class="jxr_linenumber" name="111" href="#111">111</a>
-<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">TsvParser</a> {
-<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_javadoccomment"> * Column families and qualifiers mapped to the TSV columns</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="116" href="#116">116</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[][] families;
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[][] qualifiers;
-<a class="jxr_linenumber" name="118" href="#118">118</a>
-<a class="jxr_linenumber" name="119" href="#119">119</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte separatorByte;
-<a class="jxr_linenumber" name="120" href="#120">120</a>
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> rowKeyColumnIndex;
-<a class="jxr_linenumber" name="122" href="#122">122</a>
-<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> maxColumnCount;
-<a class="jxr_linenumber" name="124" href="#124">124</a>
-<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment">// Default value must be negative</em>
-<a class="jxr_linenumber" name="126" href="#126">126</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> DEFAULT_TIMESTAMP_COLUMN_INDEX = -1;
-<a class="jxr_linenumber" name="127" href="#127">127</a>
-<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> timestampKeyColumnIndex = DEFAULT_TIMESTAMP_COLUMN_INDEX;
-<a class="jxr_linenumber" name="129" href="#129">129</a>
-<a class="jxr_linenumber" name="130" href="#130">130</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ROWKEY_COLUMN_SPEC = <span class="jxr_string">"HBASE_ROW_KEY"</span>;
-<a class="jxr_linenumber" name="131" href="#131">131</a>
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TIMESTAMPKEY_COLUMN_SPEC = <span class="jxr_string">"HBASE_TS_KEY"</span>;
-<a class="jxr_linenumber" name="133" href="#133">133</a>
-<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String ATTRIBUTES_COLUMN_SPEC = <span class="jxr_string">"HBASE_ATTRIBUTES_KEY"</span>;
-<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CELL_VISIBILITY_COLUMN_SPEC = <span class="jxr_string">"HBASE_CELL_VISIBILITY"</span>;
-<a class="jxr_linenumber" name="137" href="#137">137</a>
-<a class="jxr_linenumber" name="138" href="#138">138</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CELL_TTL_COLUMN_SPEC = <span class="jxr_string">"HBASE_CELL_TTL"</span>;
-<a class="jxr_linenumber" name="139" href="#139">139</a>
-<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> attrKeyColumnIndex = DEFAULT_ATTRIBUTES_COLUMN_INDEX;
-<a class="jxr_linenumber" name="141" href="#141">141</a>
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> DEFAULT_ATTRIBUTES_COLUMN_INDEX = -1;
-<a class="jxr_linenumber" name="143" href="#143">143</a>
-<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> DEFAULT_CELL_VISIBILITY_COLUMN_INDEX = -1;
-<a class="jxr_linenumber" name="145" href="#145">145</a>
-<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> DEFAULT_CELL_TTL_COLUMN_INDEX = -1;
-<a class="jxr_linenumber" name="147" href="#147">147</a>
-<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> cellVisibilityColumnIndex = DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;
-<a class="jxr_linenumber" name="149" href="#149">149</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> cellTTLColumnIndex = DEFAULT_CELL_TTL_COLUMN_INDEX;
-<a class="jxr_linenumber" name="151" href="#151">151</a>
-<a class="jxr_linenumber" name="152" href="#152">152</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="153" href="#153">153</a> <em class="jxr_javadoccomment"> * @param columnsSpecification the list of columns to parser out, comma separated.</em>
-<a class="jxr_linenumber" name="154" href="#154">154</a> <em class="jxr_javadoccomment"> * The row key should be the special token TsvParser.ROWKEY_COLUMN_SPEC</em>
-<a class="jxr_linenumber" name="155" href="#155">155</a> <em class="jxr_javadoccomment"> * @param separatorStr</em>
-<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">TsvParser</a>(String columnsSpecification, String separatorStr) {
-<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_comment">// Configure separator</em>
-<a class="jxr_linenumber" name="159" href="#159">159</a> byte[] separator = Bytes.toBytes(separatorStr);
-<a class="jxr_linenumber" name="160" href="#160">160</a> Preconditions.checkArgument(separator.length == 1,
-<a class="jxr_linenumber" name="161" href="#161">161</a> <span class="jxr_string">"TsvParser only supports single-byte separators"</span>);
-<a class="jxr_linenumber" name="162" href="#162">162</a> separatorByte = separator[0];
-<a class="jxr_linenumber" name="163" href="#163">163</a>
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// Configure columns</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a> ArrayList<String> columnStrings = Lists.newArrayList(
-<a class="jxr_linenumber" name="166" href="#166">166</a> Splitter.on(',').trimResults().split(columnsSpecification));
-<a class="jxr_linenumber" name="167" href="#167">167</a>
-<a class="jxr_linenumber" name="168" href="#168">168</a> maxColumnCount = columnStrings.size();
-<a class="jxr_linenumber" name="169" href="#169">169</a> families = <strong class="jxr_keyword">new</strong> byte[maxColumnCount][];
-<a class="jxr_linenumber" name="170" href="#170">170</a> qualifiers = <strong class="jxr_keyword">new</strong> byte[maxColumnCount][];
-<a class="jxr_linenumber" name="171" href="#171">171</a>
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < columnStrings.size(); i++) {
-<a class="jxr_linenumber" name="173" href="#173">173</a> String str = columnStrings.get(i);
-<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">if</strong> (ROWKEY_COLUMN_SPEC.equals(str)) {
-<a class="jxr_linenumber" name="175" href="#175">175</a> rowKeyColumnIndex = i;
-<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="177" href="#177">177</a> }
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">if</strong> (TIMESTAMPKEY_COLUMN_SPEC.equals(str)) {
-<a class="jxr_linenumber" name="179" href="#179">179</a> timestampKeyColumnIndex = i;
-<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="181" href="#181">181</a> }
-<a class="jxr_linenumber" name="182" href="#182">182</a> <strong class="jxr_keyword">if</strong> (ATTRIBUTES_COLUMN_SPEC.equals(str)) {
-<a class="jxr_linenumber" name="183" href="#183">183</a> attrKeyColumnIndex = i;
-<a class="jxr_linenumber" name="184" href="#184">184</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="185" href="#185">185</a> }
-<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">if</strong> (CELL_VISIBILITY_COLUMN_SPEC.equals(str)) {
-<a class="jxr_linenumber" name="187" href="#187">187</a> cellVisibilityColumnIndex = i;
-<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="189" href="#189">189</a> }
-<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">if</strong> (CELL_TTL_COLUMN_SPEC.equals(str)) {
-<a class="jxr_linenumber" name="191" href="#191">191</a> cellTTLColumnIndex = i;
-<a class="jxr_linenumber" name="192" href="#192">192</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="193" href="#193">193</a> }
-<a class="jxr_linenumber" name="194" href="#194">194</a> String[] parts = str.split(<span class="jxr_string">":"</span>, 2);
-<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">if</strong> (parts.length == 1) {
-<a class="jxr_linenumber" name="196" href="#196">196</a> families[i] = str.getBytes();
-<a class="jxr_linenumber" name="197" href="#197">197</a> qualifiers[i] = HConstants.EMPTY_BYTE_ARRAY;
-<a class="jxr_linenumber" name="198" href="#198">198</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="199" href="#199">199</a> families[i] = parts[0].getBytes();
-<a class="jxr_linenumber" name="200" href="#200">200</a> qualifiers[i] = parts[1].getBytes();
-<a class="jxr_linenumber" name="201" href="#201">201</a> }
-<a class="jxr_linenumber" name="202" href="#202">202</a> }
-<a class="jxr_linenumber" name="203" href="#203">203</a> }
-<a class="jxr_linenumber" name="204" href="#204">204</a>
-<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasTimestamp() {
-<a class="jxr_linenumber" name="206" href="#206">206</a> <strong class="jxr_keyword">return</strong> timestampKeyColumnIndex != DEFAULT_TIMESTAMP_COLUMN_INDEX;
-<a class="jxr_linenumber" name="207" href="#207">207</a> }
-<a class="jxr_linenumber" name="208" href="#208">208</a>
-<a class="jxr_linenumber" name="209" href="#209">209</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getTimestampKeyColumnIndex() {
-<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">return</strong> timestampKeyColumnIndex;
-<a class="jxr_linenumber" name="211" href="#211">211</a> }
-<a class="jxr_linenumber" name="212" href="#212">212</a>
-<a class="jxr_linenumber" name="213" href="#213">213</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasAttributes() {
-<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">return</strong> attrKeyColumnIndex != DEFAULT_ATTRIBUTES_COLUMN_INDEX;
-<a class="jxr_linenumber" name="215" href="#215">215</a> }
-<a class="jxr_linenumber" name="216" href="#216">216</a>
-<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasCellVisibility() {
-<a class="jxr_linenumber" name="218" href="#218">218</a> <strong class="jxr_keyword">return</strong> cellVisibilityColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;
-<a class="jxr_linenumber" name="219" href="#219">219</a> }
-<a class="jxr_linenumber" name="220" href="#220">220</a>
-<a class="jxr_linenumber" name="221" href="#221">221</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasCellTTL() {
-<a class="jxr_linenumber" name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> cellTTLColumnIndex != DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;
-<a class="jxr_linenumber" name="223" href="#223">223</a> }
-<a class="jxr_linenumber" name="224" href="#224">224</a>
-<a class="jxr_linenumber" name="225" href="#225">225</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getAttributesKeyColumnIndex() {
-<a class="jxr_linenumber" name="226" href="#226">226</a> <strong class="jxr_keyword">return</strong> attrKeyColumnIndex;
-<a class="jxr_linenumber" name="227" href="#227">227</a> }
-<a class="jxr_linenumber" name="228" href="#228">228</a>
-<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCellVisibilityColumnIndex() {
-<a class="jxr_linenumber" name="230" href="#230">230</a> <strong class="jxr_keyword">return</strong> cellVisibilityColumnIndex;
-<a class="jxr_linenumber" name="231" href="#231">231</a> }
-<a class="jxr_linenumber" name="232" href="#232">232</a>
-<a class="jxr_linenumber" name="233" href="#233">233</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCellTTLColumnIndex() {
-<a class="jxr_linenumber" name="234" href="#234">234</a> <strong class="jxr_keyword">return</strong> cellTTLColumnIndex;
-<a class="jxr_linenumber" name="235" href="#235">235</a> }
-<a class="jxr_linenumber" name="236" href="#236">236</a>
-<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getRowKeyColumnIndex() {
-<a class="jxr_linenumber" name="238" href="#238">238</a> <strong class="jxr_keyword">return</strong> rowKeyColumnIndex;
-<a class="jxr_linenumber" name="239" href="#239">239</a> }
-<a class="jxr_linenumber" name="240" href="#240">240</a>
-<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">public</strong> byte[] getFamily(<strong class="jxr_keyword">int</strong> idx) {
-<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">return</strong> families[idx];
-<a class="jxr_linenumber" name="243" href="#243">243</a> }
-<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">public</strong> byte[] getQualifier(<strong class="jxr_keyword">int</strong> idx) {
-<a class="jxr_linenumber" name="245" href="#245">245</a> <strong class="jxr_keyword">return</strong> qualifiers[idx];
-<a class="jxr_linenumber" name="246" href="#246">246</a> }
-<a class="jxr_linenumber" name="247" href="#247">247</a>
-<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">ParsedLine</a> parse(byte[] lineBytes, <strong class="jxr_keyword">int</strong> length)
-<a class="jxr_linenumber" name="249" href="#249">249</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a> {
-<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment">// Enumerate separator offsets</em>
-<a class="jxr_linenumber" name="251" href="#251">251</a> ArrayList<Integer> tabOffsets = <strong class="jxr_keyword">new</strong> ArrayList<Integer>(maxColumnCount);
-<a class="jxr_linenumber" name="252" href="#252">252</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < length; i++) {
-<a class="jxr_linenumber" name="253" href="#253">253</a> <strong class="jxr_keyword">if</strong> (lineBytes[i] == separatorByte) {
-<a class="jxr_linenumber" name="254" href="#254">254</a> tabOffsets.add(i);
-<a class="jxr_linenumber" name="255" href="#255">255</a> }
-<a class="jxr_linenumber" name="256" href="#256">256</a> }
-<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">if</strong> (tabOffsets.isEmpty()) {
-<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"No delimiter"</span>);
-<a class="jxr_linenumber" name="259" href="#259">259</a> }
-<a class="jxr_linenumber" name="260" href="#260">260</a>
-<a class="jxr_linenumber" name="261" href="#261">261</a> tabOffsets.add(length);
-<a class="jxr_linenumber" name="262" href="#262">262</a>
-<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">if</strong> (tabOffsets.size() > maxColumnCount) {
-<a class="jxr_linenumber" name="264" href="#264">264</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"Excessive columns"</span>);
-<a class="jxr_linenumber" name="265" href="#265">265</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (tabOffsets.size() <= getRowKeyColumnIndex()) {
-<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"No row key"</span>);
-<a class="jxr_linenumber" name="267" href="#267">267</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (hasTimestamp()
-<a class="jxr_linenumber" name="268" href="#268">268</a> && tabOffsets.size() <= getTimestampKeyColumnIndex()) {
-<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"No timestamp"</span>);
-<a class="jxr_linenumber" name="270" href="#270">270</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (hasAttributes() && tabOffsets.size() <= getAttributesKeyColumnIndex()) {
-<a class="jxr_linenumber" name="271" href="#271">271</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"No attributes specified"</span>);
-<a class="jxr_linenumber" name="272" href="#272">272</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (hasCellVisibility() && tabOffsets.size() <= getCellVisibilityColumnIndex()) {
-<a class="jxr_linenumber" name="273" href="#273">273</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"No cell visibility specified"</span>);
-<a class="jxr_linenumber" name="274" href="#274">274</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (hasCellTTL() && tabOffsets.size() <= getCellTTLColumnIndex()) {
-<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"No cell TTL specified"</span>);
-<a class="jxr_linenumber" name="276" href="#276">276</a> }
-<a class="jxr_linenumber" name="277" href="#277">277</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">ParsedLine</a>(tabOffsets, lineBytes);
-<a class="jxr_linenumber" name="278" href="#278">278</a> }
-<a class="jxr_linenumber" name="279" href="#279">279</a>
-<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">ParsedLine</a> {
-<a class="jxr_linenumber" name="281" href="#281">281</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> ArrayList<Integer> tabOffsets;
-<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">private</strong> byte[] lineBytes;
-<a class="jxr_linenumber" name="283" href="#283">283</a>
-<a class="jxr_linenumber" name="284" href="#284">284</a> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">ParsedLine</a>(ArrayList<Integer> tabOffsets, byte[] lineBytes) {
-<a class="jxr_linenumber" name="285" href="#285">285</a> <strong class="jxr_keyword">this</strong>.tabOffsets = tabOffsets;
-<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">this</strong>.lineBytes = lineBytes;
-<a class="jxr_linenumber" name="287" href="#287">287</a> }
-<a class="jxr_linenumber" name="288" href="#288">288</a>
-<a class="jxr_linenumber" name="289" href="#289">289</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getRowKeyOffset() {
-<a class="jxr_linenumber" name="290" href="#290">290</a> <strong class="jxr_keyword">return</strong> getColumnOffset(rowKeyColumnIndex);
-<a class="jxr_linenumber" name="291" href="#291">291</a> }
-<a class="jxr_linenumber" name="292" href="#292">292</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getRowKeyLength() {
-<a class="jxr_linenumber" name="293" href="#293">293</a> <strong class="jxr_keyword">return</strong> getColumnLength(rowKeyColumnIndex);
-<a class="jxr_linenumber" name="294" href="#294">294</a> }
-<a class="jxr_linenumber" name="295" href="#295">295</a>
-<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getTimestamp(<strong class="jxr_keyword">long</strong> ts) <strong class="jxr_keyword">throws</strong> BadTsvLineException {
-<a class="jxr_linenumber" name="297" href="#297">297</a> <em class="jxr_comment">// Return ts if HBASE_TS_KEY is not configured in column spec</em>
-<a class="jxr_linenumber" name="298" href="#298">298</a> <strong class="jxr_keyword">if</strong> (!hasTimestamp()) {
-<a class="jxr_linenumber" name="299" href="#299">299</a> <strong class="jxr_keyword">return</strong> ts;
-<a class="jxr_linenumber" name="300" href="#300">300</a> }
-<a class="jxr_linenumber" name="301" href="#301">301</a>
-<a class="jxr_linenumber" name="302" href="#302">302</a> String timeStampStr = Bytes.toString(lineBytes,
-<a class="jxr_linenumber" name="303" href="#303">303</a> getColumnOffset(timestampKeyColumnIndex),
-<a class="jxr_linenumber" name="304" href="#304">304</a> getColumnLength(timestampKeyColumnIndex));
-<a class="jxr_linenumber" name="305" href="#305">305</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="306" href="#306">306</a> <strong class="jxr_keyword">return</strong> Long.parseLong(timeStampStr);
-<a class="jxr_linenumber" name="307" href="#307">307</a> } <strong class="jxr_keyword">catch</strong> (NumberFormatException nfe) {
-<a class="jxr_linenumber" name="308" href="#308">308</a> <em class="jxr_comment">// treat this record as bad record</em>
-<a class="jxr_linenumber" name="309" href="#309">309</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"Invalid timestamp "</span> + timeStampStr);
-<a class="jxr_linenumber" name="310" href="#310">310</a> }
-<a class="jxr_linenumber" name="311" href="#311">311</a> }
-<a class="jxr_linenumber" name="312" href="#312">312</a>
-<a class="jxr_linenumber" name="313" href="#313">313</a> <strong class="jxr_keyword">private</strong> String getAttributes() {
-<a class="jxr_linenumber" name="314" href="#314">314</a> <strong class="jxr_keyword">if</strong> (!hasAttributes()) {
-<a class="jxr_linenumber" name="315" href="#315">315</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="316" href="#316">316</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="317" href="#317">317</a> <strong class="jxr_keyword">return</strong> Bytes.toString(lineBytes, getColumnOffset(attrKeyColumnIndex),
-<a class="jxr_linenumber" name="318" href="#318">318</a> getColumnLength(attrKeyColumnIndex));
-<a class="jxr_linenumber" name="319" href="#319">319</a> }
-<a class="jxr_linenumber" name="320" href="#320">320</a> }
-<a class="jxr_linenumber" name="321" href="#321">321</a>
-<a class="jxr_linenumber" name="322" href="#322">322</a> <strong class="jxr_keyword">public</strong> String[] getIndividualAttributes() {
-<a class="jxr_linenumber" name="323" href="#323">323</a> String attributes = getAttributes();
-<a class="jxr_linenumber" name="324" href="#324">324</a> <strong class="jxr_keyword">if</strong> (attributes != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="325" href="#325">325</a> <strong class="jxr_keyword">return</strong> attributes.split(DEFAULT_MULTIPLE_ATTRIBUTES_SEPERATOR);
-<a class="jxr_linenumber" name="326" href="#326">326</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="327" href="#327">327</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="328" href="#328">328</a> }
-<a class="jxr_linenumber" name="329" href="#329">329</a> }
-<a class="jxr_linenumber" name="330" href="#330">330</a>
-<a class="jxr_linenumber" name="331" href="#331">331</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getAttributeKeyOffset() {
-<a class="jxr_linenumber" name="332" href="#332">332</a> <strong class="jxr_keyword">if</strong> (hasAttributes()) {
-<a class="jxr_linenumber" name="333" href="#333">333</a> <strong class="jxr_keyword">return</strong> getColumnOffset(attrKeyColumnIndex);
-<a class="jxr_linenumber" name="334" href="#334">334</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="335" href="#335">335</a> <strong class="jxr_keyword">return</strong> DEFAULT_ATTRIBUTES_COLUMN_INDEX;
-<a class="jxr_linenumber" name="336" href="#336">336</a> }
-<a class="jxr_linenumber" name="337" href="#337">337</a> }
-<a class="jxr_linenumber" name="338" href="#338">338</a>
-<a class="jxr_linenumber" name="339" href="#339">339</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getAttributeKeyLength() {
-<a class="jxr_linenumber" name="340" href="#340">340</a> <strong class="jxr_keyword">if</strong> (hasAttributes()) {
-<a class="jxr_linenumber" name="341" href="#341">341</a> <strong class="jxr_keyword">return</strong> getColumnLength(attrKeyColumnIndex);
-<a class="jxr_linenumber" name="342" href="#342">342</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="343" href="#343">343</a> <strong class="jxr_keyword">return</strong> DEFAULT_ATTRIBUTES_COLUMN_INDEX;
-<a class="jxr_linenumber" name="344" href="#344">344</a> }
-<a class="jxr_linenumber" name="345" href="#345">345</a> }
-<a class="jxr_linenumber" name="346" href="#346">346</a>
-<a class="jxr_linenumber" name="347" href="#347">347</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCellVisibilityColumnOffset() {
-<a class="jxr_linenumber" name="348" href="#348">348</a> <strong class="jxr_keyword">if</strong> (hasCellVisibility()) {
-<a class="jxr_linenumber" name="349" href="#349">349</a> <strong class="jxr_keyword">return</strong> getColumnOffset(cellVisibilityColumnIndex);
-<a class="jxr_linenumber" name="350" href="#350">350</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="351" href="#351">351</a> <strong class="jxr_keyword">return</strong> DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;
-<a class="jxr_linenumber" name="352" href="#352">352</a> }
-<a class="jxr_linenumber" name="353" href="#353">353</a> }
-<a class="jxr_linenumber" name="354" href="#354">354</a>
-<a class="jxr_linenumber" name="355" href="#355">355</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCellVisibilityColumnLength() {
-<a class="jxr_linenumber" name="356" href="#356">356</a> <strong class="jxr_keyword">if</strong> (hasCellVisibility()) {
-<a class="jxr_linenumber" name="357" href="#357">357</a> <strong class="jxr_keyword">return</strong> getColumnLength(cellVisibilityColumnIndex);
-<a class="jxr_linenumber" name="358" href="#358">358</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="359" href="#359">359</a> <strong class="jxr_keyword">return</strong> DEFAULT_CELL_VISIBILITY_COLUMN_INDEX;
-<a class="jxr_linenumber" name="360" href="#360">360</a> }
-<a class="jxr_linenumber" name="361" href="#361">361</a> }
-<a class="jxr_linenumber" name="362" href="#362">362</a>
-<a class="jxr_linenumber" name="363" href="#363">363</a> <strong class="jxr_keyword">public</strong> String getCellVisibility() {
-<a class="jxr_linenumber" name="364" href="#364">364</a> <strong class="jxr_keyword">if</strong> (!hasCellVisibility()) {
-<a class="jxr_linenumber" name="365" href="#365">365</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="366" href="#366">366</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="367" href="#367">367</a> <strong class="jxr_keyword">return</strong> Bytes.toString(lineBytes, getColumnOffset(cellVisibilityColumnIndex),
-<a class="jxr_linenumber" name="368" href="#368">368</a> getColumnLength(cellVisibilityColumnIndex));
-<a class="jxr_linenumber" name="369" href="#369">369</a> }
-<a class="jxr_linenumber" name="370" href="#370">370</a> }
-<a class="jxr_linenumber" name="371" href="#371">371</a>
-<a class="jxr_linenumber" name="372" href="#372">372</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCellTTLColumnOffset() {
-<a class="jxr_linenumber" name="373" href="#373">373</a> <strong class="jxr_keyword">if</strong> (hasCellTTL()) {
-<a class="jxr_linenumber" name="374" href="#374">374</a> <strong class="jxr_keyword">return</strong> getColumnOffset(cellTTLColumnIndex);
-<a class="jxr_linenumber" name="375" href="#375">375</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="376" href="#376">376</a> <strong class="jxr_keyword">return</strong> DEFAULT_CELL_TTL_COLUMN_INDEX;
-<a class="jxr_linenumber" name="377" href="#377">377</a> }
-<a class="jxr_linenumber" name="378" href="#378">378</a> }
-<a class="jxr_linenumber" name="379" href="#379">379</a>
-<a class="jxr_linenumber" name="380" href="#380">380</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getCellTTLColumnLength() {
-<a class="jxr_linenumber" name="381" href="#381">381</a> <strong class="jxr_keyword">if</strong> (hasCellTTL()) {
-<a class="jxr_linenumber" name="382" href="#382">382</a> <strong class="jxr_keyword">return</strong> getColumnLength(cellTTLColumnIndex);
-<a class="jxr_linenumber" name="383" href="#383">383</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="384" href="#384">384</a> <strong class="jxr_keyword">return</strong> DEFAULT_CELL_TTL_COLUMN_INDEX;
-<a class="jxr_linenumber" name="385" href="#385">385</a> }
-<a class="jxr_linenumber" name="386" href="#386">386</a> }
-<a class="jxr_linenumber" name="387" href="#387">387</a>
-<a class="jxr_linenumber" name="388" href="#388">388</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">long</strong> getCellTTL() {
-<a class="jxr_linenumber" name="389" href="#389">389</a> <strong class="jxr_keyword">if</strong> (!hasCellTTL()) {
-<a class="jxr_linenumber" name="390" href="#390">390</a> <strong class="jxr_keyword">return</strong> 0;
-<a class="jxr_linenumber" name="391" href="#391">391</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="392" href="#392">392</a> <strong class="jxr_keyword">return</strong> Bytes.toLong(lineBytes, getColumnOffset(cellTTLColumnIndex),
-<a class="jxr_linenumber" name="393" href="#393">393</a> getColumnLength(cellTTLColumnIndex));
-<a class="jxr_linenumber" name="394" href="#394">394</a> }
-<a class="jxr_linenumber" name="395" href="#395">395</a> }
-<a class="jxr_linenumber" name="396" href="#396">396</a>
-<a class="jxr_linenumber" name="397" href="#397">397</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getColumnOffset(<strong class="jxr_keyword">int</strong> idx) {
-<a class="jxr_linenumber" name="398" href="#398">398</a> <strong class="jxr_keyword">if</strong> (idx > 0)
-<a class="jxr_linenumber" name="399" href="#399">399</a> <strong class="jxr_keyword">return</strong> tabOffsets.get(idx - 1) + 1;
-<a class="jxr_linenumber" name="400" href="#400">400</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="401" href="#401">401</a> <strong class="jxr_keyword">return</strong> 0;
-<a class="jxr_linenumber" name="402" href="#402">402</a> }
-<a class="jxr_linenumber" name="403" href="#403">403</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getColumnLength(<strong class="jxr_keyword">int</strong> idx) {
-<a class="jxr_linenumber" name="404" href="#404">404</a> <strong class="jxr_keyword">return</strong> tabOffsets.get(idx) - getColumnOffset(idx);
-<a class="jxr_linenumber" name="405" href="#405">405</a> }
-<a class="jxr_linenumber" name="406" href="#406">406</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getColumnCount() {
-<a class="jxr_linenumber" name="407" href="#407">407</a> <strong class="jxr_keyword">return</strong> tabOffsets.size();
-<a class="jxr_linenumber" name="408" href="#408">408</a> }
-<a class="jxr_linenumber" name="409" href="#409">409</a> <strong class="jxr_keyword">public</strong> byte[] getLineBytes() {
-<a class="jxr_linenumber" name="410" href="#410">410</a> <strong class="jxr_keyword">return</strong> lineBytes;
-<a class="jxr_linenumber" name="411" href="#411">411</a> }
-<a class="jxr_linenumber" name="412" href="#412">412</a> }
-<a class="jxr_linenumber" name="413" href="#413">413</a>
-<a class="jxr_linenumber" name="414" href="#414">414</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a> <strong class="jxr_keyword">extends</strong> Exception {
-<a class="jxr_linenumber" name="415" href="#415">415</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(String err) {
-<a class="jxr_linenumber" name="416" href="#416">416</a> <strong class="jxr_keyword">super</strong>(err);
-<a class="jxr_linenumber" name="417" href="#417">417</a> }
-<a class="jxr_linenumber" name="418" href="#418">418</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> serialVersionUID = 1L;
-<a class="jxr_linenumber" name="419" href="#419">419</a> }
-<a class="jxr_linenumber" name="420" href="#420">420</a>
-<a class="jxr_linenumber" name="421" href="#421">421</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="422" href="#422">422</a> <em class="jxr_javadoccomment"> * Return starting position and length of row key from the specified line bytes.</em>
-<a class="jxr_linenumber" name="423" href="#423">423</a> <em class="jxr_javadoccomment"> * @param lineBytes</em>
-<a class="jxr_linenumber" name="424" href="#424">424</a> <em class="jxr_javadoccomment"> * @param length</em>
-<a class="jxr_linenumber" name="425" href="#425">425</a> <em class="jxr_javadoccomment"> * @return Pair of row key offset and length.</em>
-<a class="jxr_linenumber" name="426" href="#426">426</a> <em class="jxr_javadoccomment"> * @throws BadTsvLineException</em>
-<a class="jxr_linenumber" name="427" href="#427">427</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="428" href="#428">428</a> <strong class="jxr_keyword">public</strong> Pair<Integer, Integer> parseRowKey(byte[] lineBytes, <strong class="jxr_keyword">int</strong> length)
-<a class="jxr_linenumber" name="429" href="#429">429</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a> {
-<a class="jxr_linenumber" name="430" href="#430">430</a> <strong class="jxr_keyword">int</strong> rkColumnIndex = 0;
-<a class="jxr_linenumber" name="431" href="#431">431</a> <strong class="jxr_keyword">int</strong> startPos = 0, endPos = 0;
-<a class="jxr_linenumber" name="432" href="#432">432</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i <= length; i++) {
-<a class="jxr_linenumber" name="433" href="#433">433</a> <strong class="jxr_keyword">if</strong> (i == length || lineBytes[i] == separatorByte) {
-<a class="jxr_linenumber" name="434" href="#434">434</a> endPos = i - 1;
-<a class="jxr_linenumber" name="435" href="#435">435</a> <strong class="jxr_keyword">if</strong> (rkColumnIndex++ == getRowKeyColumnIndex()) {
-<a class="jxr_linenumber" name="436" href="#436">436</a> <strong class="jxr_keyword">if</strong> ((endPos + 1) == startPos) {
-<a class="jxr_linenumber" name="437" href="#437">437</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(<span class="jxr_string">"Empty value for ROW KEY."</span>);
-<a class="jxr_linenumber" name="438" href="#438">438</a> }
-<a class="jxr_linenumber" name="439" href="#439">439</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="440" href="#440">440</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="441" href="#441">441</a> startPos = endPos + 2;
-<a class="jxr_linenumber" name="442" href="#442">442</a> }
-<a class="jxr_linenumber" name="443" href="#443">443</a> }
-<a class="jxr_linenumber" name="444" href="#444">444</a> <strong class="jxr_keyword">if</strong> (i == length) {
-<a class="jxr_linenumber" name="445" href="#445">445</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">BadTsvLineException</a>(
-<a class="jxr_linenumber" name="446" href="#446">446</a> <span class="jxr_string">"Row key does not exist as number of columns in the line"</span>
-<a class="jxr_linenumber" name="447" href="#447">447</a> + <span class="jxr_string">" are less than row key position."</span>);
-<a class="jxr_linenumber" name="448" href="#448">448</a> }
-<a class="jxr_linenumber" name="449" href="#449">449</a> }
-<a class="jxr_linenumber" name="450" href="#450">450</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Pair<Integer, Integer>(startPos, endPos - startPos + 1);
-<a class="jxr_linenumber" name="451" href="#451">451</a> }
-<a class="jxr_linenumber" name="452" href="#452">452</a> }
-<a class="jxr_linenumber" name="453" href="#453">453</a>
-<a class="jxr_linenumber" name="454" href="#454">454</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="455" href="#455">455</a> <em class="jxr_javadoccomment"> * Sets up the actual job.</em>
-<a class="jxr_linenumber" name="456" href="#456">456</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="457" href="#457">457</a> <em class="jxr_javadoccomment"> * @param conf The current configuration.</em>
-<a class="jxr_linenumber" name="458" href="#458">458</a> <em class="jxr_javadoccomment"> * @param args The command line parameters.</em>
-<a class="jxr_linenumber" name="459" href="#459">459</a> <em class="jxr_javadoccomment"> * @return The newly created job.</em>
-<a class="jxr_linenumber" name="460" href="#460">460</a> <em class="jxr_javadoccomment"> * @throws IOException When setting up the job fails.</em>
-<a class="jxr_linenumber" name="461" href="#461">461</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="462" href="#462">462</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> Job createSubmittableJob(Configuration conf, String[] args)
-<a class="jxr_linenumber" name="463" href="#463">463</a> <strong class="jxr_keyword">throws</strong> IOException, ClassNotFoundException {
-<a class="jxr_linenumber" name="464" href="#464">464</a> Job job = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="465" href="#465">465</a> <strong class="jxr_keyword">boolean</strong> isDryRun = conf.getBoolean(DRY_RUN_CONF_KEY, false);
-<a class="jxr_linenumber" name="466" href="#466">466</a> <strong class="jxr_keyword">try</strong> (Connection connection = ConnectionFactory.createConnection(conf)) {
-<a class="jxr_linenumber" name="467" href="#467">467</a> <strong class="jxr_keyword">try</strong> (Admin admin = connection.getAdmin()) {
-<a class="jxr_linenumber" name="468" href="#468">468</a> <em class="jxr_comment">// Support non-XML supported characters</em>
-<a class="jxr_linenumber" name="469" href="#469">469</a> <em class="jxr_comment">// by re-encoding the passed separator as a Base64 string.</em>
-<a class="jxr_linenumber" name="470" href="#470">470</a> String actualSeparator = conf.get(SEPARATOR_CONF_KEY);
-<a class="jxr_linenumber" name="471" href="#471">471</a> <strong class="jxr_keyword">if</strong> (actualSeparator != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="472" href="#472">472</a> conf.set(SEPARATOR_CONF_KEY,
-<a class="jxr_linenumber" name="473" href="#473">473</a> Base64.encodeBytes(actualSeparator.getBytes()));
-<a class="jxr_linenumber" name="474" href="#474">474</a> }
-<a class="jxr_linenumber" name="475" href="#475">475</a>
-<a class="jxr_linenumber" name="476" href="#476">476</a> <em class="jxr_comment">// See if a non-default Mapper was set</em>
-<a class="jxr_linenumber" name="477" href="#477">477</a> String mapperClassName = conf.get(MAPPER_CONF_KEY);
-<a class="jxr_linenumber" name="478" href="#478">478</a> Class mapperClass = mapperClassName != <strong class="jxr_keyword">null</strong>? Class.forName(mapperClassName): DEFAULT_MAPPER;
-<a class="jxr_linenumber" name="479" href="#479">479</a>
-<a class="jxr_linenumber" name="480" href="#480">480</a> <a href="../../../../../org/apache/hadoop/hbase/TableName.html">TableName</a> tableName = TableName.valueOf(args[0]);
-<a class="jxr_linenumber" name="481" href="#481">481</a> Path inputDir = <strong class="jxr_keyword">new</strong> Path(args[1]);
-<a class="jxr_linenumber" name="482" href="#482">482</a> String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + <span class="jxr_string">"_"</span> + tableName.getNameAsString());
-<a class="jxr_linenumber" name="483" href="#483">483</a> job = Job.getInstance(conf, jobName);
-<a class="jxr_linenumber" name="484" href="#484">484</a> job.setJarByClass(mapperClass);
-<a class="jxr_linenumber" name="485" href="#485">485</a> FileInputFormat.setInputPaths(job, inputDir);
-<a class="jxr_linenumber" name="486" href="#486">486</a> job.setInputFormatClass(TextInputFormat.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="487" href="#487">487</a> job.setMapperClass(mapperClass);
-<a class="jxr_linenumber" name="488" href="#488">488</a> job.setMapOutputKeyClass(ImmutableBytesWritable.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="489" href="#489">489</a> String hfileOutPath = conf.get(BULK_OUTPUT_CONF_KEY);
-<a class="jxr_linenumber" name="490" href="#490">490</a> String[] columns = conf.getStrings(COLUMNS_CONF_KEY);
-<a class="jxr_linenumber" name="491" href="#491">491</a> <strong class="jxr_keyword">if</strong>(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) {
-<a class="jxr_linenumber" name="492" href="#492">492</a> String fileLoc = conf.get(CREDENTIALS_LOCATION);
-<a class="jxr_linenumber" name="493" href="#493">493</a> Credentials cred = Credentials.readTokenStorageFile(<strong class="jxr_keyword">new</strong> File(fileLoc), conf);
-<a class="jxr_linenumber" name="494" href="#494">494</a> job.getCredentials().addAll(cred);
-<a class="jxr_linenumber" name="495" href="#495">495</a> }
-<a class="jxr_linenumber" name="496" href="#496">496</a>
-<a class="jxr_linenumber" name="497" href="#497">497</a> <strong class="jxr_keyword">if</strong> (hfileOutPath != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="498" href="#498">498</a> <strong class="jxr_keyword">if</strong> (!admin.tableExists(tableName)) {
-<a class="jxr_linenumber" name="499" href="#499">499</a> LOG.warn(format(<span class="jxr_string">"Table '%s' does not exist."</span>, tableName));
-<a class="jxr_linenumber" name="500" href="#500">500</a> <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"yes"</span>.equalsIgnoreCase(conf.get(CREATE_TABLE_CONF_KEY, <span class="jxr_string">"yes"</span>))) {
-<a class="jxr_linenumber" name="501" href="#501">501</a> <em class="jxr_comment">// TODO: this is backwards. Instead of depending on the existence of a table,</em>
-<a class="jxr_linenumber" name="502" href="#502">502</a> <em class="jxr_comment">// create a sane splits file for HFileOutputFormat based on data sampling.</em>
-<a class="jxr_linenumber" name="503" href="#503">503</a> createTable(admin, tableName, columns);
-<a class="jxr_linenumber" name="504" href="#504">504</a> <strong class="jxr_keyword">if</strong> (isDryRun) {
-<a class="jxr_linenumber" name="505" href="#505">505</a> LOG.warn(<span class="jxr_string">"Dry run: Table will be deleted at end of dry run."</span>);
-<a class="jxr_linenumber" name="506" href="#506">506</a> <strong class="jxr_keyword">synchronized</strong> (ImportTsv.<strong class="jxr_keyword">class</strong>) {
-<a class="jxr_linenumber" name="507" href="#507">507</a> DRY_RUN_TABLE_CREATED = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="508" href="#508">508</a> }
-<a class="jxr_linenumber" name="509" href="#509">509</a> }
-<a class="jxr_linenumber" name="510" href="#510">510</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="511" href="#511">511</a> String errorMsg =
-<a class="jxr_linenumber" name="512" href="#512">512</a> format(<span class="jxr_string">"Table '%s' does not exist and '%s' is set to no."</span>, tableName,
-<a class="jxr_linenumber" name="513" href="#513">513</a> CREATE_TABLE_CONF_KEY);
-<a class="jxr_linenumber" name="514" href="#514">514</a> LOG.error(errorMsg);
-<a class="jxr_linenumber" name="515" href="#515">515</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html">TableNotFoundException</a>(errorMsg);
-<a class="jxr_linenumber" name="516" href="#516">516</a> }
-<a class="jxr_linenumber" name="517" href="#517">517</a> }
-<a class="jxr_linenumber" name="518" href="#518">518</a> <strong class="jxr_keyword">try</strong> (Table table = connection.getTable(tableName);
-<a class="jxr_linenumber" name="519" href="#519">519</a> <a href="../../../../../org/apache/hadoop/hbase/client/RegionLocator.html">RegionLocator</a> regionLocator = connection.getRegionLocator(tableName)) {
-<a class="jxr_linenumber" name="520" href="#520">520</a> <strong class="jxr_keyword">boolean</strong> noStrict = conf.getBoolean(NO_STRICT_COL_FAMILY, false);
-<a class="jxr_linenumber" name="521" href="#521">521</a> <em class="jxr_comment">// if no.strict is false then check column family</em>
-<a class="jxr_linenumber" name="522" href="#522">522</a> <strong class="jxr_keyword">if</strong>(!noStrict) {
-<a class="jxr_linenumber" name="523" href="#523">523</a> ArrayList<String> unmatchedFamilies = <strong class="jxr_keyword">new</strong> ArrayList<String>();
-<a class="jxr_linenumber" name="524" href="#524">524</a> Set<String> cfSet = getColumnFamilies(columns);
-<a class="jxr_linenumber" name="525" href="#525">525</a> <a href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html">HTableDescriptor</a> tDesc = table.getTableDescriptor();
-<a class="jxr_linenumber" name="526" href="#526">526</a> <strong class="jxr_keyword">for</strong> (String cf : cfSet) {
-<a class="jxr_linenumber" name="527" href="#527">527</a> <strong class="jxr_keyword">if</strong>(tDesc.getFamily(Bytes.toBytes(cf)) == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="528" href="#528">528</a> unmatchedFamilies.add(cf);
-<a class="jxr_linenumber" name="529" href="#529">529</a> }
-<a class="jxr_linenumber" name="530" href="#530">530</a> }
-<a class="jxr_linenumber" name="531" href="#531">531</a> <strong class="jxr_keyword">if</strong>(unmatchedFamilies.size() > 0) {
-<a class="jxr_linenumber" name="532" href="#532">532</a> ArrayList<String> familyNames = <strong class="jxr_keyword">new</strong> ArrayList<String>();
-<a class="jxr_linenumber" name="533" href="#533">533</a> <strong class="jxr_keyword">for</strong> (HColumnDescriptor family : table.getTableDescriptor().getFamilies()) {
-<a class="jxr_linenumber" name="534" href="#534">534</a> familyNames.add(family.getNameAsString());
-<a class="jxr_linenumber" name="535" href="#535">535</a> }
-<a class="jxr_linenumber" name="536" href="#536">536</a> String msg =
-<a class="jxr_linenumber" name="537" href="#537">537</a> <span class="jxr_string">"Column Families "</span> + unmatchedFamilies + <span class="jxr_string">" specified in "</span> + COLUMNS_CONF_KEY
-<a class="jxr_linenumber" name="538" href="#538">538</a> + <span class="jxr_string">" does not match with any of the table "</span> + tableName
-<a class="jxr_linenumber" name="539" href="#539">539</a> + <span class="jxr_string">" column families "</span> + familyNames + <span class="jxr_string">".\n"</span>
-<a class="jxr_linenumber" name="540" href="#540">540</a> + <span class="jxr_string">"To disable column family check, use -D"</span> + NO_STRICT_COL_FAMILY
-<a class="jxr_linenumber" name="541" href="#541">541</a> + <span class="jxr_string">"=true.\n"</span>;
-<a class="jxr_linenumber" name="542" href="#542">542</a> usage(msg);
-<a class="jxr_linenumber" name="543" href="#543">543</a> System.exit(-1);
-<a class="jxr_linenumber" name="544" href="#544">544</a> }
-<a class="jxr_linenumber" name="545" href="#545">545</a> }
-<a class="jxr_linenumber" name="546" href="#546">546</a> <strong class="jxr_keyword">if</strong> (mapperClass.equals(TsvImporterTextMapper.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="547" href="#547">547</a> job.setMapOutputValueClass(Text.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="548" href="#548">548</a> job.setReducerClass(TextSortReducer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="549" href="#549">549</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="550" href="#550">550</a> job.setMapOutputValueClass(Put.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="551" href="#551">551</a> job.setCombinerClass(PutCombiner.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="552" href="#552">552</a> job.setReducerClass(PutSortReducer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="553" href="#553">553</a> }
-<a class="jxr_linenumber" name="554" href="#554">554</a> <strong class="jxr_keyword">if</strong> (!isDryRun) {
-<a class="jxr_linenumber" name="555" href="#555">555</a> Path outputDir = <strong class="jxr_keyword">new</strong> Path(hfileOutPath);
-<a class="jxr_linenumber" name="556" href="#556">556</a> FileOutputFormat.setOutputPath(job, outputDir);
-<a class="jxr_linenumber" name="557" href="#557">557</a> HFileOutputFormat2.configureIncrementalLoad(job, table.getTableDescriptor(),
-<a class="jxr_linenumber" name="558" href="#558">558</a> regionLocator);
-<a class="jxr_linenumber" name="559" href="#559">559</a> }
-<a class="jxr_linenumber" name="560" href="#560">560</a> }
-<a class="jxr_linenumber" name="561" href="#561">561</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="562" href="#562">562</a> <strong class="jxr_keyword">if</strong> (!admin.tableExists(tableName)) {
-<a class="jxr_linenumber" name="563" href="#563">563</a> String errorMsg = format(<span class="jxr_string">"Table '%s' does not exist."</span>, tableName);
-<a class="jxr_linenumber" name="564" href="#564">564</a> LOG.error(errorMsg);
-<a class="jxr_linenumber" name="565" href="#565">565</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html">TableNotFoundException</a>(errorMsg);
-<a class="jxr_linenumber" name="566" href="#566">566</a> }
-<a class="jxr_linenumber" name="567" href="#567">567</a> <strong class="jxr_keyword">if</strong> (mapperClass.equals(TsvImporterTextMapper.<strong class="jxr_keyword">class</strong>)) {
-<a class="jxr_linenumber" name="568" href="#568">568</a> usage(TsvImporterTextMapper.<strong class="jxr_keyword">class</strong>.toString()
-<a class="jxr_linenumber" name="569" href="#569">569</a> + <span class="jxr_string">" should not be used for non bulkloading case. use "</span>
-<a class="jxr_linenumber" name="570" href="#570">570</a> + TsvImporterMapper.<strong class="jxr_keyword">class</strong>.toString()
-<a class="jxr_linenumber" name="571" href="#571">571</a> + <span class="jxr_string">" or custom mapper whose value type is Put."</span>);
-<a class="jxr_linenumber" name="572" href="#572">572</a> System.exit(-1);
-<a class="jxr_linenumber" name="573" href="#573">573</a> }
-<a class="jxr_linenumber" name="574" href="#574">574</a> <strong class="jxr_keyword">if</strong> (!isDryRun) {
-<a class="jxr_linenumber" name="575" href="#575">575</a> <em class="jxr_comment">// No reducers. Just write straight to table. Call initTableReducerJob</em>
-<a class="jxr_linenumber" name="576" href="#576">576</a> <em class="jxr_comment">// to set up the TableOutputFormat.</em>
-<a class="jxr_linenumber" name="577" href="#577">577</a> TableMapReduceUtil.initTableReducerJob(tableName.getNameAsString(), <strong class="jxr_keyword">null</strong>, job);
-<a class="jxr_linenumber" name="578" href="#578">578</a> }
-<a class="jxr_linenumber" name="579" href="#579">579</a> job.setNumReduceTasks(0);
-<a class="jxr_linenumber" name="580" href="#580">580</a> }
-<a class="jxr_linenumber" name="581" href="#581">581</a> <strong class="jxr_keyword">if</strong> (isDryRun) {
-<a class="jxr_linenumber" name="582" href="#582">582</a> job.setOutputFormatClass(NullOutputFormat.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="583" href="#583">583</a> job.getConfiguration().setStrings(<span class="jxr_string">"io.serializations"</span>,
-<a class="jxr_linenumber" name="584" href="#584">584</a> job.getConfiguration().get(<span class="jxr_string">"io.serializations"</span>),
-<a class="jxr_linenumber" name="585" href="#585">585</a> MutationSerialization.<strong class="jxr_keyword">class</strong>.getName(), ResultSerialization.<strong class="jxr_keyword">class</strong>.getName(),
-<a class="jxr_linenumber" name="586" href="#586">586</a> KeyValueSerialization.<strong class="jxr_keyword">class</strong>.getName());
-<a class="jxr_linenumber" name="587" href="#587">587</a> }
-<a class="jxr_linenumber" name="588" href="#588">588</a> TableMapReduceUtil.addDependencyJars(job);
-<a class="jxr_linenumber" name="589" href="#589">589</a> TableMapReduceUtil.addDependencyJars(job.getConfiguration(),
-<a class="jxr_linenumber" name="590" href="#590">590</a> com.google.common.base.Function.<strong class="jxr_keyword">class</strong> <em class="jxr_comment">/*<em class="jxr_comment"> Guava used by <a href="../../../../../org/apache/hadoop/hbase/mapreduce/ImportTsv.html">TsvParser</a> */</em>);</em>
-<a class="jxr_linenumber" name="591" href="#591">591</a> }
-<a class="jxr_linenumber" name="592" href="#592">592</a> }
-<a class="jxr_linenumber" name="593" href="#593">593</a> <strong class="jxr_keyword">return</strong> job;
-<a class="jxr_linenumber" name="594" href="#594">594</a> }
-<a class="jxr_linenumber" name="595" href="#595">595</a>
-<a class="jxr_linenumber" name="596" href="#596">596</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> createTable(<a href="../../../../../org/apache/hadoop/hbase/client/Admin.html">Admin</a> admin, <a href="../../../../../org/apache/hadoop/hbase/TableName.html">TableName</a> tableName, String[] columns)
-<a class="jxr_linenumber" name="597" href="#597">597</a> <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="598" href="#598">598</a> <a href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html">HTableDescriptor</a> htd = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/HTableDescriptor.html">HTableDescriptor</a>(tableName);
-<a class="jxr_linenumber" name="599" href="#599">599</a> Set<String> cfSet = getColumnFamilies(columns);
-<a class="jxr_linenumber" name="600" href="#600">600</a> <strong class="jxr_keyword">for</strong> (String cf : cfSet) {
-<a class="jxr_linenumber" name="601" href="#601">601</a> <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html">HColumnDescriptor</a> hcd = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/HColumnDescriptor.html">HColumnDescriptor</a>(Bytes.toBytes(cf));
-<a class="jxr_linenumber" name="602" href="#602">602</a> htd.addFamily(hcd);
-<a class="jxr_linenumber" name="603" href="#603">603</a> }
-<a class="jxr_linenumber" name="604" href="#604">604</a> LOG.warn(format(<span class="jxr_string">"Creating table '%s' with '%s' columns and default descriptors."</span>,
-<a class="jxr_linenumber" name="605" href="#605">605</a> tableName, cfSet));
-<a class="jxr_linenumber" name="606" href="#606">606</a> admin.createTable(htd);
-<a class="jxr_linenumber" name="607" href="#607">607</a> }
-<a class="jxr_linenumber" name="608" href="#608">608</a>
-<a class="jxr_linenumber" name="609" href="#609">609</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> deleteTable(Configuration conf, String[] args) {
-<a class="jxr_linenumber" name="610" href="#610">610</a> <a href="../../../../../org/apache/hadoop/hbase/TableName.html">TableName</a> tableName = TableName.valueOf(args[0]);
-<a class="jxr_linenumber" name="611" href="#611">611</a> <strong class="jxr_keyword">try</strong> (Connection connection = ConnectionFactory.createConnection(conf);
-<a class="jxr_linenumber" name="612" href="#612">612</a> <a href="../../../../../org/apache/hadoop/hbase/client/Admin.html">Admin</a> admin = connection.getAdmin()) {
-<a class="jxr_linenumber" name="613" href="#613">613</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="614" href="#614">614</a> admin.disableTable(tableName);
-<a class="jxr_linenumber" name="615" href="#615">615</a> } <strong class="jxr_keyword">catch</strong> (TableNotEnabledException e) {
-<a class="jxr_linenumber" name="616" href="#616">616</a> LOG.debug(<span class="jxr_string">"Dry mode: Table: "</span> + tableName + <span class="jxr_string">" already disabled, so just deleting it."</span>);
-<a class="jxr_linenumber" name="617" href="#617">617</a> }
-<a class="jxr_linenumber" name="618" href="#618">618</a> admin.deleteTable(tableName);
-<a class="jxr_linenumber" name="619" href="#619">619</a> } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a class="jxr_linenumber" name="620" href="#620">620</a> LOG.error(format(<span class="jxr_string">"***Dry run: Failed to delete table '%s'.***%n%s"</span>, tableName,
-<a class="jxr_linenumber" name="621" href="#621">621</a> e.toString()));
-<a class="jxr_linenumber" name="622" href="#622">622</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="623" href="#623">623</a> }
-<a class="jxr_linenumber" name="624" href="#624">624</a> LOG.info(format(<span class="jxr_string">"Dry run: Deleted table '%s'."</span>, tableName));
-<a class="jxr_linenumber" name="625" href="#625">625</a> }
-<a class="jxr_linenumber" name="626" href="#626">626</a>
-<a class="jxr_linenumber" name="627" href="#627">627</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Set<String> getColumnFamilies(String[] columns) {
-<a class="jxr_linenumber" name="628" href="#628">628</a> Set<String> cfSet = <strong class="jxr_keyword">new</strong> HashSet<String>();
-<a class="jxr_linenumber" name="629" href="#629">629</a> <strong class="jxr_keyword">for</strong> (String aColumn : columns) {
-<a class="jxr_linenumber" name="630" href="#630">630</a> <strong class="jxr_keyword">if</strong> (TsvParser.ROWKEY_COLUMN_SPEC.equals(aColumn)
-<a class="jxr_linenumber" name="631" href="#631">631</a> || TsvParser.TIMESTAMPKEY_COLUMN_SPEC.equals(aColumn)
-<a class="jxr_linenumber" name="632" href="#632">632</a> || TsvParser.CELL_VISIBILITY_COLUMN_SPEC.equals(aColumn)
-<a class="jxr_linenumber" name="633" href="#633">633</a> || TsvParser.CELL_TTL_COLUMN_SPEC.equals(aColumn)
-<a class="jxr_linenumber" name="634" href="#634">634</a> || TsvParser.ATTRIBUTES_COLUMN_SPEC.equals(aColumn))
-<a class="jxr_linenumber" name="635" href="#635">635</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="636" href="#636">636</a> <em class="jxr_comment">// we are only concerned with the first one (in case this is a cf:cq)</em>
-<a class="jxr_linenumber" name="637" href="#637">637</a> cfSet.add(aColumn.split(<span class="jxr_string">":"</span>, 2)[0]);
-<a class="jxr_linenumber" name="638" href="#638">638</a> }
-<a class="jxr_linenumber" name="639" href="#639">639</a> <strong class="jxr_keyword">return</strong> cfSet;
-<a class="jxr_linenumber" name="640" href="#640">640</a> }
-<a class="jxr_linenumber" name="641" href="#641">641</a>
-<a class="jxr_linenumber" name="642" href="#642">642</a> <em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="643" href="#643">643</a> <em class="jxr_comment"> * @param errorMsg Error message. Can be null.</em>
-<a class="jxr_linenumber" name="644" href="#644">644</a> <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="645" href="#645">645</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> usage(<strong class="jxr_keyword">final</strong> String errorMsg) {
-<a class="jxr_linenumber" name="646" href="#646">646</a> <strong class="jxr_keyword">if</strong> (errorMsg != <strong class="jxr_keyword">null</strong> && errorMsg.length() > 0) {
-<a class="jxr_linenumber" name="647" href="#647">647</a> System.err.println(<span class="jxr_string">"ERROR: "</span> + errorMsg);
-<a class="jxr_linenumber" name="648" href="#648">648</a> }
-<a class="jxr_linenumber" name="649" href="#649">649</a> String usage =
-<a class="jxr_linenumber" name="650" href="#650">650</a> <span class="jxr_string">"Usage: "</span> + NAME + <span class="jxr_string">" -D"</span>+ COLUMNS_CONF_KEY + <span class="jxr_string">"=a,b,c <tablename> <inputdir>\n"</span> +
-<a class="jxr_linenumber" name="651" href="#651">651</a> <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="652" href="#652">652</a> <span class="jxr_string">"Imports the given input directory of TSV data into the specified table.\n"</span> +
-<a class="jxr_linenumber" name="653" href="#653">653</a> <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="654" href="#654">654</a> <span class="jxr_string">"The column names of the TSV data must be specified using the -D"</span> + COLUMNS_CONF_KEY + <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="655" href="#655">655</a> <span class="jxr_string">"option. This option takes the form of comma-separated column names, where each\n"</span> +
-<a class="jxr_linenumber" name="656" href="#656">656</a> <span class="jxr_string">"column name is either a simple column family, or a columnfamily:qualifier. The special\n"</span> +
-<a class="jxr_linenumber" name="657" href="#657">657</a> <span class="jxr_string">"column name "</span> + TsvParser.ROWKEY_COLUMN_SPEC + <span class="jxr_string">" is used to designate that this column should be used\n"</span> +
-<a class="jxr_linenumber" name="658" href="#658">658</a> <span class="jxr_string">"as the row key for each imported record. You must specify exactly one column\n"</span> +
-<a class="jxr_linenumber" name="659" href="#659">659</a> <span class="jxr_string">"to be the row key, and you must specify a column name for every column that exists in the\n"</span> +
-<a class="jxr_linenumber" name="660" href="#660">660</a> <span class="jxr_string">"input data. Another special column"</span> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC +
-<a class="jxr_linenumber" name="661" href="#661">661</a> <span class="jxr_string">" designates that this column should be\n"</span> +
-<a class="jxr_linenumber" name="662" href="#662">662</a> <span class="jxr_string">"used as timestamp for each record. Unlike "</span> + TsvParser.ROWKEY_COLUMN_SPEC + <span class="jxr_string">", "</span> +
-<a class="jxr_linenumber" name="663" href="#663">663</a> TsvParser.TIMESTAMPKEY_COLUMN_SPEC + <span class="jxr_string">" is optional."</span> + <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="664" href="#664">664</a> <span class="jxr_string">"You must specify at most one column as timestamp key for each imported record.\n"</span> +
-<a class="jxr_linenumber" name="665" href="#665">665</a> <span class="jxr_string">"Record with invalid timestamps (blank, non-numeric) will be treated as bad record.\n"</span> +
-<a class="jxr_linenumber" name="666" href="#666">666</a> <span class="jxr_string">"Note: if you use this option, then '"</span> + TIMESTAMP_CONF_KEY + <span class="jxr_string">"' option will be ignored.\n"</span> +
-<a class="jxr_linenumber" name="667" href="#667">667</a> <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="668" href="#668">668</a> <span class="jxr_string">"Other special columns that can be specified are "</span> + TsvParser.CELL_TTL_COLUMN_SPEC +
-<a class="jxr_linenumber" name="669" href="#669">669</a> <span class="jxr_string">" and "</span> + TsvParser.CELL_VISIBILITY_COLUMN_SPEC + <span class="jxr_string">".\n"</span> +
-<a class="jxr_linenumber" name="670" href="#670">670</a> TsvParser.CELL_TTL_COLUMN_SPEC + <span class="jxr_string">" designates that this column will be used "</span> +
-<a class="jxr_linenumber" name="671" href="#671">671</a> <span class="jxr_string">"as a Cell's Time To Live (TTL) attribute.\n"</span> +
-<a class="jxr_linenumber" name="672" href="#672">672</a> TsvParser.CELL_VISIBILITY_COLUMN_SPEC + <span class="jxr_string">" designates that this column contains the "</span> +
-<a class="jxr_linenumber" name="673" href="#673">673</a> <span class="jxr_string">"visibility label expression.\n"</span> +
-<a class="jxr_linenumber" name="674" href="#674">674</a> <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="675" href="#675">675</a> TsvParser.ATTRIBUTES_COLUMN_SPEC+<span class="jxr_string">" can be used to specify Operation Attributes per record.\n"</span>+
-<a class="jxr_linenumber" name="676" href="#676">676</a> <span class="jxr_string">" Should be specified as key=>value where "</span>+TsvParser.DEFAULT_ATTRIBUTES_COLUMN_INDEX+ <span class="jxr_string">" is used \n"</span>+
-<a class="jxr_linenumber" name="677" href="#677">677</a> <span class="jxr_string">" as the seperator. Note that more than one OperationAttributes can be specified.\n"</span>+
-<a class="jxr_linenumber" name="678" href="#678">678</a> <span class="jxr_string">"By default importtsv will load data directly into HBase. To instead generate\n"</span> +
-<a class="jxr_linenumber" name="679" href="#679">679</a> <span class="jxr_string">"HFiles of data to prepare for a bulk data load, pass the option:\n"</span> +
-<a class="jxr_linenumber" name="680" href="#680">680</a> <span class="jxr_string">" -D"</span> + BULK_OUTPUT_CONF_KEY + <span class="jxr_string">"=/path/for/output\n"</span> +
-<a class="jxr_linenumber" name="681" href="#681">681</a> <span class="jxr_string">" Note: if you do not use this option, then the target table must already exist in HBase\n"</span> +
-<a class="jxr_linenumber" name="682" href="#682">682</a> <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="683" href="#683">683</a> <span class="jxr_string">"Other options that may be specified with -D include:\n"</span> +
-<a class="jxr_linenumber" name="684" href="#684">684</a> <span class="jxr_string">" -D"</span> + DRY_RUN_CONF_KEY + <span class="jxr_string">"=true - Dry run mode. Data is not actually populated into"</span> +
-<a class="jxr_linenumber" name="685" href="#685">685</a> <span class="jxr_string">" table. If table does not exist, it is created but deleted in the end.\n"</span> +
-<a class="jxr_linenumber" name="686" href="#686">686</a> <span class="jxr_string">" -D"</span> + SKIP_LINES_CONF_KEY + <span class="jxr_string">"=false - fail if encountering an invalid line\n"</span> +
-<a class="jxr_linenumber" name="687" href="#687">687</a> <span class="jxr_string">" -D"</span> + LOG_BAD_LINES_CONF_KEY + <span class="jxr_string">"=true - logs invalid lines to stderr\n"</span> +
-<a class="jxr_linenumber" name="688" href="#688">688</a> <span class="jxr_string">" '-D"</span> + SEPARATOR_CONF_KEY + <span class="jxr_string">"=|' - eg separate on pipes instead of tabs\n"</span> +
-<a class="jxr_linenumber" name="689" href="#689">689</a> <span class="jxr_string">" -D"</span> + TIMESTAMP_CONF_KEY + <span class="jxr_string">"=currentTimeAsLong - use the specified timestamp for the import\n"</span> +
-<a class="jxr_linenumber" name="690" href="#690">690</a> <span class="jxr_string">" -D"</span> + MAPPER_CONF_KEY + <span class="jxr_string">"=my.Mapper - A user-defined Mapper to use instead of "</span> +
-<a class="jxr_linenumber" name="691" href="#691">691</a> DEFAULT_MAPPER.getName() + <span class="jxr_string">"\n"</span> +
-<a class="jxr_linenumber" name="692" href="#692">692</a> <span class="jxr_string">" -D"</span> + JOB_NAME_CONF_KEY + <span class="jxr_string">"=jobName - use the specified mapreduce job name for the import\n"</span> +
-<a class="jxr_linenumber" name="693" href="#693">693</a> <span class="jxr_string">" -D"</span> + CREATE_TABLE_CONF_KEY + <span class="jxr_string">"=no - can be used to avoid creation of table by this tool\n"</span> +
-<a class="jxr_linenumber" name="694" href="#694">694</a> <span class="jxr_string">" Note: if you set this to 'no', then the target table must already exist in HBase\n"</span> +
-<a class="jxr_linenumber" name="695" href="#695">695</a> <span class="jxr_string">" -D"</span> + NO_STRICT_COL_FAMILY + <span class="jxr_string">"=true - ignore column family check in hbase table. "</span> +
-<a class="jxr_linenumber" name="696" href="#696">696</a> <span class="jxr_string">"Default is false\n\n"</span> +
-<a class="jxr_linenumber" name="697" href="#697">697</a> <span class="jxr_string">"For performance consider the following options:\n"</span> +
-<a class="jxr_linenumber" name="698" href="#698">698</a> <span class="jxr_string">" -Dmapreduce.map.speculative=false\n"</span> +
-<a class="jxr_linenumber" name="699" href="#699">699</a> <span class="jxr_string">" -Dmapreduce.reduce.speculative=false"</span>;
-<a class="jxr_linenumber" name="700" href="#700">700</a>
-<a class="jxr_linenumber" name="701" href="#701">701</a> System.err.println(usage);
-<a class="jxr_linenumber" name="702" href="#702">702</a> }
-<a class="jxr_linenumber" name="703" href="#703">703</a>
-<a class="jxr_linenumber" name="704" href="#704">704</a> @Override
-<a class="jxr_linenumber" name="705" href="#705">705</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> run(String[] args) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="706" href="#706">706</a> <strong class="jxr_keyword">if</strong> (args.length < 2) {
-<a class="jxr_linenumber" name="707" href="#707">707</a> usage(<span class="jxr_string">"Wrong number of arguments: "</span> + args.length);
-<a class="jxr_linenumber" name="708" href="#708">708</a> <strong class="jxr_keyword">return</strong> -1;
-<a class="jxr_linenumber" name="709" href="#709">709</a> }
-<a class="jxr_linenumber" name="710" href="#710">710</a>
-<a class="jxr_linenumber" name="711" href="#711">711</a> <em class="jxr_comment">// When MAPPER_CONF_KEY is null, the user wants to use the provided TsvImporterMapper, so</em>
-<a class="jxr_linenumber" name="712" href="#712">712</a> <em class="jxr_comment">// perform validation on these additional args. When it's not null, user has provided their</em>
-<a class="jxr_linenumber" name="713" href="#713">713</a> <em class="jxr_comment">// own mapper, thus these validation are not relevant.</em>
-<a class="jxr_linenumber" name="714" href="#714">714</a> <em class="jxr_comment">// TODO: validation for TsvImporterMapper, not this tool. Move elsewhere.</em>
-<a class="jxr_linenumber" name="715" href="#715">715</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == getConf().get(MAPPER_CONF_KEY)) {
-<a class="jxr_linenumber" name="716" href="#716">716</a> <em class="jxr_comment">// Make sure columns are specified</em>
-<a class="jxr_linenumber" name="717" href="#717">717</a> String[] columns = getConf().getStrings(COLUMNS_CONF_KEY);
-<a class="jxr_linenumber" name="718" href="#718">718</a> <strong class="jxr_keyword">if</strong> (columns == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="719" href="#719">719</a> usage(<span class="jxr_string">"No columns specified. Please specify with -D"</span> +
-<a class="jxr_linenumber" name="720" href="#720">720</a> COLUMNS_CONF_KEY+<span class="jxr_string">"=..."</span>);
-<a class="jxr_linenumber" name="721" href="#721">721</a> <strong class="jxr_keyword">return</strong> -1;
-<a class="jxr_linenumber" name="722" href="#722">722</a> }
-<a class="jxr_linenumber" name="723" href="#723">723</a>
-<a class="jxr_linenumber" name="724" href="#724">724</a> <em class="jxr_comment">// Make sure they specify exactly one column as the row key</em>
-<a class="jxr_linenumber" name="725" href="#725">725</a> <strong class="jxr_keyword">int</strong> rowkeysFound = 0;
-<a class="jxr_linenumber" name="726" href="#726">726</a> <strong class="jxr_keyword">for</strong> (String col : columns) {
-<a class="jxr_linenumber" name="727" href="#727">727</a> <strong class="jxr_keyword">if</strong> (col.equals(TsvParser.ROWKEY_COLUMN_SPEC)) rowkeysFound++;
-<a class="jxr_linenumber" name="728" href="#728">728</a> }
-<a class="jxr_linenumber" name="729" href="#729">729</a> <strong class="jxr_keyword">if</strong> (rowkeysFound != 1) {
-<a class="jxr_linenumber" name="730" href="#730">730</a> usage(<span class="jxr_string">"Must specify exactly one column as "</span> + TsvParser.ROWKEY_COLUMN_SPEC);
-<a class="jxr_linenumber" name="731" href="#731">731</a> <strong class="jxr_keyword">return</strong> -1;
-<a class="jxr_linenumber" name="732" href="#732">732</a> }
-<a class="jxr_linenumber" name="733" href="#733">733</a>
-<a class="jxr_linenumber" name="734" href="#734">734</a> <em class="jxr_comment">// Make sure we have at most one column as the timestamp key</em>
-<a class="jxr_linenumber" name="735" href="#735">735</a> <strong class="jxr_keyword">int</strong> tskeysFound = 0;
-<a class="jxr_linenumber" name="736" href="#736">736</a> <strong class="jxr_keyword">for</strong> (String col : columns) {
-<a class="jxr_linenumber" name="737" href="#737">737</a> <strong class="jxr_keyword">if</strong> (col.equals(TsvParser.TIMESTAMPKEY_COLUMN_SPEC))
-<a class="jxr_linenumber" name="738" href="#738">738</a> tskeysFound++;
-<a class="jxr_linenumber" name="739" href="#739">739</a> }
-<a class="jxr_linenumber" name="740" href="#740">740</a> <strong class="jxr_keyword">if</strong> (tskeysFound > 1) {
-<a class="jxr_linenumber" name="741" href="#741">741</a> usage(<span class="jxr_string">"Must specify at most one column as "</span>
-<a class="jxr_linenumber" name="742" href="#742">742</a> + TsvParser.TIMESTAMPKEY_COLUMN_SPEC);
-<a class="jxr_linenumber" name="743" href="#743">743</a> <strong class="jxr_keyword">return</strong> -1;
-<a class="jxr_linenumber" name="744" href="#744">744</a> }
-<a class="jxr_linenumber" name="745" href="#745">745</a>
-<a class="jxr_linenumber" name="746" href="#746">746</a> <strong class="jxr_keyword">int</strong> attrKeysFound = 0;
-<a class="jxr_linenumber" name="747" href="#747">747</a> <strong class="jxr_keyword">for</strong> (String col : columns) {
-<a class="jxr_linenumber" name="748" href="#748">748</a> <strong class="jxr_keyword">if</strong> (col.equals(TsvParser.ATTRIBUTES_COLUMN_SPEC))
-<a class="jxr_linenumber" name="749" href="#749">749</a> attrKeysFound++;
-<a class="jxr_linenumber" name="750" href="#750">750</a> }
-<a class="jxr_linenumber" name="751" href="#751">751</a> <strong class="jxr_keyword">if</strong> (attrKeysFound > 1) {
-<a class="jxr_linenumber" name="752" href="#752">752</a> usage(<span class="jxr_string">"Must specify at most one column as "</span>
-<a class="jxr_linenumber" name="753" href="#753">753</a> + TsvParser.ATTRIBUTES_COLUMN_SPEC);
-<a class="jxr_linenumber" nam
<TRUNCATED>