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:19 UTC
[08/17] hbase-site git commit: Published site at
9c832109458ced70d0db701e7f58ef41b1df0fc7.
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>